Skip to contentSkip to conversation

refactor main RAM allocation to use hostmem backend

PATCH Superseded Igor Mammedov 1 participant 3 messages Jan 23, 2020

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover refactor main RAM allocation to use hostmem backend

v3:
- due to libvirt not being ready, postpone till 5.1
* [PATCH v2 82/86] numa: forbid '-numa node, mem' for 5.0 and newer machine types and depended
[PATCH v2 86/86] numa: remove deprecated implicit RAM distribution between nodes
- drop as not related "[PATCH v2 85/86] numa: make exit() usage consistent"
- drop "[PATCH v2 76/86] post conversion default_ram_id cleanup"
so that default memory-backedend won't be created for boards that do not care about -m. Which makes -m optin feature. We should decide what do in case board doesn't use -m (but that's out of scope of this series)
- use object_register_sugar_prop() instead of hacking compat props directly
- simplified/reworked aspeed patches
- s/RAM_ADDR_FMT/size_to_str()/
- rename 'ram-memdev' property to 'memory-backend'
- minor fixes to numa-test
- fixes for issues noticed during review of

       [PATCH v2 66/86] ppc/{ppc440_bamboo,sam460x}: drop RAM size fixup

v2:
- fix compile errors on mingw32 host by introducing RAM_ADDR_UFMT [11/86]
- replace "[PATCH 43/86] hppa: drop RAM size fixup" with alternative patches made by Philippe (which effectively do the same thing but other way around)
- ppc440: fix crash and add suggested valid RAM size in error output. s/ppc4xx_sdram_adjust/ppc4xx_sdram_prep/ and simplify it by removing not necessary nested loop
- rebase on current master due to new conflicts

Series removes ad hoc RAM allocation API (memory_region_allocate_system_memory)
and consolidates it around hostmem backend. It allows to
* resolve conflicts between global -mem-prealloc and hostmem's "policy" option fixing premature allocation before binding policy is applied
* simplify complicated memory allocation routines which had to deal with 2 ways
to allocate RAM.
* it allows to reuse hostmem backends of a choice for main RAM without adding
extra CLI options to duplicate hostmem features.
Recent case was -mem-shared, to enable vhost-user on targets that don't
support hostmem backends [1] (ex: s390)
* move RAM allocation from individual boards into generic machine code and
provide them with prepared MemoryRegion.
* clean up deprecated NUMA features which were tied to the old API (see patches)
- "numa: remove deprecated -mem-path fallback to anonymous RAM"
- (POSTPONED, waiting on libvirt side) "forbid '-numa node,mem' for 5.0 and newer machine types"
- (POSTPONED) "numa: remove deprecated implicit RAM distribution between nodes"

Conversion introduces a new machine.memory-backend property and wrapper code that aliases global -mem-path and -mem-alloc into automatically created hostmem backend properties (provided memory-backend was not set explicitly given by user). And then follows bulk of trivial patches that incrementally convert individual boards to using machine.memory-backend provided MemoryRegion.

Board conversion typically involves:
* providing MachineClass::default_ram_size and MachineClass::default_ram_id so generic code could create default backend if user didn't explicitly provide memory-backend or -m options
* dropping memory_region_allocate_system_memory() call
* using convenience MachineState::ram MemoryRegion, which points to MemoryRegion allocated by ram-memdev
On top of that for some boards:
* added missing ram_size checks (typically it were boards with fixed ram size)
* ram_size fixups were replaced by checks and hard errors, forcing user to provide correct "-m" values instead of ignoring it and continuing running.

After all boards are converted the old API is removed and memory allocation routines are cleaned up.

git tree for testing:
https://github.com/imammedo/qemu convert_main_ram_to_memdev_v3

previous rev:
https://github.com/imammedo/qemu convert_main_ram_to_memdev_v2
https://lists.nongnu.org/archive/html/qemu-devel/2020-01/msg02960.html

Igor Mammedov (77):
numa: remove deprecated -mem-path fallback to anonymous RAM
machine: introduce memory-backend property
machine: alias -mem-path and -mem-prealloc into memory-foo backend
machine: introduce convenience MachineState::ram initialize MachineState::ram in NUMA case
alpha:dp264: use memdev for RAM
arm/aspeed: actually check RAM size
arm/aspeed: use memdev for RAM
arm/collie: use memdev for RAM
arm/cubieboard: use memdev for RAM
arm/digic_boards: use memdev for RAM
arm/highbank: use memdev for RAM
arm/imx25_pdk: drop RAM size fixup
arm/imx25_pdk: use memdev for RAM
arm/integratorcp: use memdev for RAM
arm/kzm: drop RAM size fixup
arm/kzm: use memdev for RAM
arm/mcimx6ul-evk: use memdev for RAM
arm/mcimx7d-sabre: use memdev for RAM
arm/mps2-tz: use memdev for RAM
arm/mps2: use memdev for RAM
arm/musicpal: use memdev for RAM
arm/nseries: use memdev for RAM
arm/omap_sx1: use memdev for RAM
arm/palm: use memdev for RAM
arm/raspi: use memdev for RAM
arm/sabrelite: use memdev for RAM
arm/sbsa-ref: use memdev for RAM
arm/versatilepb: use memdev for RAM
arm/vexpress: use memdev for RAM
arm/virt: use memdev for RAM
arm/xilinx_zynq: drop RAM size fixup
arm/xilinx_zynq: use memdev for RAM arm/xlnx-versal-virt: use memdev for RAM arm/xlnx-zcu102: use memdev for RAM s390x/s390-virtio-ccw: use memdev for RAM
null-machine: use memdev for RAM
cris/axis_dev88: use memdev for RAM
hppa: use memdev for RAM
x86/microvm: use memdev for RAM
x86/pc: use memdev for RAM
lm32/lm32_boards: use memdev for RAM
lm32/milkymist: use memdev for RAM
m68k/an5206: use memdev for RAM
m68k/mcf5208: use memdev for RAM
m68k/next-cube: use memdev for RAM
mips/boston-cube: use memdev for RAM mips/mips_fulong2e: drop RAM size fixup mips/mips_fulong2e: use memdev for RAM
mips/mips_jazz: use memdev for RAM
mips/mips_malta: use memdev for RAM
mips/mips_mipssim: use memdev for RAM
mips/mips_r4k: use memdev for RAM
ppc/e500: drop RAM size fixup
ppc/e500: use memdev for RAM
ppc/mac_newworld: use memdev for RAM
ppc/mac_oldworld: use memdev for RAM
ppc/pnv: use memdev for RAM
ppc/ppc405_boards: add RAM size checks ppc/ppc405_boards: use memdev for RAM ppc/{ppc440_bamboo,sam460ex}: drop RAM size fixup ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM ppc/prep: use memdev for RAM
ppc/spapr: use memdev for RAM
ppc/virtex_ml507: remove unused arguments ppc/virtex_ml507: use memdev for RAM
sparc/leon3: use memdev for RAM
sparc/sun4m: use memdev for RAM
sparc/niagara: use memdev for RAM
remove no longer used memory_region_allocate_system_memory()
exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize()
exec: drop bogus mem_path from qemu_ram_alloc_from_fd() make mem_path local variable
hostmem: introduce "prealloc-threads" property
hostmem: fix strict bind policy
tests:numa-test: make top level args dynamic and g_autofree(cli)
cleanups
tests:numa-test: use explicit memdev to specify node RAM

Philippe Mathieu-Daudé (3):
hw/hppa/machine: Correctly check the firmware is in PDC range hw/hppa/machine: Restrict the total memory size to 3GB hw/hppa/machine: Map the PDC memory region with higher priority

 hw/alpha/alpha_sys.h          |   2 +-
 include/hw/boards.h           |  48 +++++----------
 include/hw/misc/aspeed_sdmc.h |   1 +
 include/hw/ppc/ppc4xx.h       |   9 ++-
 include/sysemu/hostmem.h      |  20 +++++-
 include/sysemu/numa.h         |   1 +
 include/sysemu/sysemu.h       |   2 -
 backends/hostmem-file.c       |   8 ---
 backends/hostmem-memfd.c      |   1 -
 backends/hostmem-ram.c        |   2 -
 backends/hostmem.c            |  53 +++++++++++-----
 exec.c                        |  66 +++-----------------
 hw/alpha/dp264.c              |   3 +-
 hw/alpha/typhoon.c            |   8 +--
 hw/arm/aspeed.c               |  18 +++---
 hw/arm/collie.c               |  17 ++++--
 hw/arm/cubieboard.c           |  25 +++-----
 hw/arm/digic_boards.c         |  40 ++++++------
 hw/arm/highbank.c             |  10 ++-
 hw/arm/imx25_pdk.c            |  13 ++--
 hw/arm/integratorcp.c         |   9 ++-
 hw/arm/kzm.c                  |  18 +++---
 hw/arm/mcimx6ul-evk.c         |  25 +++-----
 hw/arm/mcimx7d-sabre.c        |  25 +++-----
 hw/arm/mps2-tz.c              |  15 +++--
 hw/arm/mps2.c                 |  15 +++--
 hw/arm/musicpal.c             |  18 ++++--
 hw/arm/nseries.c              |  32 ++++++----
 hw/arm/omap_sx1.c             |  20 ++++--
 hw/arm/palm.c                 |  20 ++++--
 hw/arm/raspi.c                |  34 ++++-------
 hw/arm/sabrelite.c            |  23 +++----
 hw/arm/sbsa-ref.c             |   7 +--
 hw/arm/versatilepb.c          |   7 +--
 hw/arm/vexpress.c             |  14 ++---
 hw/arm/virt.c                 |   7 +--
 hw/arm/xilinx_zynq.c          |  20 +++---
 hw/arm/xlnx-versal-virt.c     |   7 +--
 hw/arm/xlnx-zcu102.c          |   7 +--
 hw/core/machine.c             |  30 +++++++++
 hw/core/null-machine.c        |   8 +--
 hw/core/numa.c                | 101 +++++++++----------------------
 hw/cris/axis_dev88.c          |   8 +--
 hw/hppa/machine.c             |  19 +++---
 hw/i386/microvm.c             |  12 ++--
 hw/i386/pc.c                  |  19 +++---
 hw/lm32/lm32_boards.c         |  39 ++++++++----
 hw/lm32/milkymist.c           |  21 ++++---
 hw/m68k/an5206.c              |   5 +-
 hw/m68k/mcf5208.c             |   5 +-
 hw/m68k/next-cube.c           |   5 +-
 hw/mips/boston.c              |  11 ++--
 hw/mips/mips_fulong2e.c       |  15 ++---
 hw/mips/mips_jazz.c           |   7 +--
 hw/mips/mips_malta.c          |  10 ++-
 hw/mips/mips_mipssim.c        |   9 +--
 hw/mips/mips_r4k.c            |  12 ++--
 hw/misc/aspeed_sdmc.c         |  83 +++++++++++++++++++------
 hw/ppc/e500.c                 |  17 +++---
 hw/ppc/e500plat.c             |   1 +
 hw/ppc/mac_newworld.c         |   6 +-
 hw/ppc/mac_oldworld.c         |   6 +-
 hw/ppc/mpc8544ds.c            |   1 +
 hw/ppc/pnv.c                  |   8 +--
 hw/ppc/ppc405_boards.c        |  48 +++++++++------
 hw/ppc/ppc440_bamboo.c        |  12 ++--
 hw/ppc/ppc4xx_devs.c          |  63 +++++++++----------
 hw/ppc/prep.c                 |  15 +++--
 hw/ppc/sam460ex.c             |   6 +-
 hw/ppc/spapr.c                |   8 +--
 hw/ppc/virtex_ml507.c         |  19 +++---
 hw/s390x/s390-virtio-ccw.c    |   7 +--
 hw/sparc/leon3.c              |   6 +-
 hw/sparc/sun4m.c              |  73 +++++++++++-----------
 hw/sparc64/niagara.c          |   7 +--
 qemu-deprecated.texi          |   9 ---
 tests/qtest/numa-test.c       | 138 ++++++++++++++++++++++--------------------
 vl.c                          |  37 ++++++++++-
 78 files changed, 785 insertions(+), 791 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/80 numa: remove deprecated -mem-path fallback to anonymous RAM

it has been deprecated since 4.0 by commit
cb79224b7 (deprecate -mem-path fallback to anonymous RAM)
Deprecation period ran out and it's time to remove it so it won't get in a way of switching to using hostmem backend for RAM.

---
CC:[email protected]
CC: [email protected]

---
 hw/core/numa.c       | 18 +-----------------
 qemu-deprecated.texi |  9 ---------
 2 files changed, 1 insertion(+), 26 deletions(-)
hw/core/numa.c +1 -17
index 0d1b4be..840e685 100644
@@ -784,24 +784,8 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
 {
     if (mem_path) {
 #ifdef __linux__
-        Error *err = NULL;
         memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, 0,
-                                         mem_path, &err);
-        if (err) {
-            error_report_err(err);
-            if (mem_prealloc) {
-                exit(1);
-            }
-            warn_report("falling back to regular RAM allocation");
-            error_printf("This is deprecated. Make sure that -mem-path "
-                         " specified path has sufficient resources to allocate"
-                         " -m specified RAM amount\n");
-            /* Legacy behavior: if allocation failed, fall back to
-             * regular RAM allocation.
-             */
-            mem_path = NULL;
-            memory_region_init_ram_nomigrate(mr, owner, name, ram_size, &error_fatal);
-        }
+                                         mem_path, &error_fatal);
 #else
         fprintf(stderr, "-mem-path not supported on this host\n");
         exit(1);
qemu-deprecated.texi +0 -9
index 0968d37..982af95 100644
@@ -113,15 +113,6 @@ QEMU using implicit generic or board specific splitting rule.
 Use @option{memdev} with @var{memory-backend-ram} backend or @option{mem} (if
 it's supported by used machine type) to define mapping explictly instead.
 
-@subsection -mem-path fallback to RAM (since 4.1)
-Currently if guest RAM allocation from file pointed by @option{mem-path}
-fails, QEMU falls back to allocating from RAM, which might result
-in unpredictable behavior since the backing file specified by the user
-is ignored. In the future, users will be responsible for making sure
-the backing storage specified with @option{-mem-path} can actually provide
-the guest RAM configured with @option{-m} and QEMU will fail to start up if
-RAM allocation is unsuccessful.
-
 @subsection RISC-V -bios (since 4.1)
 
 QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the
Signature · 1 line
2.7.4
#2 lore raw

PATCH v3 2/80 machine: introduce memory-backend property

In reply to Igor Mammedov

Property will contain link to memory backend that will be used for backing initial RAM.
Follow up commit will alias -mem-path and -mem-prealloc CLI options into memory backend options to make memory handling consistent (using only hostmem backend family for guest RAM allocation).

---
v3:
* rename property name from ram-memdev to memory-backend (Paolo Bonzini <[email protected]>)

---
 include/hw/boards.h | 2 ++
 hw/core/machine.c   | 9 +++++++++
 2 files changed, 11 insertions(+)
include/hw/boards.h +2 -0
index fb1b43d..6aa01b8 100644
@@ -4,6 +4,7 @@
 #define HW_BOARDS_H
 
 #include "exec/memory.h"
+#include "sysemu/hostmem.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"
 #include "qapi/qapi-types-machine.h"
@@ -285,6 +286,7 @@ struct MachineState {
     bool enforce_config_section;
     bool enable_graphics;
     char *memory_encryption;
+    HostMemoryBackend *ram_memdev;
     DeviceMemoryState *device_memory;
 
     ram_addr_t ram_size;
hw/core/machine.c +9 -0
index 3e288bf..bf30183 100644
@@ -886,6 +886,15 @@ static void machine_initfn(Object *obj)
                                         "Table (HMAT)", NULL);
     }
 
+    object_property_add_link(obj, "memory-backend", TYPE_MEMORY_BACKEND,
+                             (Object **)&ms->ram_memdev,
+                             object_property_allow_set_link,
+                             OBJ_PROP_LINK_STRONG, &error_abort);
+    object_property_set_description(obj, "memory-backend",
+                                    "Set RAM backend"
+                                    "Valid value is ID of hostmem based backend",
+                                     &error_abort);
+
     /* Register notifier when init is done for sysbus sanity checks */
     ms->sysbus_notifier.notify = machine_init_notify;
     qemu_add_machine_init_done_notifier(&ms->sysbus_notifier);
Signature · 1 line
2.7.4