[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/14] hw/block/nvme: make lba data size configurable
From: |
Klaus Jensen |
Subject: |
[PATCH v2 03/14] hw/block/nvme: make lba data size configurable |
Date: |
Wed, 30 Sep 2020 01:19:06 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Allos the LBA data size (lbads) to be set between 9 and 12.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Acked-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
docs/specs/nvme.txt | 11 ++++++++++-
hw/block/nvme-ns.h | 1 +
hw/block/nvme-ns.c | 8 +++++++-
hw/block/nvme.c | 1 +
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/docs/specs/nvme.txt b/docs/specs/nvme.txt
index 56d393884e7a..438ca50d698c 100644
--- a/docs/specs/nvme.txt
+++ b/docs/specs/nvme.txt
@@ -1,7 +1,16 @@
NVM Express Controller
======================
-The nvme device (-device nvme) emulates an NVM Express Controller.
+The nvme device (-device nvme) emulates an NVM Express Controller. It is used
+together with nvme-ns devices (-device nvme-ns) which emulates an NVM Express
+Namespace.
+
+nvme-ns Options
+---------------
+
+ `lbads`; The "LBA Data Size (LBADS)" indicates the LBA data size used by the
+ namespace. It is specified in terms of a power of two. Only values between
+ 9 and 12 (both inclusive) are supported.
Reference Specifications
diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
index 83734f4606e1..78b0d1a00672 100644
--- a/hw/block/nvme-ns.h
+++ b/hw/block/nvme-ns.h
@@ -21,6 +21,7 @@
typedef struct NvmeNamespaceParams {
uint32_t nsid;
+ uint8_t lbads;
} NvmeNamespaceParams;
typedef struct NvmeNamespace {
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index 2ba0263ddaca..576c7486f45b 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -36,7 +36,7 @@ static void nvme_ns_init(NvmeNamespace *ns)
ns->id_ns.dlfeat = 0x9;
}
- id_ns->lbaf[0].ds = BDRV_SECTOR_BITS;
+ id_ns->lbaf[0].ds = ns->params.lbads;
id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns));
@@ -77,6 +77,11 @@ static int nvme_ns_check_constraints(NvmeNamespace *ns,
Error **errp)
return -1;
}
+ if (ns->params.lbads < 9 || ns->params.lbads > 12) {
+ error_setg(errp, "unsupported lbads (supported: 9-12)");
+ return -1;
+ }
+
return 0;
}
@@ -125,6 +130,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_UINT8("lbads", NvmeNamespace, params.lbads, BDRV_SECTOR_BITS),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 3cbc3c7b75b1..758f58c88026 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2812,6 +2812,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
if (n->namespace.blkconf.blk) {
ns = &n->namespace;
ns->params.nsid = 1;
+ ns->params.lbads = BDRV_SECTOR_BITS;
if (nvme_ns_setup(n, ns, errp)) {
return;
--
2.28.0
- [PATCH v2 00/14] hw/block/nvme: zoned namespace command set, Klaus Jensen, 2020/09/29
- [PATCH v2 03/14] hw/block/nvme: make lba data size configurable,
Klaus Jensen <=
- [PATCH v2 02/14] hw/block/nvme: add trace event for requests with non-zero status code, Klaus Jensen, 2020/09/29
- [PATCH v2 01/14] hw/block/nvme: add nsid to get/setfeat trace events, Klaus Jensen, 2020/09/29
- [PATCH v2 04/14] hw/block/nvme: reject io commands if only admin command set selected, Klaus Jensen, 2020/09/29
- [PATCH v2 05/14] hw/block/nvme: consolidate read, write and write zeroes, Klaus Jensen, 2020/09/29
- [PATCH v2 06/14] hw/block/nvme: add support for dulbe and block utilization tracking, Klaus Jensen, 2020/09/29
- [PATCH v2 07/14] hw/block/nvme: add commands supported and effects log page, Klaus Jensen, 2020/09/29
- [PATCH v2 08/14] hw/block/nvme: support namespace types, Klaus Jensen, 2020/09/29
- [PATCH v2 09/14] hw/block/nvme: add basic read/write for zoned namespaces, Klaus Jensen, 2020/09/29
- [PATCH v2 10/14] hw/block/nvme: add the zone management receive command, Klaus Jensen, 2020/09/29
- [PATCH v2 14/14] hw/block/nvme: allow open to close transitions by controller, Klaus Jensen, 2020/09/29