From: Hannes Reinecke <hare@suse.de>

Date: Wed, 22 Sep 2021 08:35:25 +0200

Subject: nvme: display correct subsystem NQN

Patch-mainline: v5.16-rc1

Git-commit: e5ea42faa773c6a6bb5d9e9f5c2cc808940b5a55

References: bsc#1192761

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@suse.de>

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/nvme/host/core.c    |    2 +-

 drivers/nvme/host/fabrics.h |    7 +++++++

 drivers/nvme/host/fc.c      |    2 +-

 drivers/nvme/host/rdma.c    |    2 +-

 drivers/nvme/host/tcp.c     |    2 +-

 5 files changed, 11 insertions(+), 4 deletions(-)

--- a/drivers/nvme/host/core.c

+++ b/drivers/nvme/host/core.c

@@ -208,7 +208,7 @@ EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);

 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);

--- a/drivers/nvme/host/fabrics.h

+++ b/drivers/nvme/host/fabrics.h

@@ -179,6 +179,13 @@ nvmf_ctlr_matches_baseopts(struct nvme_c

 	return true;

 }

+static inline char *nvmf_ctrl_subsysnqn(struct nvme_ctrl *ctrl)

+{

+	if (!ctrl->subsys)

+		return ctrl->opts->subsysnqn;

+	return ctrl->subsys->subnqn;

+}

+

 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);

--- a/drivers/nvme/host/fc.c

+++ b/drivers/nvme/host/fc.c

@@ -3573,7 +3573,7 @@ nvme_fc_init_ctrl(struct device *dev, st

 	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;

--- a/drivers/nvme/host/rdma.c

+++ b/drivers/nvme/host/rdma.c

@@ -2392,7 +2392,7 @@ static struct nvme_ctrl *nvme_rdma_creat

 		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);

--- a/drivers/nvme/host/tcp.c

+++ b/drivers/nvme/host/tcp.c

@@ -2614,7 +2614,7 @@ static struct nvme_ctrl *nvme_tcp_create

 		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);