From: Klaus Jensen <its@irrelevant.dk>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
Max Reitz <mreitz@redhat.com>, Keith Busch <kbusch@kernel.org>,
Minwoo Im <minwoo.im.dev@gmail.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Klaus Jensen <its@irrelevant.dk>
Subject: [PULL 01/38] hw/block/nvme: introduce nvme-subsys device
Date: Mon, 8 Mar 2021 13:22:36 +0100 [thread overview]
Message-ID: <20210308122313.286938-2-its@irrelevant.dk> (raw)
In-Reply-To: <20210308122313.286938-1-its@irrelevant.dk>
From: Minwoo Im <minwoo.im.dev@gmail.com>
To support multi-path in QEMU NVMe device model, We need to have NVMe
subsystem hierarchy to map controllers and namespaces to a NVMe
subsystem.
This patch introduced a simple nvme-subsys device model. The subsystem
will be prepared with subsystem NQN with <subsys_id> provided in
nvme-subsys device:
ex) -device nvme-subsys,id=subsys0: nqn.2019-08.org.qemu:subsys0
Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
Tested-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme-subsys.h | 25 ++++++++++++++++++
hw/block/nvme-subsys.c | 60 ++++++++++++++++++++++++++++++++++++++++++
hw/block/nvme.c | 3 +++
hw/block/meson.build | 2 +-
4 files changed, 89 insertions(+), 1 deletion(-)
create mode 100644 hw/block/nvme-subsys.h
create mode 100644 hw/block/nvme-subsys.c
diff --git a/hw/block/nvme-subsys.h b/hw/block/nvme-subsys.h
new file mode 100644
index 000000000000..40f06a4c7db0
--- /dev/null
+++ b/hw/block/nvme-subsys.h
@@ -0,0 +1,25 @@
+/*
+ * QEMU NVM Express Subsystem: nvme-subsys
+ *
+ * Copyright (c) 2021 Minwoo Im <minwoo.im.dev@gmail.com>
+ *
+ * This code is licensed under the GNU GPL v2. Refer COPYING.
+ */
+
+#ifndef NVME_SUBSYS_H
+#define NVME_SUBSYS_H
+
+#define TYPE_NVME_SUBSYS "nvme-subsys"
+#define NVME_SUBSYS(obj) \
+ OBJECT_CHECK(NvmeSubsystem, (obj), TYPE_NVME_SUBSYS)
+
+#define NVME_SUBSYS_MAX_CTRLS 32
+
+typedef struct NvmeCtrl NvmeCtrl;
+typedef struct NvmeNamespace NvmeNamespace;
+typedef struct NvmeSubsystem {
+ DeviceState parent_obj;
+ uint8_t subnqn[256];
+} NvmeSubsystem;
+
+#endif /* NVME_SUBSYS_H */
diff --git a/hw/block/nvme-subsys.c b/hw/block/nvme-subsys.c
new file mode 100644
index 000000000000..aa82911b951c
--- /dev/null
+++ b/hw/block/nvme-subsys.c
@@ -0,0 +1,60 @@
+/*
+ * QEMU NVM Express Subsystem: nvme-subsys
+ *
+ * Copyright (c) 2021 Minwoo Im <minwoo.im.dev@gmail.com>
+ *
+ * This code is licensed under the GNU GPL v2. Refer COPYING.
+ */
+
+#include "qemu/units.h"
+#include "qemu/osdep.h"
+#include "qemu/uuid.h"
+#include "qemu/iov.h"
+#include "qemu/cutils.h"
+#include "qapi/error.h"
+#include "hw/qdev-properties.h"
+#include "hw/qdev-core.h"
+#include "hw/block/block.h"
+#include "block/aio.h"
+#include "block/accounting.h"
+#include "sysemu/sysemu.h"
+#include "hw/pci/pci.h"
+#include "nvme.h"
+#include "nvme-subsys.h"
+
+static void nvme_subsys_setup(NvmeSubsystem *subsys)
+{
+ snprintf((char *)subsys->subnqn, sizeof(subsys->subnqn),
+ "nqn.2019-08.org.qemu:%s", subsys->parent_obj.id);
+}
+
+static void nvme_subsys_realize(DeviceState *dev, Error **errp)
+{
+ NvmeSubsystem *subsys = NVME_SUBSYS(dev);
+
+ nvme_subsys_setup(subsys);
+}
+
+static void nvme_subsys_class_init(ObjectClass *oc, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(oc);
+
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+
+ dc->realize = nvme_subsys_realize;
+ dc->desc = "Virtual NVMe subsystem";
+}
+
+static const TypeInfo nvme_subsys_info = {
+ .name = TYPE_NVME_SUBSYS,
+ .parent = TYPE_DEVICE,
+ .class_init = nvme_subsys_class_init,
+ .instance_size = sizeof(NvmeSubsystem),
+};
+
+static void nvme_subsys_register_types(void)
+{
+ type_register_static(&nvme_subsys_info);
+}
+
+type_init(nvme_subsys_register_types)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index fb83636abdc1..1950b34684cd 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -25,6 +25,7 @@
* mdts=<N[optional]>,zoned.append_size_limit=<N[optional]> \
* -device nvme-ns,drive=<drive_id>,bus=<bus_name>,nsid=<nsid>,\
* zoned=<true|false[optional]>
+ * -device nvme-subsys,id=<subsys_id>
*
* Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
* offset 0 in BAR2 and supports only WDS, RDS and SQS for now. By default, the
@@ -38,6 +39,8 @@
*
* The PMR will use BAR 4/5 exclusively.
*
+ * To place controller(s) and namespace(s) to a subsystem, then provide
+ * nvme-subsys device as above.
*
* nvme device parameters
* ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/hw/block/meson.build b/hw/block/meson.build
index 602ca6c8541d..83ea2d37978d 100644
--- a/hw/block/meson.build
+++ b/hw/block/meson.build
@@ -13,7 +13,7 @@ softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c'))
-softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c'))
+softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'nvme-subsys.c'))
specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
--
2.30.1
next prev parent reply other threads:[~2021-03-08 12:27 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 12:22 [PULL 00/38] emulated nvme device updates Klaus Jensen
2021-03-08 12:22 ` Klaus Jensen [this message]
2021-03-08 18:32 ` [PULL 01/38] hw/block/nvme: introduce nvme-subsys device Paolo Bonzini
2021-03-08 18:46 ` Klaus Jensen
2021-03-08 18:53 ` Peter Maydell
2021-03-08 18:55 ` Klaus Jensen
2021-03-08 12:22 ` [PULL 02/38] hw/block/nvme: support to map controller to a subsystem Klaus Jensen
2021-03-08 12:22 ` [PULL 03/38] hw/block/nvme: add CMIC enum value for Identify Controller Klaus Jensen
2021-03-08 12:22 ` [PULL 04/38] hw/block/nvme: support for multi-controller in subsystem Klaus Jensen
2021-03-08 12:22 ` [PULL 05/38] hw/block/nvme: add NMIC enum value for Identify Namespace Klaus Jensen
2021-03-08 12:22 ` [PULL 06/38] hw/block/nvme: support for shared namespace in subsystem Klaus Jensen
2021-03-08 12:22 ` [PULL 07/38] hw/block/nvme: remove unused parameter in check zone write Klaus Jensen
2021-03-08 12:22 ` [PULL 08/38] hw/block/nvme: refactor zone resource management Klaus Jensen
2021-03-08 12:22 ` [PULL 09/38] hw/block/nvme: pull write pointer advancement to separate function Klaus Jensen
2021-03-08 12:22 ` [PULL 10/38] nvme: updated shared header for copy command Klaus Jensen
2021-03-08 12:22 ` [PULL 11/38] hw/block/nvme: add simple " Klaus Jensen
2021-03-08 12:22 ` [PULL 12/38] hw/block/nvme: fix Close Zone Klaus Jensen
2021-03-08 12:22 ` [PULL 13/38] hw/block/nvme: add missing mor/mar constraint checks Klaus Jensen
2021-03-08 12:22 ` [PULL 14/38] hw/block/nvme: improve invalid zasl value reporting Klaus Jensen
2021-03-08 12:22 ` [PULL 15/38] hw/block/nvme: use locally assigned QEMU IEEE OUI Klaus Jensen
2021-03-08 12:22 ` [PULL 16/38] hw/block/nvme: add broadcast nsid support flush command Klaus Jensen
2021-03-08 12:22 ` [PULL 17/38] hw/block/nvme: document 'mdts' nvme device parameter Klaus Jensen
2021-03-08 12:22 ` [PULL 18/38] hw/block/nvme: deduplicate bad mdts trace event Klaus Jensen
2021-03-08 12:22 ` [PULL 19/38] hw/block/nvme: align zoned.zasl with mdts Klaus Jensen
2021-03-08 12:22 ` [PULL 20/38] hw/block/nvme: remove unnecessary endian conversion Klaus Jensen
2021-03-08 12:22 ` [PULL 21/38] hw/block/nvme: add identify trace event Klaus Jensen
2021-03-08 12:22 ` [PULL 22/38] hw/block/nvme: fix potential compilation error Klaus Jensen
2021-03-08 12:22 ` [PULL 23/38] hw/block/nvme: add trace event for zone read check Klaus Jensen
2021-03-08 12:22 ` [PULL 24/38] hw/block/nvme: report non-mdts command size limit for dsm Klaus Jensen
2021-03-08 12:23 ` [PULL 25/38] hw/block/nvme: remove redundant len member in compare context Klaus Jensen
2021-03-08 12:23 ` [PULL 26/38] hw/block/nvme: remove block accounting for write zeroes Klaus Jensen
2021-03-08 12:23 ` [PULL 27/38] hw/block/nvme: fix strerror printing Klaus Jensen
2021-03-08 12:23 ` [PULL 28/38] hw/block/nvme: try to deal with the iov/qsg duality Klaus Jensen
2021-03-08 12:23 ` [PULL 29/38] hw/block/nvme: remove the req dependency in map functions Klaus Jensen
2021-03-08 12:23 ` [PULL 30/38] hw/block/nvme: refactor nvme_dma Klaus Jensen
2021-03-08 12:23 ` [PULL 31/38] hw/block/nvme: support namespace detach Klaus Jensen
2021-03-08 12:23 ` [PULL 32/38] hw/block/nvme: fix namespaces array to 1-based Klaus Jensen
2021-03-08 12:23 ` [PULL 33/38] hw/block/nvme: fix allocated namespace list to 256 Klaus Jensen
2021-03-08 12:23 ` [PULL 34/38] hw/block/nvme: support allocated namespace type Klaus Jensen
2021-03-08 12:23 ` [PULL 35/38] hw/block/nvme: refactor nvme_select_ns_iocs Klaus Jensen
2021-03-08 12:23 ` [PULL 36/38] hw/block/nvme: support namespace attachment command Klaus Jensen
2021-03-08 12:23 ` [PULL 37/38] hw/block/nvme: support changed namespace asynchronous event Klaus Jensen
2021-03-08 12:23 ` [PULL 38/38] hw/block/nvme: support Identify NS Attached Controller List Klaus Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308122313.286938-2-its@irrelevant.dk \
--to=its@irrelevant.dk \
--cc=fam@euphon.net \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=minwoo.im.dev@gmail.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).