From nobody Thu Feb 12 13:10:32 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9643811CB8 for ; Thu, 4 Apr 2024 14:41:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712241701; cv=none; b=NjbKAcD5IoeyNSGtWJldArvGZzmvohEo4MojR/bIjXZQnWS8dmDKaKDNDKslscZT7xSsIA7yGyiq5wpn4vzkkIrmoYuhQI9wdmU4MYEZIuvcuIunI03J6NlNNp1lvj2pHHDfyA263UjvkQi0Ahmc7xydbbHdM8UE5b/8+w1SeO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712241701; c=relaxed/simple; bh=kBGYO53lh5KMkNw/xSl8D3TTRVlwvoCIEG4KrNIxBtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NoG4fEnZiAsy5jWb9iuE+JhvHi0QNrJbTy868W8vVyiTreHblI8D7j88sjWxGLnbJoeIlv5h5s/m9FZy0Hhi3j1/xDUwzGuFHhFGmhAx9VugUPu1Jsv6pWoTSV1GttHSLJVeX3hHD9GG7ULtQkgcO+b4+AUtqjvVnWM5QVs0LCE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=E9g4IS5S; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=QmghPWp3; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=E9g4IS5S; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=QmghPWp3; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="E9g4IS5S"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="QmghPWp3"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="E9g4IS5S"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="QmghPWp3" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E54665F805; Thu, 4 Apr 2024 14:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712241697; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3iFg5EznOnzNIdBZVMrMb3Gm6rtmi64SkeL4Z8CmSo8=; b=E9g4IS5S7mVLdxH2uBRmUh9zs2+O46PoavWofXNE7v5o5H4Pym/S9gDp+0oEdVFJTdFSkf f01zUL57PDVf4C7QICJ3LiiQ676T4Ts4qHgTVLJRam/NN6yh85pmjBIDzDmNxd/xzVblAx DW8BrAWxpQ+n3kiqVH/AOvrpNpIKKlk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712241697; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3iFg5EznOnzNIdBZVMrMb3Gm6rtmi64SkeL4Z8CmSo8=; b=QmghPWp3qhXdU+tzE/LMLl4Vw6ZFNoP0fAX7ZWzJg5/3OUHHxPuZbtclVXFXutdaBsNVl5 55+Vli/5Rim/2TCg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712241697; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3iFg5EznOnzNIdBZVMrMb3Gm6rtmi64SkeL4Z8CmSo8=; b=E9g4IS5S7mVLdxH2uBRmUh9zs2+O46PoavWofXNE7v5o5H4Pym/S9gDp+0oEdVFJTdFSkf f01zUL57PDVf4C7QICJ3LiiQ676T4Ts4qHgTVLJRam/NN6yh85pmjBIDzDmNxd/xzVblAx DW8BrAWxpQ+n3kiqVH/AOvrpNpIKKlk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712241697; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3iFg5EznOnzNIdBZVMrMb3Gm6rtmi64SkeL4Z8CmSo8=; b=QmghPWp3qhXdU+tzE/LMLl4Vw6ZFNoP0fAX7ZWzJg5/3OUHHxPuZbtclVXFXutdaBsNVl5 55+Vli/5Rim/2TCg== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id C875F13298; Thu, 4 Apr 2024 14:41:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id /J97LyG8DmZqDQAAn2gu4w (envelope-from ); Thu, 04 Apr 2024 14:41:37 +0000 From: Daniel Wagner To: James Smart Cc: Keith Busch , Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Wagner Subject: [PATCH v2 1/2] nvmet-fc: move RCU read lock to nvmet_fc_assoc_exists Date: Thu, 4 Apr 2024 16:41:30 +0200 Message-ID: <20240404144131.17988-2-dwagner@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404144131.17988-1-dwagner@suse.de> References: <20240404144131.17988-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -0.97 X-Spam-Level: X-Spamd-Result: default: False [-0.97 / 50.00]; BAYES_HAM(-1.17)[88.89%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_SEVEN(0.00)[8]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap2.dmz-prg2.suse.org:helo,imap2.dmz-prg2.suse.org:rdns,suse.de:email]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" The RCU lock is only needed for the lookup loop and not for list_ad_tail_rcu call. Thus move it down the call chain into nvmet_fc_assoc_exists. While at it also fix the name typo of the function. Signed-off-by: Daniel Wagner Reviewed-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/nvme/target/fc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index b4706a8a9837..a8fb89da7281 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c @@ -1115,16 +1115,21 @@ nvmet_fc_schedule_delete_assoc(struct nvmet_fc_tgt_= assoc *assoc) } =20 static bool -nvmet_fc_assoc_exits(struct nvmet_fc_tgtport *tgtport, u64 association_id) +nvmet_fc_assoc_exists(struct nvmet_fc_tgtport *tgtport, u64 association_id) { struct nvmet_fc_tgt_assoc *a; + bool found =3D false; =20 + rcu_read_lock(); list_for_each_entry_rcu(a, &tgtport->assoc_list, a_list) { - if (association_id =3D=3D a->association_id) - return true; + if (association_id =3D=3D a->association_id) { + found =3D true; + break; + } } + rcu_read_unlock(); =20 - return false; + return found; } =20 static struct nvmet_fc_tgt_assoc * @@ -1164,13 +1169,11 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport= *tgtport, void *hosthandle) ran =3D ran << BYTES_FOR_QID_SHIFT; =20 spin_lock_irqsave(&tgtport->lock, flags); - rcu_read_lock(); - if (!nvmet_fc_assoc_exits(tgtport, ran)) { + if (!nvmet_fc_assoc_exists(tgtport, ran)) { assoc->association_id =3D ran; list_add_tail_rcu(&assoc->a_list, &tgtport->assoc_list); done =3D true; } - rcu_read_unlock(); spin_unlock_irqrestore(&tgtport->lock, flags); } while (!done); =20 --=20 2.44.0 From nobody Thu Feb 12 13:10:32 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C2211B964 for ; Thu, 4 Apr 2024 14:41:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712241702; cv=none; b=s6DPB7wR78Ft3IrSuFZBTYfGnXDkkZmGYvNpEAO5/oXiCGdD9/gYV8+bG2vQfr2rcwD7yKTObydSF0tL8wNFmPAPLn8AExP7KStdrrtpEOcJbjIXaTGc67MLawprn4/7BLQeTzCvd5WG9ksi+u/ovETTEVdeyoFTZHBS+qPXCxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712241702; c=relaxed/simple; bh=k4DttWMe2otYlFQVxmSUOWiHoIRlHS0CVBiGjbaWU78=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mtcz+AIKoueDt0lvkEFCNPoZX/IkneK4RGorOBarDVogrFJN3z7NU6s8Ps8d1zffUCYkfpTCKaM8QKJSpCD3v4ve0+HN6r6byjJ3iguTU10aX/Q1p3q2Ri+hoQhEA4WRetYktiuoJChOy7+ISpDJ17AxdRapGdoei5ubHzYbKyI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=w67yvzg/; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RNMzBZ72; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=vEOy8XuQ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=vSijkvP5; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="w67yvzg/"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RNMzBZ72"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="vEOy8XuQ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="vSijkvP5" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 784B15F806; Thu, 4 Apr 2024 14:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712241699; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgEGK5+/nKmeqwHJu6h5IZvHCp+x7Kdn5a20nBLm2rQ=; b=w67yvzg/Al/UeZ+5cLx0lHEij9NqcqbAZJVJpk9FEyNJX2o5wvQXjGzyZ2iiB3M3ZmvMfB YhG8ZdPSvqovq7nnnMfr9R4CfXvv1q5sEfj1Qj6LZ90ZY1WPh3SqyOwA3yO35hUiiM5BMR LXDcmShOB7qJ8FWdC/paGFdhTA1M0qI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712241699; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgEGK5+/nKmeqwHJu6h5IZvHCp+x7Kdn5a20nBLm2rQ=; b=RNMzBZ72F6SkqmP7dEjSNzL0W2/G1/LvzkJ2VXFoo+qXepA6J/8jRKrZC1o8VKE4oiQHf7 /jBL8CRg+r3FIPBA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712241698; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgEGK5+/nKmeqwHJu6h5IZvHCp+x7Kdn5a20nBLm2rQ=; b=vEOy8XuQKn4mMQ6MLsiOyElEX9NBfJz5PsQohHNLHgIEdCZuCzz55LcFzGMteP1Wq7pBG7 TsQTOTNdaSXvprbcDsHErG8Rb5K2HGHCGe4PwNKsiCHPeJFhqzuPVQ/LtpWyHDeAR4j+sP y0GO/n0KFid9jy2xIMjKCu49655QIc0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712241698; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZgEGK5+/nKmeqwHJu6h5IZvHCp+x7Kdn5a20nBLm2rQ=; b=vSijkvP5ap3vymxsQg0aH+sT+fj/RexiPB4AjIrXN2c4adR2kyPq3Vn2ENkuCClOz/dDhu GfHhdNJ/vjVRDdAg== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 66CFE13298; Thu, 4 Apr 2024 14:41:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id XIamFyK8DmZxDQAAn2gu4w (envelope-from ); Thu, 04 Apr 2024 14:41:38 +0000 From: Daniel Wagner To: James Smart Cc: Keith Busch , Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Wagner Subject: [PATCH v2 2/2] nvme-fc: rename free_ctrl callback to match name pattern Date: Thu, 4 Apr 2024 16:41:31 +0200 Message-ID: <20240404144131.17988-3-dwagner@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404144131.17988-1-dwagner@suse.de> References: <20240404144131.17988-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -0.17 X-Spam-Level: X-Spamd-Result: default: False [-0.17 / 50.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; BAYES_HAM(-0.37)[76.88%]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_SEVEN(0.00)[8]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap2.dmz-prg2.suse.org:helo,imap2.dmz-prg2.suse.org:rdns,suse.de:email]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" Rename nvme_fc_nvme_ctrl_freed to nvme_fc_free_ctrl to match the name pattern for the callback. Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Signed-off-by: Daniel Wagner Reviewed-by: Hannes Reinecke --- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 68a5d971657b..a5b29e9ad342 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2428,7 +2428,7 @@ nvme_fc_ctrl_get(struct nvme_fc_ctrl *ctrl) * controller. Called after last nvme_put_ctrl() call */ static void -nvme_fc_nvme_ctrl_freed(struct nvme_ctrl *nctrl) +nvme_fc_free_ctrl(struct nvme_ctrl *nctrl) { struct nvme_fc_ctrl *ctrl =3D to_fc_ctrl(nctrl); =20 @@ -3384,7 +3384,7 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = =3D { .reg_read32 =3D nvmf_reg_read32, .reg_read64 =3D nvmf_reg_read64, .reg_write32 =3D nvmf_reg_write32, - .free_ctrl =3D nvme_fc_nvme_ctrl_freed, + .free_ctrl =3D nvme_fc_free_ctrl, .submit_async_event =3D nvme_fc_submit_async_event, .delete_ctrl =3D nvme_fc_delete_ctrl, .get_address =3D nvmf_get_address, --=20 2.44.0