public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Daniel Wagner <dwagner@suse.de>
To: linux-nvme@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
	Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
	James Smart <james.smart@broadcom.com>,
	Hannes Reinecke <hare@suse.de>, Daniel Wagner <dwagner@suse.de>
Subject: [PATCH v3 01/16] nvmet: report ioccsz and iorcsz for disc ctrl
Date: Mon, 18 Dec 2023 16:30:49 +0100	[thread overview]
Message-ID: <20231218153105.12717-2-dwagner@suse.de> (raw)
In-Reply-To: <20231218153105.12717-1-dwagner@suse.de>

The host started to verify the ioccsz and iorcsz values. I/O controllers
return valid values but not the discovery controllers. Use the same
values as for I/O controllers.

Fixes: 2fcd3ab39826 ("nvme-fabrics: check ioccsz and iorcsz")
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/nvme/target/discovery.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 668d257fa986..e3c4d247dd23 100644
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -249,6 +249,7 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req)
 {
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
 	struct nvme_id_ctrl *id;
+	u32 cmd_capsule_size;
 	u16 status = 0;
 
 	if (!nvmet_check_transfer_len(req, NVME_IDENTIFY_DATA_SIZE))
@@ -294,6 +295,18 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req)
 
 	strscpy(id->subnqn, ctrl->subsys->subsysnqn, sizeof(id->subnqn));
 
+	/*
+	 * Max command capsule size is sqe + in-capsule data size.
+	 * Disable in-capsule data for Metadata capable controllers.
+	 */
+	cmd_capsule_size = sizeof(struct nvme_command);
+	if (!ctrl->pi_support)
+		cmd_capsule_size += req->port->inline_data_size;
+	id->ioccsz = cpu_to_le32(cmd_capsule_size / 16);
+
+	/* Max response capsule size is cqe */
+	id->iorcsz = cpu_to_le32(sizeof(struct nvme_completion) / 16);
+
 	status = nvmet_copy_to_sgl(req, 0, id, sizeof(*id));
 
 	kfree(id);
-- 
2.43.0


  reply	other threads:[~2023-12-18 15:35 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-18 15:30 [PATCH v3 00/17] enable nvmet-fc for blktests Daniel Wagner
2023-12-18 15:30 ` Daniel Wagner [this message]
2023-12-19  4:27   ` [PATCH v3 01/16] nvmet: report ioccsz and iorcsz for disc ctrl Christoph Hellwig
2023-12-20  0:50     ` Max Gurtovoy
2023-12-19  7:24   ` Hannes Reinecke
2023-12-19 15:15     ` Daniel Wagner
2023-12-18 15:30 ` [PATCH v3 02/16] nvmet-fc: remove unnecessary bracket Daniel Wagner
2023-12-19  4:27   ` Christoph Hellwig
2023-12-19  7:25   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 03/16] nvmet-trace: avoid dereferencing pointer too early Daniel Wagner
2023-12-19  4:29   ` Christoph Hellwig
2023-12-18 15:30 ` [PATCH v3 04/16] nvmet-trace: null terminate device name string correctly Daniel Wagner
2023-12-19  4:29   ` Christoph Hellwig
2023-12-18 15:30 ` [PATCH v3 05/16] nvmet-fcloop: Remove remote port from list when unlinking Daniel Wagner
2023-12-19  4:31   ` Christoph Hellwig
2023-12-19  7:26   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 06/16] nvme-fc: Do not wait in vain when unloading module Daniel Wagner
2023-12-19  4:35   ` Christoph Hellwig
2024-01-05  5:05     ` Keith Busch
2023-12-19  7:28   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 07/16] nvmet-fc: Release reference on target port Daniel Wagner
2023-12-19  4:36   ` Christoph Hellwig
2023-12-19  7:28   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 08/16] nvmet-fc: untangle cross refcounting objects Daniel Wagner
2023-12-19  5:16   ` Christoph Hellwig
2023-12-21  9:15     ` Daniel Wagner
2024-01-26 15:32       ` Daniel Wagner
2023-12-19  7:59   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 09/16] nvmet-fc: free queue and assoc directly Daniel Wagner
2023-12-19  7:59   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 10/16] nvmet-fc: hold reference on hostport match Daniel Wagner
2023-12-19  8:00   ` Hannes Reinecke
2023-12-18 15:30 ` [PATCH v3 11/16] nvmet-fc: remove null hostport pointer check Daniel Wagner
2023-12-19 11:37   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 12/16] nvmet-fc: do not tack refs on tgtports from assoc Daniel Wagner
2023-12-19 11:38   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 13/16] nvmet-fc: abort command if when there is binding Daniel Wagner
2023-12-19 11:39   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 14/16] nvmet-fc: free hostport after release reference to tgtport Daniel Wagner
2023-12-19 11:41   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 15/16] nvmet-fc: avoid deadlock on delete association path Daniel Wagner
2023-12-19  6:00   ` kernel test robot
2023-12-19  8:29   ` kernel test robot
2023-12-19 11:17   ` kernel test robot
2023-12-19 11:43   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 16/16] nvmet-fc: take ref count on tgtport before delete assoc Daniel Wagner
2023-12-19 11:47   ` Hannes Reinecke
2023-12-18 15:31 ` [PATCH v3 17/17] nvmet-fc: add extensive debug logging Daniel Wagner
2023-12-19 11:54   ` Hannes Reinecke
2023-12-19 14:06     ` Daniel Wagner
2023-12-18 16:10 ` [PATCH v3 00/17] enable nvmet-fc for blktests Maurizio Lombardi
2024-01-02 21:36 ` Keith Busch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231218153105.12717-2-dwagner@suse.de \
    --to=dwagner@suse.de \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=james.smart@broadcom.com \
    --cc=kbusch@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox