| Message ID | 20201013214212.2152-3-dmitry.fomichev@wdc.com |
|---|---|
| State | Accepted |
| Commit | b52f26cd1f743a63682d33a7e3d427b9610e9545 |
| Headers | show |
| Series | hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set | expand |
On Oct 14 06:42, Dmitry Fomichev wrote: > In NVMe 1.4, a namespace must report an ID descriptor of UUID type > if it doesn't support EUI64 or NGUID. Add a new namespace property, > "uuid", that provides the user the option to either specify the UUID > explicitly or have a UUID generated automatically every time a > namespace is initialized. > > Suggested-by: Klaus Jansen <its@irrelevant.dk> > Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> Reviewed-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme-ns.c | 1 + > hw/block/nvme-ns.h | 1 + > hw/block/nvme.c | 9 +++++---- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c > index b69cdaf27e..de735eb9f3 100644 > --- a/hw/block/nvme-ns.c > +++ b/hw/block/nvme-ns.c > @@ -129,6 +129,7 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) > static Property nvme_ns_props[] = { > DEFINE_BLOCK_PROPERTIES(NvmeNamespace, blkconf), > DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0), > + DEFINE_PROP_UUID("uuid", NvmeNamespace, params.uuid), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h > index ea8c2f785d..a38071884a 100644 > --- a/hw/block/nvme-ns.h > +++ b/hw/block/nvme-ns.h > @@ -21,6 +21,7 @@ > > typedef struct NvmeNamespaceParams { > uint32_t nsid; > + QemuUUID uuid; > } NvmeNamespaceParams; > > typedef struct NvmeNamespace { > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index ee0eff98da..89d91926d9 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -1571,6 +1571,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) > > 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]; > @@ -1590,7 +1591,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > return NVME_INVALID_NSID | NVME_DNR; > } > > - if (unlikely(!nvme_ns(n, nsid))) { > + ns = nvme_ns(n, nsid); > + if (unlikely(!ns)) { > return NVME_INVALID_FIELD | NVME_DNR; > } > > @@ -1599,12 +1601,11 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) > /* > * 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 a very basic Namespace UUID > - * here. > + * 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; > - stl_be_p(&ns_descrs->uuid.v, nsid); > + memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDT_UUID_LEN); > > return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE, > DMA_DIRECTION_FROM_DEVICE, req); > -- > 2.21.0 > > -- 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 b69cdaf27e..de735eb9f3 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -129,6 +129,7 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) static Property nvme_ns_props[] = { DEFINE_BLOCK_PROPERTIES(NvmeNamespace, blkconf), DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0), + DEFINE_PROP_UUID("uuid", NvmeNamespace, params.uuid), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index ea8c2f785d..a38071884a 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -21,6 +21,7 @@ typedef struct NvmeNamespaceParams { uint32_t nsid; + QemuUUID uuid; } NvmeNamespaceParams; typedef struct NvmeNamespace { diff --git a/hw/block/nvme.c b/hw/block/nvme.c index ee0eff98da..89d91926d9 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1571,6 +1571,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) 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]; @@ -1590,7 +1591,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) return NVME_INVALID_NSID | NVME_DNR; } - if (unlikely(!nvme_ns(n, nsid))) { + ns = nvme_ns(n, nsid); + if (unlikely(!ns)) { return NVME_INVALID_FIELD | NVME_DNR; } @@ -1599,12 +1601,11 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) /* * 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 a very basic Namespace UUID - * here. + * 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; - stl_be_p(&ns_descrs->uuid.v, nsid); + memcpy(&ns_descrs->uuid.v, ns->params.uuid.data, NVME_NIDT_UUID_LEN); return nvme_dma(n, list, NVME_IDENTIFY_DATA_SIZE, DMA_DIRECTION_FROM_DEVICE, req);
In NVMe 1.4, a namespace must report an ID descriptor of UUID type if it doesn't support EUI64 or NGUID. Add a new namespace property, "uuid", that provides the user the option to either specify the UUID explicitly or have a UUID generated automatically every time a namespace is initialized. Suggested-by: Klaus Jansen <its@irrelevant.dk> Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> --- hw/block/nvme-ns.c | 1 + hw/block/nvme-ns.h | 1 + hw/block/nvme.c | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-)