From: Chaitanya Kulkarni <kch@nvidia.com>
To: <linux-nvme@lists.infradead.org>
Cc: <hch@lst.de>, <sagi@grimberg.me>, <kbusch@kernel.org>,
Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH 2/3] nvme-core: don't check non-mdts for disc ctrl
Date: Sun, 10 Apr 2022 20:12:48 -0700 [thread overview]
Message-ID: <20220411031249.5158-3-kch@nvidia.com> (raw)
In-Reply-To: <20220411031249.5158-1-kch@nvidia.com>
Don't check the non mdts limits for the discovery controller as we
don't support I/O command set, this also masks the following warning
reported by the nvme_log_error() when running blktest nvme/002: -
[ 2005.155946] run blktests nvme/002 at 2022-04-09 16:57:47
[ 2005.192223] loop: module loaded
[ 2005.196429] nvmet: adding nsid 1 to subsystem blktests-subsystem-0
[ 2005.200334] nvmet: adding nsid 1 to subsystem blktests-subsystem-1
<------------------------------SNIP---------------------------------->
[ 2008.958108] nvmet: adding nsid 1 to subsystem blktests-subsystem-997
[ 2008.962082] nvmet: adding nsid 1 to subsystem blktests-subsystem-998
[ 2008.966102] nvmet: adding nsid 1 to subsystem blktests-subsystem-999
[ 2008.973132] nvmet: creating discovery controller 1 for subsystem nqn.2014-08.org.nvmexpress.discovery for NQN testhostnqn.
*[ 2008.973196] nvme1: Identify(0x6), Invalid Field in Command (sct 0x0 / sc 0x2) MORE DNR*
[ 2008.974595] nvme nvme1: new ctrl: "nqn.2014-08.org.nvmexpress.discovery"
[ 2009.103248] nvme nvme1: Removing ctrl: NQN "nqn.2014-08.org.nvmexpress.discovery"
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f204c6f78b5b..449378a96a9f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2876,6 +2876,10 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
struct nvme_id_ctrl_nvm *id;
int ret;
+ /* Discovery controller doesn't support non mdts limits */
+ if (nvme_discovery_ctrl(ctrl))
+ return 0;
+
if (ctrl->oncs & NVME_CTRL_ONCS_DSM) {
ctrl->max_discard_sectors = UINT_MAX;
ctrl->max_discard_segments = NVME_DSM_MAX_RANGES;
--
2.29.0
next prev parent reply other threads:[~2022-04-11 3:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-11 3:12 [PATCH 0/3] nvme: fix internal passthru error messages Chaitanya Kulkarni
2022-04-11 3:12 ` [PATCH 1/3] nvmet: handle admin default command set identifier Chaitanya Kulkarni
2022-04-11 6:18 ` Christoph Hellwig
2022-05-10 6:33 ` Christoph Hellwig
2022-04-11 3:12 ` Chaitanya Kulkarni [this message]
2022-04-11 6:13 ` [PATCH 2/3] nvme-core: don't check non-mdts for disc ctrl Christoph Hellwig
2022-04-11 10:27 ` Sagi Grimberg
2022-04-11 10:49 ` Chaitanya Kulkarni
2022-04-11 12:09 ` Chaitanya Kulkarni
2022-04-11 12:12 ` Christoph Hellwig
2022-04-11 12:40 ` Chaitanya Kulkarni
2022-04-11 14:14 ` Keith Busch
2022-04-11 20:44 ` Chaitanya Kulkarni
2022-04-11 23:51 ` Keith Busch
2022-05-10 6:21 ` Christoph Hellwig
2022-05-11 7:19 ` Chaitanya Kulkarni
2022-04-11 3:12 ` [PATCH 3/3] nvme-core: mark internal passthru req REQ_QUIET Chaitanya Kulkarni
2022-04-11 6:12 ` Christoph Hellwig
2022-04-11 10:48 ` Chaitanya Kulkarni
2022-04-11 10:28 ` Sagi Grimberg
2022-04-11 10:49 ` Chaitanya Kulkarni
2022-04-13 12:07 ` Yi Zhang
2022-04-15 5:59 ` Chaitanya Kulkarni
2022-04-13 16:48 ` Jonathan Derrick
2022-04-13 16:49 ` Jonathan Derrick
2022-04-13 16:52 ` Christoph Hellwig
2022-04-13 16:57 ` Jonathan Derrick
2022-04-13 17:09 ` Keith Busch
2022-04-13 17:11 ` Jonathan Derrick
2022-04-15 6:01 ` Chaitanya Kulkarni
2022-04-13 16:58 ` Keith Busch
2022-04-13 18:42 ` Alan Adamson
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=20220411031249.5158-3-kch@nvidia.com \
--to=kch@nvidia.com \
--cc=hch@lst.de \
--cc=kbusch@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