From 5adf099eed738c3f3e2934b4267ba8e8072f4f7c Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 20 Aug 2020 00:36:46 -0400 Subject: [PATCH] nvme: don't send Identify NS ID Descriptor List to inactive NS The specification says it will return INVALID FIELD if the NS is in inactive state. Fix issue #1551. Change-Id: I1b32f023ed665d410f4705e439068699e2b2f8de Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3860 Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- lib/nvme/nvme_ns.c | 5 +++++ test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/lib/nvme/nvme_ns.c b/lib/nvme/nvme_ns.c index 5d424e5c7..88939352a 100644 --- a/lib/nvme/nvme_ns.c +++ b/lib/nvme/nvme_ns.c @@ -373,6 +373,11 @@ int nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id, return rc; } + /* skip Identify NS ID Descriptor List for inactive NS */ + if (!spdk_nvme_ctrlr_is_active_ns(ctrlr, id)) { + return 0; + } + return nvme_ctrlr_identify_id_desc(ns); } diff --git a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c index 22c59e06c..ef3604ed4 100644 --- a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c +++ b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c @@ -46,6 +46,9 @@ DEFINE_STUB(nvme_wait_for_completion_robust_lock, int, struct nvme_completion_poll_status *status, pthread_mutex_t *robust_mutex), 0); +DEFINE_STUB(spdk_nvme_ctrlr_is_active_ns, bool, + (struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid), 1); + int nvme_ctrlr_cmd_identify(struct spdk_nvme_ctrlr *ctrlr, uint8_t cns, uint16_t cntid, uint32_t nsid, void *payload, size_t payload_size,