Commit 195784a0 authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

numa: Auto-enable NUMA when any memory devices are possible 



Let's auto-enable it also when maxmem is specified but no slots are
defined. This will result in us properly creating ACPI srat tables,
indicating the maximum possible PFN to the guest OS. Based on this, e.g.,
Linux will enable the swiotlb properly.

This avoids having to manually force the switolb on (swiotlb=force) in
Linux in case we're booting only using DMA memory (e.g., 2GB on x86-64),
and virtio-mem adds memory later on that really needs the swiotlb to be
used for DMA.

Let's take care of backwards compatibility if somebody has a setup that
specifies "maxram" without "slots".

Reported-by: default avatarAlex Shi <alex.shi@linux.alibaba.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Sergio Lopez <slp@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: qemu-arm@nongnu.org <qemu-arm@nongnu.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-22-david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0bc7806c

hw/arm/virt.c

+2 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) 
    hc->unplug = virt_machine_device_unplug_cb;

    mc->nvdimm_supported = true;

    mc->auto_enable_numa_with_memhp = true;

    mc->auto_enable_numa_with_memdev = true;

    mc->default_ram_id = "mach-virt.ram";



    object_class_property_add(oc, "acpi", "OnOffAuto",
@@ -2485,6 +2486,7 @@ static void virt_machine_5_0_options(MachineClass *mc) 
    virt_machine_5_1_options(mc);

    compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);

    mc->numa_mem_supported = true;

    mc->auto_enable_numa_with_memdev = false;

}

DEFINE_VIRT_MACHINE(5, 0)

hw/core/numa.c

+6 −5
Original line number Diff line number Diff line
@@ -688,8 +688,9 @@ void numa_complete_configuration(MachineState *ms) 
    NodeInfo *numa_info = ms->numa_state->nodes;



    /*

     * If memory hotplug is enabled (slots > 0) but without '-numa'

     * options explicitly on CLI, guestes will break.

     * If memory hotplug is enabled (slot > 0) or memory devices are enabled

     * (ms->maxram_size > ram_size) but without '-numa' options explicitly on

     * CLI, guests will break.

     *

     *   Windows: won't enable memory hotplug without SRAT table at all

     *
@@ -704,8 +705,8 @@ void numa_complete_configuration(MachineState *ms) 
     * assume there is just one node with whole RAM.

     */

    if (ms->numa_state->num_nodes == 0 &&

        ((ms->ram_slots > 0 &&

        mc->auto_enable_numa_with_memhp) ||

        ((ms->ram_slots && mc->auto_enable_numa_with_memhp) ||

         (ms->maxram_size > ms->ram_size && mc->auto_enable_numa_with_memdev) ||

         mc->auto_enable_numa)) {

            NumaNodeOptions node = { };

            parse_numa_node(ms, &node, &error_abort);

hw/i386/microvm.c

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static void microvm_class_init(ObjectClass *oc, void *data) 
    mc->max_cpus = 288;

    mc->has_hotpluggable_cpus = false;

    mc->auto_enable_numa_with_memhp = false;

    mc->auto_enable_numa_with_memdev = false;

    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;

    mc->nvdimm_supported = false;

    mc->default_ram_id = "microvm.ram";

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -1975,6 +1975,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;

    mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;

    mc->auto_enable_numa_with_memhp = true;

    mc->auto_enable_numa_with_memdev = true;

    mc->has_hotpluggable_cpus = true;

    mc->default_boot_order = "cad";

    mc->hot_add_cpu = pc_hot_add_cpu;

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) 
    m->numa_mem_supported = true;

    compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);

    compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);

    m->auto_enable_numa_with_memdev = false;

}



DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,