| Message ID | 20201019021726.12048-4-dmitry.fomichev@wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set | expand |
On Mon, Oct 19, 2020 at 11:17:18AM +0900, Dmitry Fomichev wrote: > + QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) != 4); ... > QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) != 4); You've got duplicate sizeof checks for the NvmeIdNsDescr. Otherwise, the patch looks fine.
On Oct 19 11:17, Dmitry Fomichev wrote: > From: Niklas Cassel <niklas.cassel@wdc.com> > > Define the structures and constants required to implement > Namespace Types support. > > Namespace Types introduce a new command set, "I/O Command Sets", > that allows the host to retrieve the command sets associated with > a namespace. Introduce support for the command set and enable > detection for the NVM Command Set. > > The new workflows for identify commands rely heavily on zero-filled > identify structs. E.g., certain CNS commands are defined to return > a zero-filled identify struct when an inactive namespace NSID > is supplied. > > Add a helper function in order to avoid code duplication when > reporting zero-filled identify structures. > > Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> > Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> > --- > hw/block/nvme-ns.c | 2 + > hw/block/nvme-ns.h | 1 + > hw/block/nvme.c | 169 +++++++++++++++++++++++++++++++++++------- > hw/block/trace-events | 7 ++ > include/block/nvme.h | 65 ++++++++++++---- > 5 files changed, 202 insertions(+), 42 deletions(-) > > diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c > index de735eb9f3..c0362426cc 100644 > --- a/hw/block/nvme-ns.c > +++ b/hw/block/nvme-ns.c > @@ -41,6 +41,8 @@ static void nvme_ns_init(NvmeNamespace *ns) > > id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns)); > > + ns->csi = NVME_CSI_NVM; > + > /* no thin provisioning */ > id_ns->ncap = id_ns->nsze; > id_ns->nuse = id_ns->ncap; > diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h > index a38071884a..d795e44bab 100644 > --- a/hw/block/nvme-ns.h > +++ b/hw/block/nvme-ns.h > @@ -31,6 +31,7 @@ typedef struct NvmeNamespace { > int64_t size; > NvmeIdNs id_ns; > const uint32_t *iocs; > + uint8_t csi; > > NvmeNamespaceParams params; > } NvmeNamespace; > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 29139d8a17..ca0d0abf5c 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -1503,6 +1503,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req) > return NVME_SUCCESS; > } > > +static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n, NvmeRequest *req) > +{ > + uint8_t id[NVME_IDENTIFY_DATA_SIZE] = {}; [-pedantic] empty initializer list > + > + return nvme_dma(n, id, sizeof(id), DMA_DIRECTION_FROM_DEVICE, req); > +} > + > static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) > { > trace_pci_nvme_identify_ctrl(); > @@ -1511,11 +1518,23 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) > DMA_DIRECTION_FROM_DEVICE, req); > } > > +static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req) > +{ > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > + > + trace_pci_nvme_identify_ctrl_csi(c->csi); > + > + if (c->csi == NVME_CSI_NVM) { > + return nvme_rpt_empty_id_struct(n, req); > + } > + > + return NVME_INVALID_FIELD | NVME_DNR; > +} > + > static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) > { > NvmeNamespace *ns; > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > - NvmeIdNs *id_ns, inactive = { 0 }; > uint32_t nsid = le32_to_cpu(c->nsid); > > trace_pci_nvme_identify_ns(nsid); > @@ -1526,23 +1545,46 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) > > ns = nvme_ns(n, nsid); > if (unlikely(!ns)) { > - id_ns = &inactive; > - } else { > - id_ns = &ns->id_ns; > + return nvme_rpt_empty_id_struct(n, req); > } > > - return nvme_dma(n, (uint8_t *)id_ns, sizeof(NvmeIdNs), > + return nvme_dma(n, (uint8_t *)&ns->id_ns, sizeof(NvmeIdNs), > DMA_DIRECTION_FROM_DEVICE, req); > } > > +static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req) > +{ > + NvmeNamespace *ns; > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > + uint32_t nsid = le32_to_cpu(c->nsid); > + > + trace_pci_nvme_identify_ns_csi(nsid, c->csi); > + > + if (!nvme_nsid_valid(n, nsid) || nsid == NVME_NSID_BROADCAST) { > + return NVME_INVALID_NSID | NVME_DNR; > + } > + > + ns = nvme_ns(n, nsid); > + if (unlikely(!ns)) { > + return nvme_rpt_empty_id_struct(n, req); > + } > + > + if (c->csi == NVME_CSI_NVM) { > + return nvme_rpt_empty_id_struct(n, req); > + } > + > + return NVME_INVALID_FIELD | NVME_DNR; > +} > + > static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) > { > + NvmeNamespace *ns; > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > - static const int data_len = NVME_IDENTIFY_DATA_SIZE; > uint32_t min_nsid = le32_to_cpu(c->nsid); > - uint32_t *list; > - uint16_t ret; > - int j = 0; > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; [-pedantic] empty initializer list > + static const int data_len = sizeof(list); > + uint32_t *list_ptr = (uint32_t *)list; > + int i, j = 0; > > trace_pci_nvme_identify_nslist(min_nsid); > > @@ -1556,20 +1598,54 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) > return NVME_INVALID_NSID | NVME_DNR; > } > > - list = g_malloc0(data_len); > - for (int i = 1; i <= n->num_namespaces; i++) { > - if (i <= min_nsid || !nvme_ns(n, i)) { > + for (i = 1; i <= n->num_namespaces; i++) { > + ns = nvme_ns(n, i); > + if (!ns) { > continue; > } > - list[j++] = cpu_to_le32(i); > + if (ns->params.nsid < min_nsid) { Since i == ns->params.nsid, this should be '<=' like the code you removed. It really shouldn't be called min_nsid, but oh well. > + continue; > + } > + list_ptr[j++] = cpu_to_le32(ns->params.nsid); > if (j == data_len / sizeof(uint32_t)) { > break; > } > } > - ret = nvme_dma(n, (uint8_t *)list, data_len, DMA_DIRECTION_FROM_DEVICE, > - req); > - g_free(list); > - return ret; > + > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); > +} > + > +static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req) > +{ > + NvmeNamespace *ns; > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > + uint32_t min_nsid = le32_to_cpu(c->nsid); > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; > + static const int data_len = sizeof(list); > + uint32_t *list_ptr = (uint32_t *)list; > + int i, j = 0; > + > + trace_pci_nvme_identify_nslist_csi(min_nsid, c->csi); > + > + if (c->csi != NVME_CSI_NVM) { > + return NVME_INVALID_FIELD | NVME_DNR; > + } > + This is missing the check for 0xffffffff and 0xfffffffe like above. > + for (i = 1; i <= n->num_namespaces; i++) { > + ns = nvme_ns(n, i); > + if (!ns) { > + continue; > + } > + if (ns->params.nsid < min_nsid) { Should be '<='. > + continue; > + } > + list_ptr[j++] = cpu_to_le32(ns->params.nsid); > + if (j == data_len / sizeof(uint32_t)) { > + break; > + } > + } > + > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); > } > > static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > @@ -1577,13 +1653,17 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > NvmeNamespace *ns; > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > uint32_t nsid = le32_to_cpu(c->nsid); > - uint8_t list[NVME_IDENTIFY_DATA_SIZE]; > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; [-pedantic] empty initializer list > > struct data { > struct { > NvmeIdNsDescr hdr; > - uint8_t v[16]; > + uint8_t v[NVME_NIDL_UUID]; > } uuid; > + struct { > + NvmeIdNsDescr hdr; > + uint8_t v; > + } csi; > }; > > struct data *ns_descrs = (struct data *)list; > @@ -1599,19 +1679,31 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > return NVME_INVALID_FIELD | NVME_DNR; > } > > - memset(list, 0x0, sizeof(list)); > - > /* > * Because the NGUID and EUI64 fields are 0 in the Identify Namespace data > * structure, a Namespace UUID (nidt = 0x3) must be reported in the > * Namespace Identification Descriptor. Add the namespace UUID here. > */ > ns_descrs->uuid.hdr.nidt = NVME_NIDT_UUID; > - ns_descrs->uuid.hdr.nidl = NVME_NIDT_UUID_LEN; > - memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDT_UUID_LEN); > + ns_descrs->uuid.hdr.nidl = NVME_NIDL_UUID; > + memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDL_UUID); > > - return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE, > - DMA_DIRECTION_FROM_DEVICE, req); > + ns_descrs->csi.hdr.nidt = NVME_NIDT_CSI; > + ns_descrs->csi.hdr.nidl = NVME_NIDL_CSI; > + ns_descrs->csi.v = ns->csi; > + > + return nvme_dma(n, list, sizeof(list), DMA_DIRECTION_FROM_DEVICE, req); > +} > + > +static uint16_t nvme_identify_cmd_set(NvmeCtrl *n, NvmeRequest *req) > +{ > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; [-pedantic] empty initializer list > + static const int data_len = sizeof(list); > + > + trace_pci_nvme_identify_cmd_set(); > + > + NVME_SET_CSI(*list, NVME_CSI_NVM); > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); > } >
> -----Original Message----- > From: Klaus Jensen <its@irrelevant.dk> > Sent: Monday, October 19, 2020 4:54 PM > To: Dmitry Fomichev <Dmitry.Fomichev@wdc.com> > Cc: Keith Busch <kbusch@kernel.org>; Klaus Jensen > <k.jensen@samsung.com>; Kevin Wolf <kwolf@redhat.com>; Philippe > Mathieu-Daudé <philmd@redhat.com>; Maxim Levitsky > <mlevitsk@redhat.com>; Fam Zheng <fam@euphon.net>; Niklas Cassel > <Niklas.Cassel@wdc.com>; Damien Le Moal <Damien.LeMoal@wdc.com>; > qemu-block@nongnu.org; qemu-devel@nongnu.org; Alistair Francis > <Alistair.Francis@wdc.com>; Matias Bjorling <Matias.Bjorling@wdc.com> > Subject: Re: [PATCH v7 03/11] hw/block/nvme: Add support for Namespace > Types > > On Oct 19 11:17, Dmitry Fomichev wrote: > > From: Niklas Cassel <niklas.cassel@wdc.com> > > > > Define the structures and constants required to implement > > Namespace Types support. > > > > Namespace Types introduce a new command set, "I/O Command Sets", > > that allows the host to retrieve the command sets associated with > > a namespace. Introduce support for the command set and enable > > detection for the NVM Command Set. > > > > The new workflows for identify commands rely heavily on zero-filled > > identify structs. E.g., certain CNS commands are defined to return > > a zero-filled identify struct when an inactive namespace NSID > > is supplied. > > > > Add a helper function in order to avoid code duplication when > > reporting zero-filled identify structures. > > > > Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> > > Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> > > --- > > hw/block/nvme-ns.c | 2 + > > hw/block/nvme-ns.h | 1 + > > hw/block/nvme.c | 169 +++++++++++++++++++++++++++++++++++------- > > hw/block/trace-events | 7 ++ > > include/block/nvme.h | 65 ++++++++++++---- > > 5 files changed, 202 insertions(+), 42 deletions(-) > > > > diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c > > index de735eb9f3..c0362426cc 100644 > > --- a/hw/block/nvme-ns.c > > +++ b/hw/block/nvme-ns.c > > @@ -41,6 +41,8 @@ static void nvme_ns_init(NvmeNamespace *ns) > > > > id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns)); > > > > + ns->csi = NVME_CSI_NVM; > > + > > /* no thin provisioning */ > > id_ns->ncap = id_ns->nsze; > > id_ns->nuse = id_ns->ncap; > > diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h > > index a38071884a..d795e44bab 100644 > > --- a/hw/block/nvme-ns.h > > +++ b/hw/block/nvme-ns.h > > @@ -31,6 +31,7 @@ typedef struct NvmeNamespace { > > int64_t size; > > NvmeIdNs id_ns; > > const uint32_t *iocs; > > + uint8_t csi; > > > > NvmeNamespaceParams params; > > } NvmeNamespace; > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index 29139d8a17..ca0d0abf5c 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -1503,6 +1503,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, > NvmeRequest *req) > > return NVME_SUCCESS; > > } > > > > +static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n, NvmeRequest > *req) > > +{ > > + uint8_t id[NVME_IDENTIFY_DATA_SIZE] = {}; > > [-pedantic] empty initializer list > > > + > > + return nvme_dma(n, id, sizeof(id), DMA_DIRECTION_FROM_DEVICE, > req); > > +} > > + > > static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) > > { > > trace_pci_nvme_identify_ctrl(); > > @@ -1511,11 +1518,23 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl > *n, NvmeRequest *req) > > DMA_DIRECTION_FROM_DEVICE, req); > > } > > > > +static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req) > > +{ > > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > + > > + trace_pci_nvme_identify_ctrl_csi(c->csi); > > + > > + if (c->csi == NVME_CSI_NVM) { > > + return nvme_rpt_empty_id_struct(n, req); > > + } > > + > > + return NVME_INVALID_FIELD | NVME_DNR; > > +} > > + > > static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) > > { > > NvmeNamespace *ns; > > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > - NvmeIdNs *id_ns, inactive = { 0 }; > > uint32_t nsid = le32_to_cpu(c->nsid); > > > > trace_pci_nvme_identify_ns(nsid); > > @@ -1526,23 +1545,46 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, > NvmeRequest *req) > > > > ns = nvme_ns(n, nsid); > > if (unlikely(!ns)) { > > - id_ns = &inactive; > > - } else { > > - id_ns = &ns->id_ns; > > + return nvme_rpt_empty_id_struct(n, req); > > } > > > > - return nvme_dma(n, (uint8_t *)id_ns, sizeof(NvmeIdNs), > > + return nvme_dma(n, (uint8_t *)&ns->id_ns, sizeof(NvmeIdNs), > > DMA_DIRECTION_FROM_DEVICE, req); > > } > > > > +static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req) > > +{ > > + NvmeNamespace *ns; > > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > + uint32_t nsid = le32_to_cpu(c->nsid); > > + > > + trace_pci_nvme_identify_ns_csi(nsid, c->csi); > > + > > + if (!nvme_nsid_valid(n, nsid) || nsid == NVME_NSID_BROADCAST) { > > + return NVME_INVALID_NSID | NVME_DNR; > > + } > > + > > + ns = nvme_ns(n, nsid); > > + if (unlikely(!ns)) { > > + return nvme_rpt_empty_id_struct(n, req); > > + } > > + > > + if (c->csi == NVME_CSI_NVM) { > > + return nvme_rpt_empty_id_struct(n, req); > > + } > > + > > + return NVME_INVALID_FIELD | NVME_DNR; > > +} > > + > > static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) > > { > > + NvmeNamespace *ns; > > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > - static const int data_len = NVME_IDENTIFY_DATA_SIZE; > > uint32_t min_nsid = le32_to_cpu(c->nsid); > > - uint32_t *list; > > - uint16_t ret; > > - int j = 0; > > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; > > [-pedantic] empty initializer list > > > + static const int data_len = sizeof(list); > > + uint32_t *list_ptr = (uint32_t *)list; > > + int i, j = 0; > > > > trace_pci_nvme_identify_nslist(min_nsid); > > > > @@ -1556,20 +1598,54 @@ static uint16_t nvme_identify_nslist(NvmeCtrl > *n, NvmeRequest *req) > > return NVME_INVALID_NSID | NVME_DNR; > > } > > > > - list = g_malloc0(data_len); > > - for (int i = 1; i <= n->num_namespaces; i++) { > > - if (i <= min_nsid || !nvme_ns(n, i)) { > > + for (i = 1; i <= n->num_namespaces; i++) { > > + ns = nvme_ns(n, i); > > + if (!ns) { > > continue; > > } > > - list[j++] = cpu_to_le32(i); > > + if (ns->params.nsid < min_nsid) { > > Since i == ns->params.nsid, this should be '<=' like the code you > removed. It really shouldn't be called min_nsid, but oh well. Right, needs to be <=. We can rename min_nsid to start_nsid or similer since we are touching this code anyway. > > > + continue; > > + } > > + list_ptr[j++] = cpu_to_le32(ns->params.nsid); > > if (j == data_len / sizeof(uint32_t)) { > > break; > > } > > } > > - ret = nvme_dma(n, (uint8_t *)list, data_len, > DMA_DIRECTION_FROM_DEVICE, > > - req); > > - g_free(list); > > - return ret; > > + > > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, > req); > > +} > > + > > +static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req) > > +{ > > + NvmeNamespace *ns; > > + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > + uint32_t min_nsid = le32_to_cpu(c->nsid); > > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; > > + static const int data_len = sizeof(list); > > + uint32_t *list_ptr = (uint32_t *)list; > > + int i, j = 0; > > + > > + trace_pci_nvme_identify_nslist_csi(min_nsid, c->csi); > > + > > + if (c->csi != NVME_CSI_NVM) { > > + return NVME_INVALID_FIELD | NVME_DNR; > > + } > > + > > This is missing the check for 0xffffffff and 0xfffffffe like above. Will add the similar check here. > > > + for (i = 1; i <= n->num_namespaces; i++) { > > + ns = nvme_ns(n, i); > > + if (!ns) { > > + continue; > > + } > > + if (ns->params.nsid < min_nsid) { > > Should be '<='. > > > + continue; > > + } > > + list_ptr[j++] = cpu_to_le32(ns->params.nsid); > > + if (j == data_len / sizeof(uint32_t)) { > > + break; > > + } > > + } > > + > > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, > req); > > } > > > > static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest > *req) > > @@ -1577,13 +1653,17 @@ static uint16_t > nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > > NvmeNamespace *ns; > > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > uint32_t nsid = le32_to_cpu(c->nsid); > > - uint8_t list[NVME_IDENTIFY_DATA_SIZE]; > > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; > > [-pedantic] empty initializer list > > > > > struct data { > > struct { > > NvmeIdNsDescr hdr; > > - uint8_t v[16]; > > + uint8_t v[NVME_NIDL_UUID]; > > } uuid; > > + struct { > > + NvmeIdNsDescr hdr; > > + uint8_t v; > > + } csi; > > }; > > > > struct data *ns_descrs = (struct data *)list; > > @@ -1599,19 +1679,31 @@ static uint16_t > nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > > return NVME_INVALID_FIELD | NVME_DNR; > > } > > > > - memset(list, 0x0, sizeof(list)); > > - > > /* > > * Because the NGUID and EUI64 fields are 0 in the Identify Namespace > data > > * structure, a Namespace UUID (nidt = 0x3) must be reported in the > > * Namespace Identification Descriptor. Add the namespace UUID here. > > */ > > ns_descrs->uuid.hdr.nidt = NVME_NIDT_UUID; > > - ns_descrs->uuid.hdr.nidl = NVME_NIDT_UUID_LEN; > > - memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, > NVME_NIDT_UUID_LEN); > > + ns_descrs->uuid.hdr.nidl = NVME_NIDL_UUID; > > + memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, > NVME_NIDL_UUID); > > > > - return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE, > > - DMA_DIRECTION_FROM_DEVICE, req); > > + ns_descrs->csi.hdr.nidt = NVME_NIDT_CSI; > > + ns_descrs->csi.hdr.nidl = NVME_NIDL_CSI; > > + ns_descrs->csi.v = ns->csi; > > + > > + return nvme_dma(n, list, sizeof(list), DMA_DIRECTION_FROM_DEVICE, > req); > > +} > > + > > +static uint16_t nvme_identify_cmd_set(NvmeCtrl *n, NvmeRequest *req) > > +{ > > + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; > > [-pedantic] empty initializer list > > > + static const int data_len = sizeof(list); > > + > > + trace_pci_nvme_identify_cmd_set(); > > + > > + NVME_SET_CSI(*list, NVME_CSI_NVM); > > + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, > req); > > } > > > > -- > One of us - No more doubt, silence or taboo about mental illness.
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index de735eb9f3..c0362426cc 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -41,6 +41,8 @@ static void nvme_ns_init(NvmeNamespace *ns) id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns)); + ns->csi = NVME_CSI_NVM; + /* no thin provisioning */ id_ns->ncap = id_ns->nsze; id_ns->nuse = id_ns->ncap; diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index a38071884a..d795e44bab 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -31,6 +31,7 @@ typedef struct NvmeNamespace { int64_t size; NvmeIdNs id_ns; const uint32_t *iocs; + uint8_t csi; NvmeNamespaceParams params; } NvmeNamespace; diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 29139d8a17..ca0d0abf5c 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1503,6 +1503,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req) return NVME_SUCCESS; } +static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n, NvmeRequest *req) +{ + uint8_t id[NVME_IDENTIFY_DATA_SIZE] = {}; + + return nvme_dma(n, id, sizeof(id), DMA_DIRECTION_FROM_DEVICE, req); +} + static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) { trace_pci_nvme_identify_ctrl(); @@ -1511,11 +1518,23 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) DMA_DIRECTION_FROM_DEVICE, req); } +static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; + + trace_pci_nvme_identify_ctrl_csi(c->csi); + + if (c->csi == NVME_CSI_NVM) { + return nvme_rpt_empty_id_struct(n, req); + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) { NvmeNamespace *ns; NvmeIdentify *c = (NvmeIdentify *)&req->cmd; - NvmeIdNs *id_ns, inactive = { 0 }; uint32_t nsid = le32_to_cpu(c->nsid); trace_pci_nvme_identify_ns(nsid); @@ -1526,23 +1545,46 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) ns = nvme_ns(n, nsid); if (unlikely(!ns)) { - id_ns = &inactive; - } else { - id_ns = &ns->id_ns; + return nvme_rpt_empty_id_struct(n, req); } - return nvme_dma(n, (uint8_t *)id_ns, sizeof(NvmeIdNs), + return nvme_dma(n, (uint8_t *)&ns->id_ns, sizeof(NvmeIdNs), DMA_DIRECTION_FROM_DEVICE, req); } +static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeNamespace *ns; + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; + uint32_t nsid = le32_to_cpu(c->nsid); + + trace_pci_nvme_identify_ns_csi(nsid, c->csi); + + if (!nvme_nsid_valid(n, nsid) || nsid == NVME_NSID_BROADCAST) { + return NVME_INVALID_NSID | NVME_DNR; + } + + ns = nvme_ns(n, nsid); + if (unlikely(!ns)) { + return nvme_rpt_empty_id_struct(n, req); + } + + if (c->csi == NVME_CSI_NVM) { + return nvme_rpt_empty_id_struct(n, req); + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) { + NvmeNamespace *ns; NvmeIdentify *c = (NvmeIdentify *)&req->cmd; - static const int data_len = NVME_IDENTIFY_DATA_SIZE; uint32_t min_nsid = le32_to_cpu(c->nsid); - uint32_t *list; - uint16_t ret; - int j = 0; + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; + static const int data_len = sizeof(list); + uint32_t *list_ptr = (uint32_t *)list; + int i, j = 0; trace_pci_nvme_identify_nslist(min_nsid); @@ -1556,20 +1598,54 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) return NVME_INVALID_NSID | NVME_DNR; } - list = g_malloc0(data_len); - for (int i = 1; i <= n->num_namespaces; i++) { - if (i <= min_nsid || !nvme_ns(n, i)) { + for (i = 1; i <= n->num_namespaces; i++) { + ns = nvme_ns(n, i); + if (!ns) { continue; } - list[j++] = cpu_to_le32(i); + if (ns->params.nsid < min_nsid) { + continue; + } + list_ptr[j++] = cpu_to_le32(ns->params.nsid); if (j == data_len / sizeof(uint32_t)) { break; } } - ret = nvme_dma(n, (uint8_t *)list, data_len, DMA_DIRECTION_FROM_DEVICE, - req); - g_free(list); - return ret; + + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); +} + +static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeNamespace *ns; + NvmeIdentify *c = (NvmeIdentify *)&req->cmd; + uint32_t min_nsid = le32_to_cpu(c->nsid); + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; + static const int data_len = sizeof(list); + uint32_t *list_ptr = (uint32_t *)list; + int i, j = 0; + + trace_pci_nvme_identify_nslist_csi(min_nsid, c->csi); + + if (c->csi != NVME_CSI_NVM) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + for (i = 1; i <= n->num_namespaces; i++) { + ns = nvme_ns(n, i); + if (!ns) { + continue; + } + if (ns->params.nsid < min_nsid) { + continue; + } + list_ptr[j++] = cpu_to_le32(ns->params.nsid); + if (j == data_len / sizeof(uint32_t)) { + break; + } + } + + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); } static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) @@ -1577,13 +1653,17 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) NvmeNamespace *ns; NvmeIdentify *c = (NvmeIdentify *)&req->cmd; uint32_t nsid = le32_to_cpu(c->nsid); - uint8_t list[NVME_IDENTIFY_DATA_SIZE]; + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; struct data { struct { NvmeIdNsDescr hdr; - uint8_t v[16]; + uint8_t v[NVME_NIDL_UUID]; } uuid; + struct { + NvmeIdNsDescr hdr; + uint8_t v; + } csi; }; struct data *ns_descrs = (struct data *)list; @@ -1599,19 +1679,31 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) return NVME_INVALID_FIELD | NVME_DNR; } - memset(list, 0x0, sizeof(list)); - /* * Because the NGUID and EUI64 fields are 0 in the Identify Namespace data * structure, a Namespace UUID (nidt = 0x3) must be reported in the * Namespace Identification Descriptor. Add the namespace UUID here. */ ns_descrs->uuid.hdr.nidt = NVME_NIDT_UUID; - ns_descrs->uuid.hdr.nidl = NVME_NIDT_UUID_LEN; - memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDT_UUID_LEN); + ns_descrs->uuid.hdr.nidl = NVME_NIDL_UUID; + memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDL_UUID); - return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE, - DMA_DIRECTION_FROM_DEVICE, req); + ns_descrs->csi.hdr.nidt = NVME_NIDT_CSI; + ns_descrs->csi.hdr.nidl = NVME_NIDL_CSI; + ns_descrs->csi.v = ns->csi; + + return nvme_dma(n, list, sizeof(list), DMA_DIRECTION_FROM_DEVICE, req); +} + +static uint16_t nvme_identify_cmd_set(NvmeCtrl *n, NvmeRequest *req) +{ + uint8_t list[NVME_IDENTIFY_DATA_SIZE] = {}; + static const int data_len = sizeof(list); + + trace_pci_nvme_identify_cmd_set(); + + NVME_SET_CSI(*list, NVME_CSI_NVM); + return nvme_dma(n, list, data_len, DMA_DIRECTION_FROM_DEVICE, req); } static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) @@ -1621,12 +1713,20 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) switch (le32_to_cpu(c->cns)) { case NVME_ID_CNS_NS: return nvme_identify_ns(n, req); + case NVME_ID_CNS_CS_NS: + return nvme_identify_ns_csi(n, req); case NVME_ID_CNS_CTRL: return nvme_identify_ctrl(n, req); + case NVME_ID_CNS_CS_CTRL: + return nvme_identify_ctrl_csi(n, req); case NVME_ID_CNS_NS_ACTIVE_LIST: return nvme_identify_nslist(n, req); + case NVME_ID_CNS_CS_NS_ACTIVE_LIST: + return nvme_identify_nslist_csi(n, req); case NVME_ID_CNS_NS_DESCR_LIST: return nvme_identify_ns_descr_list(n, req); + case NVME_ID_CNS_IO_COMMAND_SET: + return nvme_identify_cmd_set(n, req); default: trace_pci_nvme_err_invalid_identify_cns(le32_to_cpu(c->cns)); return NVME_INVALID_FIELD | NVME_DNR; @@ -1807,7 +1907,9 @@ defaults: if (iv == n->admin_cq.vector) { result |= NVME_INTVC_NOCOALESCING; } - + break; + case NVME_COMMAND_SET_PROFILE: + result = 0; break; default: result = nvme_feature_default[fid]; @@ -1948,6 +2050,12 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req) break; case NVME_TIMESTAMP: return nvme_set_feature_timestamp(n, req); + case NVME_COMMAND_SET_PROFILE: + if (dw11 & 0x1ff) { + trace_pci_nvme_err_invalid_iocsci(dw11 & 0x1ff); + return NVME_CMD_SET_CMB_REJECTED | NVME_DNR; + } + break; default: return NVME_FEAT_NOT_CHANGEABLE | NVME_DNR; } @@ -2104,8 +2212,12 @@ static void nvme_select_ns_iocs(NvmeCtrl *n) continue; } ns->iocs = nvme_cse_iocs_none; - if (NVME_CC_CSS(n->bar.cc) != NVME_CC_CSS_ADMIN_ONLY) { - ns->iocs = nvme_cse_iocs_nvm; + switch (ns->csi) { + case NVME_CSI_NVM: + if (NVME_CC_CSS(n->bar.cc) != NVME_CC_CSS_ADMIN_ONLY) { + ns->iocs = nvme_cse_iocs_nvm; + } + break; } } } @@ -2847,6 +2959,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) NVME_CAP_SET_CQR(n->bar.cap, 1); NVME_CAP_SET_TO(n->bar.cap, 0xf); NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_NVM); + NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_CSI_SUPP); NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_ADMIN_ONLY); NVME_CAP_SET_MPSMAX(n->bar.cap, 4); diff --git a/hw/block/trace-events b/hw/block/trace-events index 0ae9cb0d35..65b964c894 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -48,8 +48,12 @@ pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" pci_nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=%"PRIu16"" 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_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"" +pci_nvme_identify_cmd_set(void) "identify i/o command set" pci_nvme_identify_ns_descr_list(uint32_t ns) "nsid %"PRIu32"" pci_nvme_get_log(uint16_t cid, uint8_t lid, uint8_t lsp, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" lsp 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" pci_nvme_getfeat(uint16_t cid, uint32_t nsid, uint8_t fid, uint8_t sel, uint32_t cdw11) "cid %"PRIu16" nsid 0x%"PRIx32" fid 0x%"PRIx8" sel 0x%"PRIx8" cdw11 0x%"PRIx32"" @@ -106,6 +110,8 @@ pci_nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" pci_nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx8"" pci_nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limit) "Invalid LBA start=%"PRIu64" len=%"PRIu64" limit=%"PRIu64"" pci_nvme_err_invalid_effects_log_offset(uint64_t ofs) "commands supported and effects log offset must be 0, got %"PRIu64"" +pci_nvme_err_only_nvm_cmd_set_avail(void) "setting 110b CC.CSS, but only NVM command set is enabled" +pci_nvme_err_invalid_iocsci(uint32_t idx) "unsupported command set combination index %"PRIu32"" pci_nvme_err_invalid_del_sq(uint16_t qid) "invalid submission queue deletion, sid=%"PRIu16"" pci_nvme_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submission queue, invalid cqid=%"PRIu16"" pci_nvme_err_invalid_create_sq_sqid(uint16_t sqid) "failed creating submission queue, invalid sqid=%"PRIu16"" @@ -162,6 +168,7 @@ pci_nvme_ub_db_wr_invalid_cq(uint32_t qid) "completion queue doorbell write for pci_nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue doorbell write value beyond queue size, cqid=%"PRIu32", new_head=%"PRIu16", ignoring" pci_nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" pci_nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" +pci_nvme_ub_unknown_css_value(void) "unknown value in cc.css field" # xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" diff --git a/include/block/nvme.h b/include/block/nvme.h index 4779495b7d..f5ac9143c4 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -84,6 +84,7 @@ enum NvmeCapMask { enum NvmeCapCss { NVME_CAP_CSS_NVM = 1 << 0, + NVME_CAP_CSS_CSI_SUPP = 1 << 6, NVME_CAP_CSS_ADMIN_ONLY = 1 << 7, }; @@ -117,9 +118,25 @@ enum NvmeCcMask { enum NvmeCcCss { NVME_CC_CSS_NVM = 0x0, + NVME_CC_CSS_CSI = 0x6, NVME_CC_CSS_ADMIN_ONLY = 0x7, }; +#define NVME_SET_CC_EN(cc, val) \ + (cc |= (uint32_t)((val) & CC_EN_MASK) << CC_EN_SHIFT) +#define NVME_SET_CC_CSS(cc, val) \ + (cc |= (uint32_t)((val) & CC_CSS_MASK) << CC_CSS_SHIFT) +#define NVME_SET_CC_MPS(cc, val) \ + (cc |= (uint32_t)((val) & CC_MPS_MASK) << CC_MPS_SHIFT) +#define NVME_SET_CC_AMS(cc, val) \ + (cc |= (uint32_t)((val) & CC_AMS_MASK) << CC_AMS_SHIFT) +#define NVME_SET_CC_SHN(cc, val) \ + (cc |= (uint32_t)((val) & CC_SHN_MASK) << CC_SHN_SHIFT) +#define NVME_SET_CC_IOSQES(cc, val) \ + (cc |= (uint32_t)((val) & CC_IOSQES_MASK) << CC_IOSQES_SHIFT) +#define NVME_SET_CC_IOCQES(cc, val) \ + (cc |= (uint32_t)((val) & CC_IOCQES_MASK) << CC_IOCQES_SHIFT) + enum NvmeCstsShift { CSTS_RDY_SHIFT = 0, CSTS_CFS_SHIFT = 1, @@ -534,8 +551,13 @@ typedef struct QEMU_PACKED NvmeIdentify { uint64_t rsvd2[2]; uint64_t prp1; uint64_t prp2; - uint32_t cns; - uint32_t rsvd11[5]; + uint8_t cns; + uint8_t rsvd10; + uint16_t ctrlid; + uint16_t nvmsetid; + uint8_t rsvd11; + uint8_t csi; + uint32_t rsvd12[4]; } NvmeIdentify; typedef struct QEMU_PACKED NvmeRwCmd { @@ -655,6 +677,7 @@ enum NvmeStatusCodes { NVME_MD_SGL_LEN_INVALID = 0x0010, NVME_SGL_DESCR_TYPE_INVALID = 0x0011, NVME_INVALID_USE_OF_CMB = 0x0012, + NVME_CMD_SET_CMB_REJECTED = 0x002b, NVME_LBA_RANGE = 0x0080, NVME_CAP_EXCEEDED = 0x0081, NVME_NS_NOT_READY = 0x0082, @@ -781,11 +804,15 @@ typedef struct QEMU_PACKED NvmePSD { #define NVME_IDENTIFY_DATA_SIZE 4096 -enum { - NVME_ID_CNS_NS = 0x0, - NVME_ID_CNS_CTRL = 0x1, - NVME_ID_CNS_NS_ACTIVE_LIST = 0x2, - NVME_ID_CNS_NS_DESCR_LIST = 0x3, +enum NvmeIdCns { + NVME_ID_CNS_NS = 0x00, + NVME_ID_CNS_CTRL = 0x01, + NVME_ID_CNS_NS_ACTIVE_LIST = 0x02, + NVME_ID_CNS_NS_DESCR_LIST = 0x03, + NVME_ID_CNS_CS_NS = 0x05, + NVME_ID_CNS_CS_CTRL = 0x06, + NVME_ID_CNS_CS_NS_ACTIVE_LIST = 0x07, + NVME_ID_CNS_IO_COMMAND_SET = 0x1c, }; typedef struct QEMU_PACKED NvmeIdCtrl { @@ -933,6 +960,7 @@ enum NvmeFeatureIds { NVME_WRITE_ATOMICITY = 0xa, NVME_ASYNCHRONOUS_EVENT_CONF = 0xb, NVME_TIMESTAMP = 0xe, + NVME_COMMAND_SET_PROFILE = 0x19, NVME_SOFTWARE_PROGRESS_MARKER = 0x80, NVME_FID_MAX = 0x100, }; @@ -1017,18 +1045,26 @@ typedef struct QEMU_PACKED NvmeIdNsDescr { uint8_t rsvd2[2]; } NvmeIdNsDescr; -enum { - NVME_NIDT_EUI64_LEN = 8, - NVME_NIDT_NGUID_LEN = 16, - NVME_NIDT_UUID_LEN = 16, +enum NvmeNsIdentifierLength { + NVME_NIDL_EUI64 = 8, + NVME_NIDL_NGUID = 16, + NVME_NIDL_UUID = 16, + NVME_NIDL_CSI = 1, }; enum NvmeNsIdentifierType { - NVME_NIDT_EUI64 = 0x1, - NVME_NIDT_NGUID = 0x2, - NVME_NIDT_UUID = 0x3, + NVME_NIDT_EUI64 = 0x01, + NVME_NIDT_NGUID = 0x02, + NVME_NIDT_UUID = 0x03, + NVME_NIDT_CSI = 0x04, }; +enum NvmeCsi { + NVME_CSI_NVM = 0x00, +}; + +#define NVME_SET_CSI(vec, csi) (vec |= (uint8_t)(1 << (csi))) + /*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10) #define NVME_ID_NS_DLFEAT_WRITE_ZEROES(dlfeat) ((dlfeat) & 0x08) @@ -1079,6 +1115,7 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeSmartLog) != 512); QEMU_BUILD_BUG_ON(sizeof(NvmeEffectsLog) != 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdCtrl) != 4096); + QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) != 4); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNs) != 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeSglDescriptor) != 16); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) != 4);