diff mbox series

[v3,1/2] hw/nvme: fix endianess conversion and add controller list

Message ID 20210614162927.10515-1-anaidu.gollu@samsung.com (mailing list archive)
State New, archived
Headers show
Series [v3,1/2] hw/nvme: fix endianess conversion and add controller list | expand

Commit Message

Gollu Appalanaidu June 14, 2021, 4:29 p.m. UTC 
Add the controller identifiers list CNS 0x13, available list of ctrls
in NVM Subsystem that may or may not be attached to namespaces.

In Identify Ctrl List of the CNS 0x12 and 0x13 no endian conversion
for the nsid field.

These two CNS values shows affect when there exists a Subsystem.
Added condition if there is no Subsystem return invalid field in
command.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>

-v3:
 Added condition if there is no Subsystem return invalid field in
 command

-v2:
 Fix the review comments from Klaus and squashed 2nd commit into
 1st commit
---
 hw/nvme/ctrl.c       | 26 ++++++++++++++++++--------
 hw/nvme/trace-events |  2 +-
 include/block/nvme.h |  1 +
 3 files changed, 20 insertions(+), 9 deletions(-)

Comments

Klaus Jensen June 17, 2021, 9:31 a.m. UTC | #1 
On Jun 14 21:59, Gollu Appalanaidu wrote:
>Add the controller identifiers list CNS 0x13, available list of ctrls
>in NVM Subsystem that may or may not be attached to namespaces.
>
>In Identify Ctrl List of the CNS 0x12 and 0x13 no endian conversion
>for the nsid field.
>
>These two CNS values shows affect when there exists a Subsystem.
>Added condition if there is no Subsystem return invalid field in
>command.
>
>Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
>
>-v3:
> Added condition if there is no Subsystem return invalid field in
> command
>
>-v2:
> Fix the review comments from Klaus and squashed 2nd commit into
> 1st commit
>---
> hw/nvme/ctrl.c       | 26 ++++++++++++++++++--------
> hw/nvme/trace-events |  2 +-
> include/block/nvme.h |  1 +
> 3 files changed, 20 insertions(+), 9 deletions(-)
>

Series LGTM.

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Klaus Jensen June 28, 2021, 5:06 p.m. UTC | #2 
On Jun 17 11:31, Klaus Jensen wrote:
>On Jun 14 21:59, Gollu Appalanaidu wrote:
>>Add the controller identifiers list CNS 0x13, available list of ctrls
>>in NVM Subsystem that may or may not be attached to namespaces.
>>
>>In Identify Ctrl List of the CNS 0x12 and 0x13 no endian conversion
>>for the nsid field.
>>
>>These two CNS values shows affect when there exists a Subsystem.
>>Added condition if there is no Subsystem return invalid field in
>>command.
>>
>>Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
>>
>>-v3:
>>Added condition if there is no Subsystem return invalid field in
>>command
>>
>>-v2:
>>Fix the review comments from Klaus and squashed 2nd commit into
>>1st commit
>>---
>>hw/nvme/ctrl.c       | 26 ++++++++++++++++++--------
>>hw/nvme/trace-events |  2 +-
>>include/block/nvme.h |  1 +
>>3 files changed, 20 insertions(+), 9 deletions(-)
>>
>
>Series LGTM.
>
>Reviewed-by: Klaus Jensen <k.jensen@samsung.com>

Applied to nvme-next. Thanks!
diff mbox series

Patch

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 2e7498a73e..d513b022c4 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -4251,9 +4251,11 @@  static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req, bool active)
     return NVME_INVALID_CMD_SET | NVME_DNR;
 }
 
-static uint16_t nvme_identify_ns_attached_list(NvmeCtrl *n, NvmeRequest *req)
+static uint16_t nvme_identify_ctrl_list(NvmeCtrl *n, NvmeRequest *req,
+                                        bool attached)
 {
     NvmeIdentify *c = (NvmeIdentify *)&req->cmd;
+    uint32_t nsid = le32_to_cpu(c->nsid);
     uint16_t min_id = le16_to_cpu(c->ctrlid);
     uint16_t list[NVME_CONTROLLER_LIST_SIZE] = {};
     uint16_t *ids = &list[1];
@@ -4261,15 +4263,21 @@  static uint16_t nvme_identify_ns_attached_list(NvmeCtrl *n, NvmeRequest *req)
     NvmeCtrl *ctrl;
     int cntlid, nr_ids = 0;
 
-    trace_pci_nvme_identify_ns_attached_list(min_id);
+    trace_pci_nvme_identify_ctrl_list(c->cns, min_id);
 
-    if (c->nsid == NVME_NSID_BROADCAST) {
+    if (!n->subsys) {
         return NVME_INVALID_FIELD | NVME_DNR;
     }
 
-    ns = nvme_subsys_ns(n->subsys, c->nsid);
-    if (!ns) {
-        return NVME_INVALID_FIELD | NVME_DNR;
+    if (attached) {
+        if (nsid == NVME_NSID_BROADCAST) {
+            return NVME_INVALID_FIELD | NVME_DNR;
+        }
+
+        ns = nvme_subsys_ns(n->subsys, nsid);
+        if (!ns) {
+            return NVME_INVALID_FIELD | NVME_DNR;
+        }
     }
 
     for (cntlid = min_id; cntlid < ARRAY_SIZE(n->subsys->ctrls); cntlid++) {
@@ -4278,7 +4286,7 @@  static uint16_t nvme_identify_ns_attached_list(NvmeCtrl *n, NvmeRequest *req)
             continue;
         }
 
-        if (!nvme_ns(ctrl, c->nsid)) {
+        if (attached && !nvme_ns(ctrl, nsid)) {
             continue;
         }
 
@@ -4493,7 +4501,9 @@  static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req)
     case NVME_ID_CNS_NS_PRESENT:
         return nvme_identify_ns(n, req, false);
     case NVME_ID_CNS_NS_ATTACHED_CTRL_LIST:
-        return nvme_identify_ns_attached_list(n, req);
+        return nvme_identify_ctrl_list(n, req, true);
+    case NVME_ID_CNS_CTRL_LIST:
+        return nvme_identify_ctrl_list(n, req, false);
     case NVME_ID_CNS_CS_NS:
         return nvme_identify_ns_csi(n, req, true);
     case NVME_ID_CNS_CS_NS_PRESENT:
diff --git a/hw/nvme/trace-events b/hw/nvme/trace-events
index ea33d0ccc3..4976eb9bec 100644
--- a/hw/nvme/trace-events
+++ b/hw/nvme/trace-events
@@ -55,7 +55,7 @@  pci_nvme_identify(uint16_t cid, uint8_t cns, uint16_t ctrlid, uint8_t csi) "cid
 pci_nvme_identify_ctrl(void) "identify controller"
 pci_nvme_identify_ctrl_csi(uint8_t csi) "identify controller, csi=0x%"PRIx8""
 pci_nvme_identify_ns(uint32_t ns) "nsid %"PRIu32""
-pci_nvme_identify_ns_attached_list(uint16_t cntid) "cntid=%"PRIu16""
+pci_nvme_identify_ctrl_list(uint8_t cns, uint16_t cntid) "cns 0x%"PRIx8" cntid %"PRIu16""
 pci_nvme_identify_ns_csi(uint32_t ns, uint8_t csi) "nsid=%"PRIu32", csi=0x%"PRIx8""
 pci_nvme_identify_nslist(uint32_t ns) "nsid %"PRIu32""
 pci_nvme_identify_nslist_csi(uint16_t ns, uint8_t csi) "nsid=%"PRIu16", csi=0x%"PRIx8""
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 0ff9ce17a9..188ab460df 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -980,6 +980,7 @@  enum NvmeIdCns {
     NVME_ID_CNS_NS_PRESENT_LIST       = 0x10,
     NVME_ID_CNS_NS_PRESENT            = 0x11,
     NVME_ID_CNS_NS_ATTACHED_CTRL_LIST = 0x12,
+    NVME_ID_CNS_CTRL_LIST             = 0x13,
     NVME_ID_CNS_CS_NS_PRESENT_LIST    = 0x1a,
     NVME_ID_CNS_CS_NS_PRESENT         = 0x1b,
     NVME_ID_CNS_IO_COMMAND_SET        = 0x1c,