[PATCH 6/6] nvme: display correct subsystem NQN

[Himanshu Madhani]

> On Sep 21, 2021, at 10:15 AM, Hannes Reinecke <hare at suse.de> wrote:
> 
> With discovery controllers supporting unique subsystem NQNs the
> actual subsystem NQN might be different from that one passed in
> via the connect args. So add a helper to display the resulting
> subsystem NQN.
> 
> Signed-off-by: Hannes Reinecke <hare at suse.de>
> ---
> drivers/nvme/host/core.c    | 2 +-
> drivers/nvme/host/fabrics.h | 5 +++++
> drivers/nvme/host/fc.c      | 2 +-
> drivers/nvme/host/rdma.c    | 2 +-
> drivers/nvme/host/tcp.c     | 2 +-
> 5 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index ad01e2778cb6..084a2df2a58e 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -221,7 +221,7 @@ int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)
> static void nvme_do_delete_ctrl(struct nvme_ctrl *ctrl)
> {
> 	dev_info(ctrl->device,
> -		 "Removing ctrl: NQN \"%s\"\n", ctrl->opts->subsysnqn);
> +		 "Removing ctrl: NQN \"%s\"\n", nvmf_ctrl_subsysnqn(ctrl));
> 
> 	flush_work(&ctrl->reset_work);
> 	nvme_stop_ctrl(ctrl);
> diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
> index b61b666e10ec..56253a060258 100644
> --- a/drivers/nvme/host/fabrics.h
> +++ b/drivers/nvme/host/fabrics.h
> @@ -179,6 +179,11 @@ nvmf_ctlr_matches_baseopts(struct nvme_ctrl *ctrl,
> 	return true;
> }
> 
> +static inline char *nvmf_ctrl_subsysnqn(struct nvme_ctrl *ctrl)
> +{
> +	return ctrl->subsys ? ctrl->subsys->subnqn : ctrl->opts->subsysnqn;
> +}
> +
> int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val);
> int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val);
> int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val);
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index aa14ad963d91..fa8bd6c21073 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -3572,7 +3572,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
> 
> 	dev_info(ctrl->ctrl.device,
> 		"NVME-FC{%d}: new ctrl: NQN \"%s\"\n",
> -		ctrl->cnum, ctrl->ctrl.opts->subsysnqn);
> +		ctrl->cnum, nvmf_ctrl_subsysnqn(&ctrl->ctrl));
> 
> 	return &ctrl->ctrl;
> 
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 042c594bc57e..d795a9868674 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -2385,7 +2385,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
> 		goto out_uninit_ctrl;
> 
> 	dev_info(ctrl->ctrl.device, "new ctrl: NQN \"%s\", addr %pISpcs\n",
> -		ctrl->ctrl.opts->subsysnqn, &ctrl->addr);
> +		nvmf_ctrl_subsysnqn(&ctrl->ctrl), &ctrl->addr);
> 
> 	mutex_lock(&nvme_rdma_ctrl_mutex);
> 	list_add_tail(&ctrl->list, &nvme_rdma_ctrl_list);
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 3c1c29dd3020..78966b8ddb1e 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -2582,7 +2582,7 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,
> 		goto out_uninit_ctrl;
> 
> 	dev_info(ctrl->ctrl.device, "new ctrl: NQN \"%s\", addr %pISp\n",
> -		ctrl->ctrl.opts->subsysnqn, &ctrl->addr);
> +		nvmf_ctrl_subsysnqn(&ctrl->ctrl), &ctrl->addr);
> 
> 	mutex_lock(&nvme_tcp_ctrl_mutex);
> 	list_add_tail(&ctrl->list, &nvme_tcp_ctrl_list);
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme

Looks Good. 

Reviewed-by: Himanshu Madhani <himanshu.madhani at oracle.com>

--
Himanshu Madhani	 Oracle Linux Engineering