This series completes refactoring of pre_plug, plug and unplug logic of
memory devices. With this as a basis, one can easily have e.g. virtio
based memory devices (virtio-mem, virtio-pmem, virtio-fs?) with minor
modifications on e.g. x86.
Patch 1-18 are the "real" patches of this series. Patch 19-24 are a
modified version of the virtio-pmem prototype that makes use of the new
memory-device hotplug model.
I modified Pankajs work to work with this series. virtio-pmem is included
as it was requested during the review to showcase a real user, so we can
discuss if this is good enough for us or if we have to do further changes.
More details about virtio-pmem can be found at:
https://lkml.org/lkml/2018/7/13/102
Of special interest regarding virtio devices being memory-devices are:
- "qdev: hotplug: provide do_unplug handler"
- "virtio-pmem: hotplug support functions"
- "pc: support for virtio-pmem"
Example: defining a simple virtio-pmem device (on /dev/zero for simplicity):
qemu-system-x86_64 \
-machine pc \
-m 8G,maxmem=20G \
-object memory-backend-file,id=mem1,share,mem-path=/dev/zero,size=4G \
-device virtio-pmem-pci,id=vp1,memdev=mem1
QEMU 3.0.50 monitor - type 'help' for more information
(qemu) info memory-devices
Memory device [virtio-pmem]: "vp1"
memaddr: 0x240000000
size: 4294967296
memdev: /objects/mem1
(qemu) info memory_size_summary
base memory: 8589934592
plugged memory: 4294967296
v3 -> v4:
- Minor comment and subject fixes
- Added "memory-device: fix alignment error message"
- Added "pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug"
- Dropped "hw/acpi-build: only indicate nvdimm and pc-dimm"
- "memory-device: document MemoryDeviceClass"
-- add more details about get_plugged_size
- "memory-device: add and use memory_device_get_region_size()"
-- fixed "local_err" usage
-- due to "pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug", keep PC_DIMM cast
- "memory-device: add class function get_device_id()"
-- provide default handler
- "hmp: handle virtio-pmem when printing memory device infos"
-- avoid fall-through switch case
-- add g_assert_not_reached()
- "numa: handle virtio-pmem in NUMA stats"
-- avoid fall-through switch case
-- add g_assert_not_reached()
- Added "qdev: hotplug: provide do_unplug handler"
-- unplug/unplug_request are not called for devices inside a device hierarchy
This new handler is always called when unrealizing and doesn't trigger
the unrealize (in contrast to unplug/unplug_request)
- "pc: support for virtio-pmem" and "virtio-pmem: hotplug support functions"
-- use do_unplug handler
- Tested "device_del vp1". It works, and I can see in the traces the
address getting unassigned. QEMU crashes when shutting down, that most
most likely is a result of virtio-pmem not properly unrealizing and
cleaning up virtqueues. (@Pankaj if you read this :) )
v2 -> v3:
- Rephrased some patch subjects/descriptions
- Added "memory-device: handle integer overflows properly"
- "memory-device: forward errors in get_region_size()/get_plugged_size()"
-- drop superfluous error check
- "memory-device: document MemoryDeviceClass"
-- some rewording
- replaced "memory-device: convert get_region_size() to get_memory_region()"
by "memory-device: add and use memory_device_get_region_size()"
and "memory-device: factor out get_memory_region() from pc-dimm"
and "memory-device: drop get_region_size()"
- squashed "memory-device: add device class function set_addr()"
and "pc-dimm: implement memory device class function set_addr()"
- replaced "memory-device: ids of virtio based devices are special"
by "memory-device: add optional function get_device_id()"
- fixed up the virtio-pmem prototype
v1 -> v2:
- Include virtio-pmem prototype
- Add "memory-device: fix error message when hinted address is too small"
- Add "memory-device: use memory device terminology in error messages"
- Add "hw/acpi-build: only indicate nvdimm and pc-dimm"
- Add "memory-device: ids of virtio based devices are special"
- Add "memory-device: ids of virtio based devices are special"
- Minor changes/fixes for other patches
David Hildenbrand (22):
memory-device: fix alignment error message
memory-device: fix error message when hinted address is too small
pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug
memory-device: handle integer overflows properly
memory-device: use memory device terminology in error messages
memory-device: introduce separate config option
memory-device: forward errors in get_region_size()/get_plugged_size()
memory-device: document MemoryDeviceClass
memory-device: add and use memory_device_get_region_size()
memory-device: factor out get_memory_region() from pc-dimm
memory-device: drop get_region_size()
memory-device: add device class function set_addr()
memory-device: complete factoring out pre_plug handling
memory-device: complete factoring out plug handling
memory-device: complete factoring out unplug handling
memory-device: trace when pre_assigning/assigning/unassigning
addresses
memory-device: add class function get_device_id()
qdev: hotplug: provide do_unplug handler
hmp: handle virtio-pmem when printing memory device infos
numa: handle virtio-pmem in NUMA stats
virtio-pmem: hotplug support functions
pc: support for virtio-pmem
Pankaj Gupta (2):
virtio-pmem: prototype
virtio-pci: proxy for virtio-pmem
default-configs/i386-softmmu.mak | 4 +-
default-configs/ppc64-softmmu.mak | 3 +-
hmp.c | 27 +-
hw/Makefile.objs | 2 +-
hw/core/hotplug.c | 10 +
hw/core/qdev.c | 6 +
hw/i386/pc.c | 23 +-
hw/mem/Makefile.objs | 4 +-
hw/mem/memory-device.c | 128 ++++++++--
hw/mem/nvdimm.c | 9 +-
hw/mem/pc-dimm.c | 80 ++----
hw/mem/trace-events | 5 +-
hw/ppc/spapr.c | 29 +--
hw/virtio/Makefile.objs | 1 +
hw/virtio/virtio-pci.c | 41 ++++
hw/virtio/virtio-pci.h | 14 ++
hw/virtio/virtio-pmem.c | 258 ++++++++++++++++++++
include/hw/hotplug.h | 26 +-
include/hw/mem/memory-device.h | 41 +++-
include/hw/mem/pc-dimm.h | 10 +-
include/hw/pci/pci.h | 1 +
include/hw/virtio/virtio-pmem.h | 51 ++++
include/standard-headers/linux/virtio_ids.h | 1 +
numa.c | 24 +-
qapi/misc.json | 28 ++-
25 files changed, 671 insertions(+), 155 deletions(-)
create mode 100644 hw/virtio/virtio-pmem.c
create mode 100644 include/hw/virtio/virtio-pmem.h
--
2.17.1
