nvme-fc: set numa_node after nvme_init_ctrl
Subsystems (2)
PATCH 1/1 nvme-fc: set numa_node after nvme_init_ctrl
From: Keith Busch <[email protected]>
nvme_init_ctrl() always sets ctrl->numa_node to NUMA_NO_NODE. Set the desired value after that function call so it won't be overwritten.
--- drivers/nvme/host/fc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/nvme/host/fc.c +5 -4
@@ -3509,10 +3509,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, ctrl->ctrl.opts = opts; ctrl->ctrl.nr_reconnects =0 ; -if (lport->dev) - ctrl->ctrl.numa_node =dev_to_node (lport->dev); -else - ctrl->ctrl.numa_node =NUMA_NO_NODE ;INIT_LIST_HEAD (&ctrl->ctrl_list); ctrl->lport = lport; ctrl->rport = rport;
@@ -3558,6 +3554,11 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,if (ret) goto out_free_queues; +if (lport->dev) + ctrl->ctrl.numa_node =dev_to_node (lport->dev); +else + ctrl->ctrl.numa_node =NUMA_NO_NODE ; +/* at this point, teardown path changes to ref counting on nvme ctrl */ ret = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set,
Signature · 1 line
2.34.1
Quoted 4 lines · Keith Busch
From: Keith Busch <[email protected]>
nvme_init_ctrl()always setsctrl->numa_nodetoNUMA_NO_NODE. Set the desired value after that function call so it won't be overwritten.
Signature · 1 line
Jens Axboe
Quoted 6 lines · Keith Busch
From: Keith Busch <[email protected]>
nvme_init_ctrl()always setsctrl->numa_nodetoNUMA_NO_NODE. Set the desired value after that function call so it won't be overwritten.Signed-off-by Keith Busch <[email protected]>
Looks good:
Hi Keith,
Quoted 26 lines · Keith Busch
From: Keith Busch <[email protected]>
nvme_init_ctrl()always setsctrl->numa_nodetoNUMA_NO_NODE. Set the desired value after that function call so it won't be overwritten.Signed-off-by Keith Busch <[email protected]>--- drivers/nvme/host/fc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/nvme/host/fc.c +0
-4@@ -3509,10 +3509,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, ctrl->ctrl.opts = opts; ctrl->ctrl.nr_reconnects =0 ; -if (lport->dev) - ctrl->ctrl.numa_node =dev_to_node (lport->dev); -else - ctrl->ctrl.numa_node =NUMA_NO_NODE ;INIT_LIST_HEAD (&ctrl->ctrl_list); ctrl->lport = lport; ctrl->rport = rport;
drivers/nvme/host/fc.c nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, · line 3560
Quoted 7 lines
drivers/nvme/host/fc.c +4
-0@@ -3558,6 +3554,11 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,if (ret) goto out_free_queues; +if (lport->dev) + ctrl->ctrl.numa_node =dev_to_node (lport->dev); +else + ctrl->ctrl.numa_node =NUMA_NO_NODE ;
We don't need the "else" clause, it is initialized to NUMA_NO_NODE.
Otherwise,
Quoted 4 lines
drivers/nvme/host/fc.c +1
-0+/* at this point, teardown path changes to ref counting on nvme ctrl */ ret = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set,
Keith Busch
maintainerQuoted 7 lines · Max Gurtovoy
drivers/nvme/host/fc.c nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, · line 3560
Quoted 4 lines · Keith Busch
drivers/nvme/host/fc.c +4
-0+if (lport->dev) + ctrl->ctrl.numa_node =dev_to_node (lport->dev); +else + ctrl->ctrl.numa_node =NUMA_NO_NODE ;We don't need the "else" clause, it is initialized to
NUMA_NO_NODE.
This was just moving the existing hunk, but your suggestion is a nice bonus cleanup. I've folded it in and applied for nvme-6.8. Thanks!