include/hw/boards.h | 3 ++ include/hw/i386/pc.h | 3 ++ include/hw/s390x/s390-virtio-ccw.h | 14 ++++++ include/sysemu/kvm_int.h | 1 + accel/kvm/kvm-all.c | 77 +++++++++++++++++------------ exec.c | 9 ++-- hw/arm/virt.c | 9 +++- hw/core/machine.c | 3 ++ hw/i386/pc.c | 3 ++ hw/i386/pc_piix.c | 14 +++++- hw/i386/pc_q35.c | 13 ++++- hw/ppc/spapr.c | 15 +++++- hw/s390x/s390-virtio-ccw.c | 79 ++++++++++++++++++++---------- memory.c | 6 +++ target/s390x/kvm.c | 1 + 15 files changed, 183 insertions(+), 67 deletions(-)
Changelog: since v1: - include 4.2 machines patch for adding compat RAM layout on top - 2/4 add missing in v1 patch for splitting too big MemorySection on several memslots - 3/4 amend code path on alias destruction to ensure that RAMBlock is cleaned properly - 4/4 add compat machine code to keep old layout (migration-wise) for 4.1 and older machines While looking into unifying guest RAM allocation to use hostmem backends for initial RAM (especially when -mempath is used) and retiring memory_region_allocate_system_memory() API, leaving only single hostmem backend, I was inspecting how currently it is used by boards and it turns out several boards abuse it by calling the function several times (despite documented contract forbiding it). s390 is one of such boards where KVM limitation on memslot size got propagated to board design and memory_region_allocate_system_memory() was abused to satisfy KVM requirement for max RAM chunk where memory region alias would suffice. Unfortunately, memory_region_allocate_system_memory() usage created migration dependency where guest RAM is transferred in migration stream as several RAMBlocks if it's more than KVM_SLOT_MAX_BYTES. In order to replace these several RAM chunks with a single memdev and keep it working with KVM memslot size limit and migration compatible, following was done: * [2/4] split too big RAM chunk inside of KVM code on several memory slots if necessary * [4/4] use memory region aliases to partition hostmem backend RAM on KVM_SLOT_MAX_BYTES chunks, which should keep KVM side working * [3/4] hacked memory region aliases (to ram memory regions only) to have its own RAMBlocks pointing to RAM chunks owned by aliased memory region. While it's admittedly a hack, but it's relatively simple and allows board code re-shape migration stream as necessary I haven't tried to use migratable aliases on x86 machines, but with it it could be possible to drop legacy RAM allocation and compat knob (cd5ff8333a) dropping '-numa node,mem' completely even for old machines. PS: Tested with ping pong cross version migration on s390 machine and x86 pc/q35 (with reduced KVM_SLOT_MAX_BYTES since I don't have access to large enough host) CC: pbonzini@redhat.com CC: qemu-s390x@nongnu.org CC: borntraeger@de.ibm.com CC: thuth@redhat.com CC: david@redhat.com CC: cohuck@redhat.com Cornelia Huck (1): hw: add compat machines for 4.2 Igor Mammedov (3): kvm: s390: split too big memory section on several memslots memory: make MemoryRegion alias migratable s390: do not call memory_region_allocate_system_memory() multiple times include/hw/boards.h | 3 ++ include/hw/i386/pc.h | 3 ++ include/hw/s390x/s390-virtio-ccw.h | 14 ++++++ include/sysemu/kvm_int.h | 1 + accel/kvm/kvm-all.c | 77 +++++++++++++++++------------ exec.c | 9 ++-- hw/arm/virt.c | 9 +++- hw/core/machine.c | 3 ++ hw/i386/pc.c | 3 ++ hw/i386/pc_piix.c | 14 +++++- hw/i386/pc_q35.c | 13 ++++- hw/ppc/spapr.c | 15 +++++- hw/s390x/s390-virtio-ccw.c | 79 ++++++++++++++++++++---------- memory.c | 6 +++ target/s390x/kvm.c | 1 + 15 files changed, 183 insertions(+), 67 deletions(-) -- 2.18.1
Patchew URL: https://patchew.org/QEMU/20190802093854.5343-1-imammedo@redhat.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Subject: [Qemu-devel] [PATCH RFC v2 0/4] s390: stop abusing memory_region_allocate_system_memory() Message-id: 20190802093854.5343-1-imammedo@redhat.com === TEST SCRIPT BEGIN === #!/bin/bash git rev-parse base > /dev/null || exit 0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu * [new tag] patchew/20190802093854.5343-1-imammedo@redhat.com -> patchew/20190802093854.5343-1-imammedo@redhat.com Submodule 'capstone' (https://git.qemu.org/git/capstone.git) registered for path 'capstone' Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc' Submodule 'roms/QemuMacDrivers' (https://git.qemu.org/git/QemuMacDrivers.git) registered for path 'roms/QemuMacDrivers' Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 'roms/SLOF' Submodule 'roms/edk2' (https://git.qemu.org/git/edk2.git) registered for path 'roms/edk2' Submodule 'roms/ipxe' (https://git.qemu.org/git/ipxe.git) registered for path 'roms/ipxe' Submodule 'roms/openbios' (https://git.qemu.org/git/openbios.git) registered for path 'roms/openbios' Submodule 'roms/openhackware' (https://git.qemu.org/git/openhackware.git) registered for path 'roms/openhackware' Submodule 'roms/opensbi' (https://git.qemu.org/git/opensbi.git) registered for path 'roms/opensbi' Submodule 'roms/qemu-palcode' (https://git.qemu.org/git/qemu-palcode.git) registered for path 'roms/qemu-palcode' Submodule 'roms/seabios' (https://git.qemu.org/git/seabios.git/) registered for path 'roms/seabios' Submodule 'roms/seabios-hppa' (https://git.qemu.org/git/seabios-hppa.git) registered for path 'roms/seabios-hppa' Submodule 'roms/sgabios' (https://git.qemu.org/git/sgabios.git) registered for path 'roms/sgabios' Submodule 'roms/skiboot' (https://git.qemu.org/git/skiboot.git) registered for path 'roms/skiboot' Submodule 'roms/u-boot' (https://git.qemu.org/git/u-boot.git) registered for path 'roms/u-boot' Submodule 'roms/u-boot-sam460ex' (https://git.qemu.org/git/u-boot-sam460ex.git) registered for path 'roms/u-boot-sam460ex' Submodule 'slirp' (https://git.qemu.org/git/libslirp.git) registered for path 'slirp' Submodule 'tests/fp/berkeley-softfloat-3' (https://git.qemu.org/git/berkeley-softfloat-3.git) registered for path 'tests/fp/berkeley-softfloat-3' Submodule 'tests/fp/berkeley-testfloat-3' (https://git.qemu.org/git/berkeley-testfloat-3.git) registered for path 'tests/fp/berkeley-testfloat-3' Submodule 'ui/keycodemapdb' (https://git.qemu.org/git/keycodemapdb.git) registered for path 'ui/keycodemapdb' Cloning into 'capstone'... Submodule path 'capstone': checked out '22ead3e0bfdb87516656453336160e0a37b066bf' Cloning into 'dtc'... Submodule path 'dtc': checked out '88f18909db731a627456f26d779445f84e449536' Cloning into 'roms/QemuMacDrivers'... Submodule path 'roms/QemuMacDrivers': checked out '90c488d5f4a407342247b9ea869df1c2d9c8e266' Cloning into 'roms/SLOF'... Submodule path 'roms/SLOF': checked out 'ba1ab360eebe6338bb8d7d83a9220ccf7e213af3' Cloning into 'roms/edk2'... Submodule path 'roms/edk2': checked out '20d2e5a125e34fc8501026613a71549b2a1a3e54' Submodule 'SoftFloat' (https://github.com/ucb-bar/berkeley-softfloat-3.git) registered for path 'ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3' Submodule 'CryptoPkg/Library/OpensslLib/openssl' (https://github.com/openssl/openssl) registered for path 'CryptoPkg/Library/OpensslLib/openssl' Cloning into 'ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3'... Submodule path 'roms/edk2/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037' Cloning into 'CryptoPkg/Library/OpensslLib/openssl'... Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl': checked out '50eaac9f3337667259de725451f201e784599687' Submodule 'boringssl' (https://boringssl.googlesource.com/boringssl) registered for path 'boringssl' Submodule 'krb5' (https://github.com/krb5/krb5) registered for path 'krb5' Submodule 'pyca.cryptography' (https://github.com/pyca/cryptography.git) registered for path 'pyca-cryptography' Cloning into 'boringssl'... Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/boringssl': checked out '2070f8ad9151dc8f3a73bffaa146b5e6937a583f' Cloning into 'krb5'... Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/krb5': checked out 'b9ad6c49505c96a088326b62a52568e3484f2168' Cloning into 'pyca-cryptography'... Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/pyca-cryptography': checked out '09403100de2f6f1cdd0d484dcb8e620f1c335c8f' Cloning into 'roms/ipxe'... Submodule path 'roms/ipxe': checked out 'de4565cbe76ea9f7913a01f331be3ee901bb6e17' Cloning into 'roms/openbios'... Submodule path 'roms/openbios': checked out 'c79e0ecb84f4f1ee3f73f521622e264edd1bf174' Cloning into 'roms/openhackware'... Submodule path 'roms/openhackware': checked out 'c559da7c8eec5e45ef1f67978827af6f0b9546f5' Cloning into 'roms/opensbi'... Submodule path 'roms/opensbi': checked out 'ce228ee0919deb9957192d723eecc8aaae2697c6' Cloning into 'roms/qemu-palcode'... Submodule path 'roms/qemu-palcode': checked out 'bf0e13698872450164fa7040da36a95d2d4b326f' Cloning into 'roms/seabios'... Submodule path 'roms/seabios': checked out 'a5cab58e9a3fb6e168aba919c5669bea406573b4' Cloning into 'roms/seabios-hppa'... Submodule path 'roms/seabios-hppa': checked out '0f4fe84658165e96ce35870fd19fc634e182e77b' Cloning into 'roms/sgabios'... Submodule path 'roms/sgabios': checked out 'cbaee52287e5f32373181cff50a00b6c4ac9015a' Cloning into 'roms/skiboot'... Submodule path 'roms/skiboot': checked out '261ca8e779e5138869a45f174caa49be6a274501' Cloning into 'roms/u-boot'... Submodule path 'roms/u-boot': checked out 'd3689267f92c5956e09cc7d1baa4700141662bff' Cloning into 'roms/u-boot-sam460ex'... Submodule path 'roms/u-boot-sam460ex': checked out '60b3916f33e617a815973c5a6df77055b2e3a588' Cloning into 'slirp'... Submodule path 'slirp': checked out 'f0da6726207b740f6101028b2992f918477a4b08' Cloning into 'tests/fp/berkeley-softfloat-3'... Submodule path 'tests/fp/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037' Cloning into 'tests/fp/berkeley-testfloat-3'... Submodule path 'tests/fp/berkeley-testfloat-3': checked out '5a59dcec19327396a011a17fd924aed4fec416b3' Cloning into 'ui/keycodemapdb'... Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce' Switched to a new branch 'test' a0de4e7 s390: do not call memory_region_allocate_system_memory() multiple times 705a271 memory: make MemoryRegion alias migratable b592e60 kvm: s390: split too big memory section on several memslots a1acd7e hw: add compat machines for 4.2 === OUTPUT BEGIN === 1/4 Checking commit a1acd7e26c3b (hw: add compat machines for 4.2) 2/4 Checking commit b592e609ff83 (kvm: s390: split too big memory section on several memslots) WARNING: line over 80 characters #36: FILE: accel/kvm/kvm-all.c:957: + g_assert(ROUND_UP(max_slot_size, qemu_real_host_page_size) == max_slot_size); total: 0 errors, 1 warnings, 148 lines checked Patch 2/4 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 3/4 Checking commit 705a2717d9f8 (memory: make MemoryRegion alias migratable) 4/4 Checking commit a0de4e7c7b91 (s390: do not call memory_region_allocate_system_memory() multiple times) ERROR: suspect code indent for conditional statements (4, 7) #65: FILE: hw/s390x/s390-virtio-ccw.c:169: + if (s390mc->split_ram_layout) { + ram_addr_t chunk, offset = 0; ERROR: suspect code indent for conditional statements (7, 11) #76: FILE: hw/s390x/s390-virtio-ccw.c:180: + while (mem_size) { + MemoryRegion *alias = g_new(MemoryRegion, 1); total: 2 errors, 0 warnings, 97 lines checked Patch 4/4 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20190802093854.5343-1-imammedo@redhat.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
Patchew URL: https://patchew.org/QEMU/20190802093854.5343-1-imammedo@redhat.com/ Hi, This series failed build test on s390x host. Please find the details below. === TEST SCRIPT BEGIN === #!/bin/bash # Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base" # branch set -e echo echo "=== ENV ===" env echo echo "=== PACKAGES ===" rpm -qa echo echo "=== UNAME ===" uname -a CC=$HOME/bin/cc INSTALL=$PWD/install BUILD=$PWD/build mkdir -p $BUILD $INSTALL SRC=$PWD cd $BUILD $SRC/configure --cc=$CC --prefix=$INSTALL make -j4 # XXX: we need reliable clean up # make check -j4 V=1 make install === TEST SCRIPT END === CC s390x-softmmu/target/s390x/kvm.o CC sparc64-softmmu/qapi/qapi-introspect.o /var/tmp/patchew-tester-tmp-rimg5ia0/src/target/s390x/kvm.c: In function ‘kvm_arch_init’: /var/tmp/patchew-tester-tmp-rimg5ia0/src/target/s390x/kvm.c:350:5: error: implicit declaration of function ‘kvm_set_max_memslot_size’; did you mean ‘kvm_get_max_memslots’? [-Werror=implicit-function-declaration] 350 | kvm_set_max_memslot_size(KVM_SLOT_MAX_BYTES); | ^~~~~~~~~~~~~~~~~~~~~~~~ | kvm_get_max_memslots /var/tmp/patchew-tester-tmp-rimg5ia0/src/target/s390x/kvm.c:350:5: error: nested extern declaration of ‘kvm_set_max_memslot_size’ [-Werror=nested-externs] cc1: all warnings being treated as errors make[1]: *** [/var/tmp/patchew-tester-tmp-rimg5ia0/src/rules.mak:69: target/s390x/kvm.o] Error 1 make: *** [Makefile:472: s390x-softmmu/all] Error 2 The full log is available at http://patchew.org/logs/20190802093854.5343-1-imammedo@redhat.com/testing.s390x/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
© 2016 - 2024 Red Hat, Inc.