Qemu virtio pmem device
cover Qemu virtio pmem device
This patch series has implementation for "virtio pmem" device. "virtio pmem" is persistent memory(nvdimm) device in guest which allows to bypass the guest page cache. This also implements a VIRTIO based asynchronous flush mechanism. Details of project idea for 'virtio pmem' flushing interface is shared [2] & [3].
Sharing Qemu device emulation in this patchset. Tested with guest kernel driver [1]. This series is based on David's memory device refactoring [5] work with modified version of my initial virtio pmem [4] series.
Usage:
./qemu -name test -machine pc -m 8G,slots=240,maxmem=20G -object memory-backend-file,id=mem1,share,mem-path=test.img,
size=4G,share
-device virtio-pmem-pci,memdev=mem1,id=nv1
(qemu) info memory-devices
Memory device [virtio-pmem]: "nv1"
memaddr: 0x240000000
size: 4294967296
memdev: /objects/mem1
Implementation is divided into two parts:
New virtio pmem guest driver and qemu code changes for new virtio pmem paravirtualized device. In this series we are sharing Qemu device emulation.
1. Guest virtio-pmem kernel driver
---------------------------------
- Reads persistent memory range from paravirt device and registers with 'nvdimm_bus'.
- 'nvdimm/pmem' driver uses this information to allocate persistent memory region and setup filesystem operations to the allocated memory.
- virtio pmem driver implements asynchronous flushing interface to flush from guest to host.
2. Qemu virtio-pmem device
---------------------------------
- Creates virtio pmem device and exposes a memory range to KVM guest.
- At host side this is file backed memory which acts as persistent memory.
- Qemu side flush uses aio thread pool API's and virtio for asynchronous guest multi request handling.
Virtio-pmem security implications and suggested countermeasures:
---------------------------------------------------------------
In previous posting of kernel driver, there was discussion [7] on possible implications of page cache side channel attacks with virtio pmem. After thorough analysis of details of known side channel attacks, below are the suggestions:
- Depends entirely on how host backing image file is mapped into guest address space.
- virtio-pmem device emulation, by default shared mapping is used to map host backing file. It is recommended to use separate backing file at host side for every guest. This will prevent any possibility of executing common code from multiple guests and any chance of inferring guest local data based based on execution time.
- If backing file is required to be shared among multiple guests it is recommended to don't support host page cache eviction commands from the guest driver. This will avoid any possibility of inferring guest local data or host data from another guest.
- Proposed device specification [6] for virtio-pmem device with details of possible security implications and suggested countermeasures for device emulation.
[1] https://lkml.org/lkml/2019/5/21/569
[2] https://www.spinics.net/lists/kvm/msg149761.html
[3] https://www.spinics.net/lists/kvm/msg153095.html
[4] https://marc.info/?l=linux-kernel&m=153572228719237&w=2
[5] https://marc.info/?l=qemu-devel&m=153555721901824&w=2
[6] https://lists.oasis-open.org/archives/virtio-dev/201903/msg00083.html
[7] https://lkml.org/lkml/2019/1/9/1191
Pankaj Gupta (3):
virtio-pmem: add virtio device
virtio-pmem: sync linux headers
virtio-pci: proxy for virtio-pmem
David Hildenbrand (4):
virtio-pci: Allow to specify additional interfaces for the base type
hmp: Handle virtio-pmem when printing memory device infos
numa: Handle virtio-pmem in NUMA stats
pc: Support for virtio-pmem-pci
hmp.c | 27 ++- hw/i386/Kconfig | 1 hw/i386/pc.c | 72 ++++++++++ hw/virtio/Kconfig | 10 + hw/virtio/Makefile.objs | 2 hw/virtio/virtio-pci.c | 1 hw/virtio/virtio-pci.h | 1 hw/virtio/virtio-pmem-pci.c | 131 ++++++++++++++++++ hw/virtio/virtio-pmem-pci.h | 34 ++++ hw/virtio/virtio-pmem.c | 190 +++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 include/hw/virtio/virtio-pmem.h | 49 ++++++ include/standard-headers/linux/virtio_ids.h | 1 include/standard-headers/linux/virtio_pmem.h | 35 ++++ numa.c | 24 +-- qapi/misc.json | 28 +++ 16 files changed, 581 insertions(+), 26 deletions(-)
----
P.S: Sending this patch series before going for vacations, please expect a delay in response.
PATCH 1/7 virtio-pmem: add virtio device
This is the implementation of virtio-pmem device. Support will require machine changes for the architectures that will support it, so it will not yet be compiled. It can be unlocked with VIRTIO_PMEM_SUPPORTED per machine and disabled globally via VIRTIO_PMEM.
We cannot use the "addr" property as that is already used e.g. for virtio-pci/pci devices. And we will have e.g. virtio-pmem-pci as a proxy. So we have to choose a different one (unfortunately). "memaddr" it is. That name should ideally be used by all other virtio-* based memory devices in the future.
-device virtio-pmem-pci,id=p0,bus=bux0,addr=0x01,memaddr=0x1000000...
[ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
split up patches, unplug handler ]
--- hw/virtio/Kconfig | 10 +++ hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-pmem.c | 190 ++++++++++++++++++++++++++++++++++++++++ include/hw/virtio/virtio-pmem.h | 49 +++++++++++ qapi/misc.json | 28 +++++- 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 hw/virtio/virtio-pmem.c create mode 100644 include/hw/virtio/virtio-pmem.h
hw/virtio/Kconfig +10 -0
@@ -29,3 +29,13 @@ config VIRTIO_CRYPTO bool default y depends on VIRTIO + +config VIRTIO_PMEM_SUPPORTED + bool + +config VIRTIO_PMEM + bool + default y + depends on VIRTIO + depends on VIRTIO_PMEM_SUPPORTED + select MEM_DEVICE
hw/virtio/Makefile.objs +1 -0
@@ -12,6 +12,7 @@ common-obj-$(CONFIG_VIRTIO_MMIO) += virtio-mmio.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o ifeq ($(CONFIG_VIRTIO_PCI),y)
hw/virtio/virtio-pmem.c new file +190 -0
190 lines not on this page · raw message
include/hw/virtio/virtio-pmem.h new file +49 -0
49 lines not on this page · raw message
qapi/misc.json +27 -1
@@ -2742,16 +2742,42 @@ } } +## +# @VirtioPMEMDeviceInfo: +# +# VirtioPMEM state information +# +# @id: device's ID +# +# @memaddr: physical address in memory, where device is mapped +# +# @size: size of memory that the device provides +# +# @memdev: memory backend linked with device +# +# Since: 4.0 +## +{ 'struct': 'VirtioPMEMDeviceInfo', + 'data': { '*id': 'str', + 'memaddr': 'size', + 'size': 'size', + 'memdev': 'str' + } +} + ## # @MemoryDeviceInfo: # # Union containing information about a memory device # +# nvdimm is included since 2.12. virtio-pmem is included since 4.0. +# # Since: 2.1 ## { 'union': 'MemoryDeviceInfo', 'data': { 'dimm': 'PCDIMMDeviceInfo', - 'nvdimm': 'PCDIMMDeviceInfo' + 'nvdimm': 'PCDIMMDeviceInfo', + 'virtio-pmem': 'VirtioPMEMDeviceInfo' } }
Signature · 1 line
2.14.5
Re: [Qemu-devel] [PATCH 1/7] virtio-pmem: add virtio device
Quoted 29 lines · Pankaj Gupta
This is the implementation of virtio-pmem device. Support will require machine changes for the architectures that will support it, so it will not yet be compiled. It can be unlocked with
VIRTIO_PMEM_SUPPORTEDper machine and disabled globally viaVIRTIO_PMEM.We cannot use the "addr" property as that is already used e.g. for virtio-pci/pci devices. And we will have e.g. virtio-pmem-pci as a proxy. So we have to choose a different one (unfortunately). "memaddr" it is. That name should ideally be used by all other virtio-* based memory devices in the future.
-device virtio-pmem-pci,id=p0,bus=bux0,addr=0x01,memaddr=0x1000000...[ QAPI bits ]Signed-off-by Pankaj Gupta <[email protected]>[ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
split up patches, unplug handler ]Signed-off-by David Hildenbrand <[email protected]>---
+++
b/qapi/misc.jsonqapi/misc.json +4
-0@@ -2742,16 +2742,42 @@ } } +## +# @VirtioPMEMDeviceInfo: +# +# VirtioPMEM state information
qapi/misc.json line 2758
Quoted 10 lines
qapi/misc.json +10
-0+# +# @id: device's ID +# +# @memaddr: physical address in memory, where device is mapped +# +# @size: size of memory that the device provides +# +# @memdev: memory backend linked with device +# +# Since: 4.0
You've missed 4.0; this should be 4.1.
qapi/misc.json line 2761
Quoted 3 lines
qapi/misc.json +3
-0+## +{ 'struct': 'VirtioPMEMDeviceInfo', + 'data': { '*id': 'str',
Why is id optional? Does it make sense to have a device without an id?
qapi/misc.json line 2773
Quoted 12 lines
qapi/misc.json +7
-0+ 'memaddr': 'size', + 'size': 'size', + 'memdev': 'str' + } +} + ## # @MemoryDeviceInfo: # # Union containing information about a memory device # +# nvdimm is included since 2.12. virtio-pmem is included since 4.0.
4.1
Quoted 12 lines
qapi/misc.json +3
-1+# # Since: 2.1 ## { 'union': 'MemoryDeviceInfo', 'data': { 'dimm': 'PCDIMMDeviceInfo', - 'nvdimm': 'PCDIMMDeviceInfo' + 'nvdimm': 'PCDIMMDeviceInfo', + 'virtio-pmem': 'VirtioPMEMDeviceInfo' } }
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH 1/7] virtio-pmem: add virtio device
Quoted 28 lines · Pankaj Gupta
Quoted 25 lines
This is the implementation of virtio-pmem device. Support will require machine changes for the architectures that will support it, so it will not yet be compiled. It can be unlocked with
VIRTIO_PMEM_SUPPORTEDper machine and disabled globally viaVIRTIO_PMEM.We cannot use the "addr" property as that is already used e.g. for virtio-pci/pci devices. And we will have e.g. virtio-pmem-pci as a proxy. So we have to choose a different one (unfortunately). "memaddr" it is. That name should ideally be used by all other virtio-* based memory devices in the future.
-device virtio-pmem-pci,id=p0,bus=bux0,addr=0x01,memaddr=0x1000000...[ QAPI bits ]Signed-off-by Pankaj Gupta <[email protected]>[ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
split up patches, unplug handler ]Signed-off-by David Hildenbrand <[email protected]>---
+++
b/qapi/misc.json(quoted diff) +0
-0@@ -2742,16 +2742,42 @@ } }
Quoted 16 lines
Quoted 4 lines
qapi/misc.json +4
-0+## +# @VirtioPMEMDeviceInfo: +# +# VirtioPMEM state informationqapi/misc.json line 2758
Quoted 10 lines
qapi/misc.json +10
-0+# +# @id: device's ID +# +# @memaddr: physical address in memory, where device is mapped +# +# @size: size of memory that the device provides +# +# @memdev: memory backend linked with device +# +# Since: 4.0You've missed 4.0; this should be 4.1.
Yes. Will update.
Quoted 6 lines
qapi/misc.json line 2761
Quoted 4 lines
qapi/misc.json +3
-0+## +{ 'struct': 'VirtioPMEMDeviceInfo', + 'data': { '*id': 'str',Why is id optional? Does it make sense to have a device without an id?
I think that's how it has been for both NVDIMM and DIMM. And it works fine with optional 'id', but requires unique 'id' for underlying memory device. That means its okay to keep 'id' optional for root dimm/nvdimm/virtio-pmem devices.
Thanks,
Pankaj
Quoted 15 lines
qapi/misc.json line 2773
Quoted 13 lines
qapi/misc.json +7
-0+ 'memaddr': 'size', + 'size': 'size', + 'memdev': 'str' + } +} + ## # @MemoryDeviceInfo: # # Union containing information about a memory device # +# nvdimm is included since 2.12. virtio-pmem is included since 4.0.4.1
o.k
Quoted 20 lines
qapi/misc.json line 2783
Quoted 13 lines
qapi/misc.json +3
-1+# # Since: 2.1 ## { 'union': 'MemoryDeviceInfo', 'data': { 'dimm': 'PCDIMMDeviceInfo', - 'nvdimm': 'PCDIMMDeviceInfo' + 'nvdimm': 'PCDIMMDeviceInfo', + 'virtio-pmem': 'VirtioPMEMDeviceInfo' } }--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH 1/7] virtio-pmem: add virtio device
In reply to Pankaj GuptaQuoted 34 lines · On Thu, 23 May 2019 15:54:43 +0530 Pankaj Gupta <[email protected]> wrote:
This is the implementation of virtio-pmem device. Support will require machine changes for the architectures that will support it, so it will not yet be compiled. It can be unlocked with
VIRTIO_PMEM_SUPPORTEDper machine and disabled globally viaVIRTIO_PMEM.We cannot use the "addr" property as that is already used e.g. for virtio-pci/pci devices. And we will have e.g. virtio-pmem-pci as a proxy. So we have to choose a different one (unfortunately). "memaddr" it is. That name should ideally be used by all other virtio-* based memory devices in the future.
-device virtio-pmem-pci,id=p0,bus=bux0,addr=0x01,memaddr=0x1000000...[ QAPI bits ]Signed-off-by Pankaj Gupta <[email protected]>[ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
split up patches, unplug handler ]Signed-off-by David Hildenbrand <[email protected]>--- hw/virtio/Kconfig | 10 +++ hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-pmem.c | 190 ++++++++++++++++++++++++++++++++++++++++ include/hw/virtio/virtio-pmem.h | 49 +++++++++++ qapi/misc.json | 28 +++++- 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 hw/virtio/virtio-pmem.c create mode 100644 include/hw/virtio/virtio-pmem.hhw/virtio/virtio-pmem.c new file +0
-0
hw/virtio/virtio-pmem.c line 130
Quoted 8 lines
hw/virtio/virtio-pmem.c new file +7
-0@@ -0,0 +1,190 @@ +static void virtio_pmem_unrealize (DeviceState *dev,Error **errp) +{ +VirtIODevice *vdev =VIRTIO_DEVICE (dev); +VirtIOPMEM *pmem =VIRTIO_PMEM (dev); + +host_memory_backend_set_mapped (pmem->memdev, false); + pmem->rq_vq =virtio_add_queue (vdev,128 , virtio_pmem_flush);
Adding a queue during unrealize looks weird... copy/paste error?
Quoted 2 lines
hw/virtio/virtio-pmem.c new file +2
-0+virtio_cleanup (vdev); +}
Re: [Qemu-devel] [PATCH 1/7] virtio-pmem: add virtio device
Quoted 38 lines
Quoted 37 lines
This is the implementation of virtio-pmem device. Support will require machine changes for the architectures that will support it, so it will not yet be compiled. It can be unlocked with
VIRTIO_PMEM_SUPPORTEDper machine and disabled globally viaVIRTIO_PMEM.We cannot use the "addr" property as that is already used e.g. for virtio-pci/pci devices. And we will have e.g. virtio-pmem-pci as a proxy. So we have to choose a different one (unfortunately). "memaddr" it is. That name should ideally be used by all other virtio-* based memory devices in the future.
-device virtio-pmem-pci,id=p0,bus=bux0,addr=0x01,memaddr=0x1000000...[ QAPI bits ]Signed-off-by Pankaj Gupta <[email protected]>[ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
split up patches, unplug handler ]Signed-off-by David Hildenbrand <[email protected]>--- hw/virtio/Kconfig | 10 +++ hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-pmem.c | 190 ++++++++++++++++++++++++++++++++++++++++ include/hw/virtio/virtio-pmem.h | 49 +++++++++++ qapi/misc.json | 28 +++++- 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 hw/virtio/virtio-pmem.c create mode 100644 include/hw/virtio/virtio-pmem.hhw/virtio/virtio-pmem.c new file +0
-0@@ -0,0 +1,190 @@
Quoted 9 lines
hw/virtio/virtio-pmem.c line 130
Quoted 7 lines
hw/virtio/virtio-pmem.c new file +7
-0+static void virtio_pmem_unrealize (DeviceState *dev,Error **errp) +{ +VirtIODevice *vdev =VIRTIO_DEVICE (dev); +VirtIOPMEM *pmem =VIRTIO_PMEM (dev); + +host_memory_backend_set_mapped (pmem->memdev, false); + pmem->rq_vq =virtio_add_queue (vdev,128 , virtio_pmem_flush);Adding a queue during unrealize looks weird... copy/paste error?
Yes. Thanks for catching this. Will correct in v2.
Thanks,
Pankaj
Quoted 5 lines
Quoted 3 lines
hw/virtio/virtio-pmem.c new file +2
-0+virtio_cleanup (vdev); +}
PATCH 2/7 virtio-pci: Allow to specify additional interfaces for the base type
In reply to Pankaj GuptaFrom: David Hildenbrand <[email protected]>
Let's allow to specify additional interfaces for the base type (e.g. later TYPE_MEMORY_DEVICE), something that was possible before the rework of virtio PCI device instantiation.
--- hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio-pci.h | 1 + 2 files changed, 2 insertions(+)
hw/virtio/virtio-pci.c +1 -0
@@ -1939,6 +1939,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t) .class_init = virtio_pci_base_class_init, .class_data = (void *)t, .abstract = true, + .interfaces = t->interfaces, };TypeInfo generic_type_info = { .name = t->generic_name,
hw/virtio/virtio-pci.h +1 -0
@@ -233,6 +233,7 @@ typedef struct VirtioPCIDeviceTypeInfo {size_t class_size;void (*instance_init)(Object *obj);void (*class_init)(ObjectClass *klass,void *data); +InterfaceInfo *interfaces; } VirtioPCIDeviceTypeInfo;/* Register virtio-pci type(s). @t must be static. */
Signature · 1 line
2.14.5
PATCH 3/7 virtio-pmem: sync linux headers
In reply to Pankaj GuptaSync linux headers for virtio pmem.
--- include/standard-headers/linux/virtio_ids.h | 1 + include/standard-headers/linux/virtio_pmem.h | 35 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 include/standard-headers/linux/virtio_pmem.h
include/standard-headers/linux/virtio_ids.h +1 -0
@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */
include/standard-headers/linux/virtio_pmem.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* +* Definitions for virtio-pmem devices. +* +* Copyright (C) 2019 Red Hat, Inc. +* +* Author(s): Pankaj Gupta <[email protected]> +*/ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +#include <linux/types.h> +#include <linux/virtio_types.h> +#include <linux/virtio_ids.h> +#include <linux/virtio_config.h> + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; + +#define VIRTIO_PMEM_REQ_TYPE_FLUSH 0 + +struct virtio_pmem_resp { +/* Host return status corresponding to flush request */ +__virtio32 ret; +}; + +struct virtio_pmem_req { +/* command type */ +__virtio32 type; +}; + +#endif
Signature · 1 line
2.14.5
PATCH 4/7 virtio-pci: Proxy for virtio-pmem
In reply to Pankaj GuptaWe need a proxy device for virtio-pmem, and this device has to be the actual memory device so we can cleanly hotplug it.
Forward memory device class functions either to the actual device or use properties of the virtio-pmem device to implement these in the proxy.
virtio-pmem will only be compiled for selected, supported architectures (that can deal with virtio/pci devices being memory devices). An architecture that is prepared for that can simply enable CONFIG_VIRTIO_PMEM to make it work.
As not all architectures support memory devices (and CONFIG_VIRTIO_PMEM will be enabled per supported architecture), we have to move the PCI proxy to a separate file.
--- hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-pmem-pci.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ hw/virtio/virtio-pmem-pci.h | 34 ++++++++++++ include/hw/pci/pci.h | 1 + 4 files changed, 167 insertions(+) create mode 100644 hw/virtio/virtio-pmem-pci.c create mode 100644 hw/virtio/virtio-pmem-pci.h
hw/virtio/Makefile.objs +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o +common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o ifeq ($(CONFIG_VIRTIO_PCI),y)
hw/virtio/virtio-pmem-pci.c new file +131 -0
131 lines not on this page · raw message
hw/virtio/virtio-pmem-pci.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Virtio PMEM PCI device +* +* Copyright (C) 2018-2019 Red Hat, Inc. +* +* Authors: +* Pankaj Gupta <[email protected]> +* David Hildenbrand <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. +* See the COPYING file in the top-level directory. +*/ + +#ifndef QEMU_VIRTIO_PMEM_PCI_H +#define QEMU_VIRTIO_PMEM_PCI_H + +#include "hw/virtio/virtio-pci.h" +#include "hw/virtio/virtio-pmem.h" + +typedef struct VirtIOPMEMPCI VirtIOPMEMPCI ; + +/* +* virtio-pmem-pci: This extends VirtioPCIProxy. +*/ +#define TYPE_VIRTIO_PMEM_PCI "virtio-pmem-pci-base" +#define VIRTIO_PMEM_PCI (obj) \ + OBJECT_CHECK(VirtIOPMEMPCI, (obj), TYPE_VIRTIO_PMEM_PCI) + +struct VirtIOPMEMPCI { +VirtIOPCIProxy parent_obj; +VirtIOPMEM vdev; +}; + +#endif /* QEMU_VIRTIO_PMEM_PCI_H */
include/hw/pci/pci.h +1 -0
@@ -85,6 +85,7 @@ extern bool pci_available;#define PCI_DEVICE_ID_VIRTIO_RNG 0x1005#define PCI_DEVICE_ID_VIRTIO_9P 0x1009#define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 +#define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013#define PCI_VENDOR_ID_REDHAT 0x1b36#define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001
Signature · 1 line
2.14.5
PATCH 5/7 hmp: Handle virtio-pmem when printing memory device infos
In reply to Pankaj GuptaFrom: David Hildenbrand <[email protected]>
Print the memory device info just like for PCDIMM/NVDIMM.
--- hmp.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
hmp.c +15 -12
@@ -2650,6 +2650,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)Error *err =NULL ;MemoryDeviceInfoList *info_list =qmp_query_memory_devices (&err);MemoryDeviceInfoList *info; +VirtioPMEMDeviceInfo *vpi;MemoryDeviceInfo *value;PCDIMMDeviceInfo *di;
@@ -2659,19 +2660,9 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)if (value) {switch (value->type) {case MEMORY_DEVICE_INFO_KIND_DIMM : - di = value->u.dimm.data; -break ; -case MEMORY_DEVICE_INFO_KIND_NVDIMM : - di = value->u.nvdimm.data; -break ; - -default : - di =NULL ; -break ; - } - -if (di) { + di = value->type ==MEMORY_DEVICE_INFO_KIND_DIMM ? + value->u.dimm.data : value->u.nvdimm.data;monitor_printf (mon,"Memory device [%s]: \"%s\"\n" ,MemoryDeviceInfoKind_str (value->type), di->id ? di->id :"" );
@@ -2684,6 +2675,18 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) di->hotplugged ? "true" : "false");monitor_printf (mon," hotpluggable: %s\n" , di->hotpluggable ?"true" :"false" ); +break ; +case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM : + vpi = value->u.virtio_pmem.data; +monitor_printf (mon,"Memory device [%s]: \"%s\"\n" , +MemoryDeviceInfoKind_str (value->type), + vpi->id ? vpi->id :"" ); +monitor_printf (mon," memaddr: 0x%" PRIx64"\n" , vpi->memaddr); +monitor_printf (mon," size: %" PRIu64"\n" , vpi->size); +monitor_printf (mon," memdev: %s\n" , vpi->memdev); +break ; +default : +g_assert_not_reached (); } } }
Signature · 1 line
2.14.5
PATCH 6/7 numa: Handle virtio-pmem in NUMA stats
In reply to Pankaj GuptaFrom: David Hildenbrand <[email protected]>
Account the memory to node 0 for now. Once (if ever) virtio-pmem supports NUMA, we can account it to the right node.
--- numa.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
numa.c +12 -12
@@ -549,6 +549,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])MemoryDeviceInfoList *info_list =qmp_memory_device_list ();MemoryDeviceInfoList *info;PCDIMMDeviceInfo *pcdimm_info; +VirtioPMEMDeviceInfo *vpi;for (info = info_list; info; info = info->next) {MemoryDeviceInfo *value = info->value;
@@ -556,22 +557,21 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])if (value) {switch (value->type) {case MEMORY_DEVICE_INFO_KIND_DIMM : - pcdimm_info = value->u.dimm.data; -break ; -case MEMORY_DEVICE_INFO_KIND_NVDIMM : - pcdimm_info = value->u.nvdimm.data; -break ; - -default : - pcdimm_info =NULL ; -break ; - } - -if (pcdimm_info) { + pcdimm_info = value->type ==MEMORY_DEVICE_INFO_KIND_DIMM ? + value->u.dimm.data : value->u.nvdimm.data; node_mem[pcdimm_info->node].node_mem += pcdimm_info->size; node_mem[pcdimm_info->node].node_plugged_mem += pcdimm_info->size; +break ; +case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM : + vpi = value->u.virtio_pmem.data; +/* TODO: once we support numa, assign to right node */ + node_mem[0 ].node_mem += vpi->size; + node_mem[0 ].node_plugged_mem += vpi->size; +break ; +default : +g_assert_not_reached (); } } }
Signature · 1 line
2.14.5
PATCH 7/7 pc: Support for virtio-pmem-pci
In reply to Pankaj GuptaFrom: David Hildenbrand <[email protected]>
Override the device hotplug handler to properly handle the memory device part via virtio-pmem-pci callbacks from the machine hotplug handler and forward to the actual PCI bus hotplug handler.
As PCI hotplug has not been properly factored out into hotplug handlers, most magic is performed in the (un)realize functions. Also some PCI host buses don't have a PCI hotplug handler at all yet, just to be sure that we alway have a hotplug handler on x86, add a simple error check.
Unlocking virtio-pmem will unlock virtio-pmem-pci.
--- hw/i386/Kconfig | 1 + hw/i386/pc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-)
hw/i386/Kconfig +1 -0
@@ -30,6 +30,7 @@ config PC # For ACPI builder: select SERIAL_ISA select ACPI_VMGENID + select VIRTIO_PMEM_SUPPORTED config PC_PCI bool
hw/i386/pc.c +71 -1
114 lines not on this page · raw message
Signature · 1 line
2.14.5