[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 21/32] nvdimm: implement NVDIMM device abstract
From: |
Xiao Guangrong |
Subject: |
[Qemu-devel] [PATCH v3 21/32] nvdimm: implement NVDIMM device abstract |
Date: |
Sun, 11 Oct 2015 11:52:53 +0800 |
Introduce "nvdimm" device which is based on dimm device type
128K memory region which is the minimum namespace label size
required by NVDIMM Namespace Spec locates at the end of
backend memory device is reserved for label data
We can use "-m 1G,maxmem=100G,slots=10 -object memory-backend-file,
id=mem1,size=1G,mem-path=/dev/pmem0 -device nvdimm,memdev=mem1" to
create NVDIMM device for guest
Signed-off-by: Xiao Guangrong <address@hidden>
---
default-configs/i386-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/acpi/memory_hotplug.c | 6 +++
hw/mem/Makefile.objs | 1 +
hw/mem/nvdimm/internal.h | 17 ++++++++
hw/mem/nvdimm/nvdimm.c | 85 ++++++++++++++++++++++++++++++++++++++
include/hw/mem/nvdimm.h | 33 +++++++++++++++
7 files changed, 144 insertions(+)
create mode 100644 hw/mem/nvdimm/internal.h
create mode 100644 hw/mem/nvdimm/nvdimm.c
create mode 100644 include/hw/mem/nvdimm.h
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 3ece8bb..a1b24e5 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -47,6 +47,7 @@ CONFIG_APIC=y
CONFIG_IOAPIC=y
CONFIG_PVPANIC=y
CONFIG_MEM_HOTPLUG=y
+CONFIG_NVDIMM = y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
diff --git a/default-configs/x86_64-softmmu.mak
b/default-configs/x86_64-softmmu.mak
index 92ea7c1..e3f5a0b 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -47,6 +47,7 @@ CONFIG_APIC=y
CONFIG_IOAPIC=y
CONFIG_PVPANIC=y
CONFIG_MEM_HOTPLUG=y
+CONFIG_NVDIMM = y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index e232641..92cd973 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -1,6 +1,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/pc-hotplug.h"
#include "hw/mem/dimm.h"
+#include "hw/mem/nvdimm.h"
#include "hw/boards.h"
#include "hw/qdev-core.h"
#include "trace.h"
@@ -231,6 +232,11 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq,
MemHotplugState *mem_st,
{
MemStatus *mdev;
+ /* Currently, NVDIMM hotplug has not been supported yet. */
+ if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
+ return;
+ }
+
mdev = acpi_memory_slot_status(mem_st, dev, errp);
if (!mdev) {
return;
diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
index cebb4b1..e0ff328 100644
--- a/hw/mem/Makefile.objs
+++ b/hw/mem/Makefile.objs
@@ -1,2 +1,3 @@
common-obj-$(CONFIG_DIMM) += dimm.o
common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o
+common-obj-$(CONFIG_NVDIMM) += nvdimm/nvdimm.o
diff --git a/hw/mem/nvdimm/internal.h b/hw/mem/nvdimm/internal.h
new file mode 100644
index 0000000..c4ba750
--- /dev/null
+++ b/hw/mem/nvdimm/internal.h
@@ -0,0 +1,17 @@
+/*
+ * Non-Volatile Dual In-line Memory Module Virtualization Implementation
+ *
+ * Copyright(C) 2015 Intel Corporation.
+ *
+ * Author:
+ * Xiao Guangrong <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef NVDIMM_INTERNAL_H
+#define NVDIMM_INTERNAL_H
+
+#define MIN_NAMESPACE_LABEL_SIZE (128UL << 10)
+#endif
diff --git a/hw/mem/nvdimm/nvdimm.c b/hw/mem/nvdimm/nvdimm.c
new file mode 100644
index 0000000..0850e82
--- /dev/null
+++ b/hw/mem/nvdimm/nvdimm.c
@@ -0,0 +1,85 @@
+/*
+ * Non-Volatile Dual In-line Memory Module Virtualization Implementation
+ *
+ * Copyright(C) 2015 Intel Corporation.
+ *
+ * Author:
+ * Xiao Guangrong <address@hidden>
+ *
+ * Currently, it only supports PMEM Virtualization.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "qapi/visitor.h"
+#include "hw/mem/nvdimm.h"
+#include "internal.h"
+
+static MemoryRegion *nvdimm_get_memory_region(DIMMDevice *dimm)
+{
+ NVDIMMDevice *nvdimm = NVDIMM(dimm);
+
+ return memory_region_size(&nvdimm->nvdimm_mr) ? &nvdimm->nvdimm_mr : NULL;
+}
+
+static void nvdimm_realize(DIMMDevice *dimm, Error **errp)
+{
+ MemoryRegion *mr;
+ NVDIMMDevice *nvdimm = NVDIMM(dimm);
+ uint64_t size;
+
+ nvdimm->label_size = MIN_NAMESPACE_LABEL_SIZE;
+
+ mr = host_memory_backend_get_memory(dimm->hostmem, errp);
+ size = memory_region_size(mr);
+
+ if (size <= nvdimm->label_size) {
+ char *path =
object_get_canonical_path_component(OBJECT(dimm->hostmem));
+ error_setg(errp, "the size of memdev %s (0x%" PRIx64 ") is too small"
+ " to contain nvdimm namespace label (0x%" PRIx64 ")", path,
+ memory_region_size(mr), nvdimm->label_size);
+ return;
+ }
+
+ memory_region_init_alias(&nvdimm->nvdimm_mr, OBJECT(dimm), "nvdimm-memory",
+ mr, 0, size - nvdimm->label_size);
+ nvdimm->label_data = memory_region_get_ram_ptr(mr) +
+ memory_region_size(&nvdimm->nvdimm_mr);
+}
+
+static void nvdimm_class_init(ObjectClass *oc, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(oc);
+ DIMMDeviceClass *ddc = DIMM_CLASS(oc);
+
+ /* nvdimm hotplug has not been supported yet. */
+ dc->hotpluggable = false;
+
+ ddc->realize = nvdimm_realize;
+ ddc->get_memory_region = nvdimm_get_memory_region;
+}
+
+static TypeInfo nvdimm_info = {
+ .name = TYPE_NVDIMM,
+ .parent = TYPE_DIMM,
+ .instance_size = sizeof(NVDIMMDevice),
+ .class_init = nvdimm_class_init,
+};
+
+static void nvdimm_register_types(void)
+{
+ type_register_static(&nvdimm_info);
+}
+
+type_init(nvdimm_register_types)
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
new file mode 100644
index 0000000..f6bd2c4
--- /dev/null
+++ b/include/hw/mem/nvdimm.h
@@ -0,0 +1,33 @@
+/*
+ * Non-Volatile Dual In-line Memory Module Virtualization Implementation
+ *
+ * Copyright(C) 2015 Intel Corporation.
+ *
+ * Author:
+ * Xiao Guangrong <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef QEMU_NVDIMM_H
+#define QEMU_NVDIMM_H
+
+#include "hw/mem/dimm.h"
+
+#define TYPE_NVDIMM "nvdimm"
+#define NVDIMM(obj) \
+ OBJECT_CHECK(NVDIMMDevice, (obj), TYPE_NVDIMM)
+
+struct NVDIMMDevice {
+ /* private */
+ DIMMDevice parent_obj;
+
+ /* public */
+ uint64_t label_size;
+ void *label_data;
+ MemoryRegion nvdimm_mr;
+};
+typedef struct NVDIMMDevice NVDIMMDevice;
+
+#endif
--
1.8.3.1
- [Qemu-devel] [PATCH v3 30/32] nvdimm: support DSM_CMD_SET_NAMESPACE_LABEL_DATA, (continued)
- [Qemu-devel] [PATCH v3 30/32] nvdimm: support DSM_CMD_SET_NAMESPACE_LABEL_DATA, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 31/32] nvdimm: allow using whole backend memory as pmem, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 01/32] acpi: add aml_derefof, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 02/32] acpi: add aml_sizeof, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 17/32] dimm: abstract dimm device from pc-dimm, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 18/32] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 13/32] pc-dimm: make pc_existing_dimms_capacity static and rename it, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 15/32] stubs: rename qmp_pc_dimm_device_list.c, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 21/32] nvdimm: implement NVDIMM device abstract,
Xiao Guangrong <=
- [Qemu-devel] [PATCH v3 24/32] nvdimm: init the address region used by DSM method, Xiao Guangrong, 2015/10/10
- [Qemu-devel] [PATCH v3 23/32] nvdimm: build ACPI NFIT table, Xiao Guangrong, 2015/10/10
- Re: [Qemu-devel] [PATCH v3 23/32] nvdimm: build ACPI NFIT table, Dan Williams, 2015/10/12
[Qemu-devel] [PATCH v3 25/32] nvdimm: build ACPI nvdimm devices, Xiao Guangrong, 2015/10/10