[PATCH] nvme-fc: set numa_node after nvme_init_ctrl

[Max Gurtovoy]

Hi Keith,

On 19/12/2023 19:49, Keith Busch wrote:
> From: Keith Busch <kbusch at kernel.org>
> 
> 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.
> 
> Signed-off-by: Keith Busch <kbusch at kernel.org>
> ---
>   drivers/nvme/host/fc.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 9f9a3b35dc64d..2de506d58593b 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -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;

We don't need the "else" clause, it is initialized to NUMA_NO_NODE.

Otherwise,

Reviewed-by: Max Gurtovoy <mgurtovoy at nvidia.com>

> +
>   	/* at this point, teardown path changes to ref counting on nvme ctrl */
>   
>   	ret = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set,