nvme(t)-fc: couple of fixes/cleanups
Subsystems (3)
v2 cover nvme(t)-fc: couple of fixes/cleanups
Both patches are just a rebased to the current nvme-6.9 head.
Daniel Wagner (2):
nvmet-fc: move RCU read lock to nvmet_fc_assoc_exists
nvme-fc: rename free_ctrl callback to match name pattern
drivers/nvme/host/fc.c | 4 ++-- drivers/nvme/target/fc.c | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-)
Signature · 1 line
2.44.0
PATCH v2 1/2 nvmet-fc: move RCU read lock to nvmet_fc_assoc_exists
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.
--- drivers/nvme/target/fc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/nvme/target/fc.c +10 -7
@@ -1115,16 +1115,21 @@ nvmet_fc_schedule_delete_assoc(struct nvmet_fc_tgt_assoc *assoc) }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 = false; +rcu_read_lock ();list_for_each_entry_rcu (a, &tgtport->assoc_list, a_list) { -if (association_id == a->association_id) -return true; +if (association_id == a->association_id) { + found = true; +break ; + } } +rcu_read_unlock (); -return false; +return found; } static struct nvmet_fc_tgt_assoc *
@@ -1164,13 +1169,11 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle) ran = ran <<BYTES_FOR_QID_SHIFT ;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 = ran;list_add_tail_rcu (&assoc->a_list, &tgtport->assoc_list); done = true; } -rcu_read_unlock ();spin_unlock_irqrestore (&tgtport->lock, flags); }while (!done);
Signature · 1 line
2.44.0
Re: [PATCH v2 1/2] nvmet-fc: move RCU read lock to nvmet_fc_assoc_exists
Quoted 11 lines · Daniel Wagner
The RCU lock is only needed for the lookup loop and not for
list_ad_tail_rcucall. Thus move it down the call chain intonvmet_fc_assoc_exists.While at it also fix the name typo of the function.
Signed-off-by Daniel Wagner <[email protected]>--- drivers/nvme/target/fc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
Re: [PATCH v2 1/2] nvmet-fc: move RCU read lock to nvmet_fc_assoc_exists
In reply to Daniel WagnerLooks good:
PATCH v2 2/2 nvme-fc: rename free_ctrl callback to match name pattern
In reply to Daniel WagnerRename nvme_fc_nvme_ctrl_freed to nvme_fc_free_ctrl to match the name pattern for the callback.
--- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +2 -2
@@ -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 =to_fc_ctrl (nctrl);
@@ -3384,7 +3384,7 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .free_ctrl = nvme_fc_nvme_ctrl_freed, + .free_ctrl = nvme_fc_free_ctrl, .submit_async_event = nvme_fc_submit_async_event, .delete_ctrl = nvme_fc_delete_ctrl, .get_address = nvmf_get_address,
Signature · 1 line
2.44.0
Re: [PATCH v2 2/2] nvme-fc: rename free_ctrl callback to match name pattern
Quoted 24 lines · Daniel Wagner
Rename
nvme_fc_nvme_ctrl_freedtonvme_fc_free_ctrlto match the name pattern for the callback.Reviewed-by Christoph Hellwig <[email protected]>Reviewed-by Sagi Grimberg <[email protected]>Signed-off-by Daniel Wagner <[email protected]>--- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/nvme/host/fc.c +1
-1@@ -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 =to_fc_ctrl (nctrl);
drivers/nvme/host/fc.c static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { · line 3390
Quoted 8 lines
drivers/nvme/host/fc.c +1
-1@@ -3384,7 +3384,7 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .free_ctrl = nvme_fc_nvme_ctrl_freed, + .free_ctrl = nvme_fc_free_ctrl, .submit_async_event = nvme_fc_submit_async_event, .delete_ctrl = nvme_fc_delete_ctrl, .get_address = nvmf_get_address,
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
Quoted 5 lines · Daniel Wagner
Both patches are just a rebased to the current nvme-6.9 head.
Daniel Wagner (2):
nvmet-fc: move RCU read lock tonvmet_fc_assoc_exists
nvme-fc: renamefree_ctrlcallback to match name pattern
Thanks, applied to nvme-6.9.