[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 04/12] hw/block/nvme: Generate namespace UUIDs
From: |
Klaus Jensen |
Subject: |
[PATCH v5 04/12] hw/block/nvme: Generate namespace UUIDs |
Date: |
Fri, 27 Nov 2020 00:45:53 +0100 |
From: Dmitry Fomichev <dmitry.fomichev@wdc.com>
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 Jensen <k.jensen@samsung.com>
Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Niklas Cassel <Niklas.Cassel@wdc.com>
---
hw/block/nvme-ns.h | 1 +
hw/block/nvme-ns.c | 1 +
hw/block/nvme.c | 9 +++++----
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
index 745d288b09cf..1f8c9c0a92ad 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;
uint16_t mssrl;
uint32_t mcl;
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index eb28757c2f17..505f6fb0a654 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -155,6 +155,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_UINT16("mssrl", NvmeNamespace, params.mssrl, 128),
DEFINE_PROP_UINT32("mcl", NvmeNamespace, params.mcl, 128),
DEFINE_PROP_UINT8("msrc", NvmeNamespace, params.msrc, 255),
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 7a5ec843d567..4f732c13c7e9 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2068,6 +2068,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];
@@ -2087,7 +2088,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;
}
@@ -2096,12 +2098,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.29.2
- [PATCH v5 00/12] hw/block/nvme: zoned namespace command set, Klaus Jensen, 2020/11/26
- [PATCH v5 01/12] hw/block/nvme: Separate read and write handlers, Klaus Jensen, 2020/11/26
- [PATCH v5 02/12] hw/block/nvme: Merge nvme_write_zeroes() with nvme_write(), Klaus Jensen, 2020/11/26
- [PATCH v5 03/12] hw/block/nvme: add commands supported and effects log page, Klaus Jensen, 2020/11/26
- [PATCH v5 04/12] hw/block/nvme: Generate namespace UUIDs,
Klaus Jensen <=
- [PATCH v5 07/12] hw/block/nvme: add the zone management receive command, Klaus Jensen, 2020/11/26
- [PATCH v5 05/12] hw/block/nvme: support namespace types, Klaus Jensen, 2020/11/26
- [PATCH v5 06/12] hw/block/nvme: add basic read/write for zoned namespaces, Klaus Jensen, 2020/11/26
- [PATCH v5 11/12] hw/block/nvme: allow open to close zone transitions by controller, Klaus Jensen, 2020/11/26
- [PATCH v5 09/12] hw/block/nvme: add the zone append command, Klaus Jensen, 2020/11/26
- [PATCH v5 08/12] hw/block/nvme: add the zone management send command, Klaus Jensen, 2020/11/26
- [PATCH v5 10/12] hw/block/nvme: track and enforce zone resources, Klaus Jensen, 2020/11/26
- [PATCH RFC v5 12/12] hw/block/nvme: add persistence for zone info, Klaus Jensen, 2020/11/26