microvm: memory config tweaks
PATCH v3 3/4 x86: move max-ram-below-4g to pc
In reply to Gerd HoffmannMove from X86MachineClass to PCMachineClass so it disappears from microvm machine type property list.
--- include/hw/i386/pc.h | 2 ++ include/hw/i386/x86.h | 4 ---- hw/i386/pc.c | 46 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 10 +++++----- hw/i386/pc_q35.c | 10 +++++----- hw/i386/x86.c | 46 ------------------------------------------- hw/i386/xen/xen-hvm.c | 2 +- 7 files changed, 59 insertions(+), 61 deletions(-)
include/hw/i386/pc.h +2 -0
@@ -35,6 +35,7 @@ struct PCMachineState {PFlashCFI01 *flash[2 ];/* Configuration options: */ +uint64_t max_ram_below_4g;OnOffAuto vmport;bool acpi_build_enabled;
@@ -51,6 +52,7 @@ struct PCMachineState { };#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" +#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"#define PC_MACHINE_DEVMEM_REGION_SIZE "device-memory-region-size"#define PC_MACHINE_VMPORT "vmport"#define PC_MACHINE_SMBUS "smbus"
include/hw/i386/x86.h +0 -4
@@ -51,9 +51,6 @@ typedef struct {qemu_irq *gsi;GMappedFile *initrd_mapped_file; -/* Configuration options: */ -uint64_t max_ram_below_4g; -/* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size;
@@ -82,7 +79,6 @@ typedef struct {AddressSpace *ioapic_as; } X86MachineState; -#define X86_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"#define X86_MACHINE_SMM "smm"#define X86_MACHINE_ACPI "acpi"
hw/i386/pc.c +46 -0
64 lines not on this page · raw message
hw/i386/pc_piix.c +5 -5
@@ -127,11 +127,11 @@ static void pc_init1(MachineState *machine,if (xen_enabled ()) {xen_hvm_init (pcms, &ram_memory); }else { -if (!x86ms->max_ram_below_4g) { - x86ms->max_ram_below_4g =0xe0000000 ;/* default: 3.5G */ +if (!pcms->max_ram_below_4g) { + pcms->max_ram_below_4g =0xe0000000 ;/* default: 3.5G */ } - lowmem = x86ms->max_ram_below_4g; -if (machine->ram_size >= x86ms->max_ram_below_4g) { + lowmem = pcms->max_ram_below_4g; +if (machine->ram_size >= pcms->max_ram_below_4g) {if (pcmc->gigabyte_align) {if (lowmem >0xc0000000 ) { lowmem =0xc0000000 ;
@@ -140,7 +140,7 @@ static void pc_init1(MachineState *machine,warn_report ("Large machine and max_ram_below_4g " "(%" PRIu64") not a multiple of 1G; " "possible bad performance." , - x86ms->max_ram_below_4g); + pcms->max_ram_below_4g); } } }
hw/i386/pc_q35.c +5 -5
@@ -154,18 +154,18 @@ static void pc_q35_init(MachineState *machine)/* Handle the machine opt max-ram-below-4g. It is basically doing * min(qemu limit, user limit). */ -if (!x86ms->max_ram_below_4g) { - x86ms->max_ram_below_4g =4 * GiB; +if (!pcms->max_ram_below_4g) { + pcms->max_ram_below_4g =4 * GiB; } -if (lowmem > x86ms->max_ram_below_4g) { - lowmem = x86ms->max_ram_below_4g; +if (lowmem > pcms->max_ram_below_4g) { + lowmem = pcms->max_ram_below_4g;if (machine->ram_size - lowmem > lowmem && lowmem & (1 * GiB -1 )) {warn_report ("There is possibly poor performance as the ram size " " (0x%" PRIx64") is more then twice the size of" " max-ram-below-4g (%" PRIu64") and" " max-ram-below-4g is not a multiple of 1G." , - (uint64_t )machine->ram_size, x86ms->max_ram_below_4g); + (uint64_t )machine->ram_size, pcms->max_ram_below_4g); } }
hw/i386/x86.c +0 -46
64 lines not on this page · raw message
hw/i386/xen/xen-hvm.c +1 -1
@@ -203,7 +203,7 @@ static void xen_ram_init(PCMachineState *pcms,ram_addr_t block_len;uint64_t user_lowmem =object_property_get_uint (qdev_get_machine (), -X86_MACHINE_MAX_RAM_BELOW_4G , +PC_MACHINE_MAX_RAM_BELOW_4G , &error_abort);/* Handle the machine opt max-ram-below-4g. It is basically doing
Signature · 1 line
2.18.4
PATCH v3 4/4 microvm: move virtio base to 0xfeb00000
In reply to Gerd HoffmannPlace virtio-mmio devices near the other mmio regions, next ioapic is at @ 0xfec00000.
--- include/hw/i386/microvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/i386/microvm.h +1 -1
@@ -26,7 +26,7 @@#include "hw/i386/x86.h" /* Platform virtio definitions */ -#define VIRTIO_MMIO_BASE 0xc0000000 +#define VIRTIO_MMIO_BASE 0xfeb00000#define VIRTIO_IRQ_BASE 5#define VIRTIO_NUM_TRANSPORTS 8#define VIRTIO_CMDLINE_MAXLEN 64
Signature · 1 line
2.18.4
PATCH v3 1/4 microvm: use 3G split unconditionally
In reply to Gerd HoffmannLooks like the logic was copied over from q35.
q35 does this for backward compatibility, there is no reason to do this on microvm though. Also microvm doesn't need much mmio space, 1G is more than enough. Using an mmio window smaller than 1G is bad for gigabyte alignment and hugepages though. So split @ 3G unconditionally.
--- hw/i386/microvm.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
hw/i386/microvm.c +1 -15
@@ -170,23 +170,9 @@ static void microvm_memory_init(MicrovmMachineState *mms)MemoryRegion *ram_below_4g, *ram_above_4g;MemoryRegion *system_memory =get_system_memory ();FWCfgState *fw_cfg; -ram_addr_t lowmem; +ram_addr_t lowmem =0xc0000000 ;/* 3G */ int i; -/* -* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory -* and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping -* also known as MMCFG). -* If it doesn't, we need to split it in chunks below and above 4G. -* In any case, try to make sure that guest addresses aligned at -* 1G boundaries get mapped to host addresses aligned at 1G boundaries. -*/ -if (machine->ram_size >=0xb0000000 ) { - lowmem =0x80000000 ; - }else { - lowmem =0xb0000000 ; - } -/* * Handle the machine opt max-ram-below-4g. It is basically doing * min(qemu limit, user limit).
Signature · 1 line
2.18.4
PATCH v3 2/4 microvm: drop max-ram-below-4g support
In reply to Gerd HoffmannNot useful for microvm and allows users to shoot themself into the foot (make ram + mmio overlap).
--- hw/i386/microvm.c | 19 ------------------- 1 file changed, 19 deletions(-)
hw/i386/microvm.c +0 -19
@@ -173,25 +173,6 @@ static void microvm_memory_init(MicrovmMachineState *mms)ram_addr_t lowmem =0xc0000000 ;/* 3G */ int i; -/* -* Handle the machine opt max-ram-below-4g. It is basically doing -* min(qemu limit, user limit). -*/ -if (!x86ms->max_ram_below_4g) { - x86ms->max_ram_below_4g =4 * GiB; - } -if (lowmem > x86ms->max_ram_below_4g) { - lowmem = x86ms->max_ram_below_4g; -if (machine->ram_size - lowmem > lowmem && - lowmem & (1 * GiB -1 )) { -warn_report ("There is possibly poor performance as the ram size " -" (0x%" PRIx64") is more then twice the size of" -" max-ram-below-4g (%" PRIu64") and" -" max-ram-below-4g is not a multiple of 1G." , - (uint64_t )machine->ram_size, x86ms->max_ram_below_4g); - } - } -if (machine->ram_size > lowmem) { x86ms->above_4g_mem_size = machine->ram_size - lowmem; x86ms->below_4g_mem_size = lowmem;
Signature · 1 line
2.18.4
v3 cover microvm: memory config tweaks
With more microvm memory config tweaks split this into its owns series, the microvm acpi patch series is already big enough ...
v2:
- use 3G split.
- add patch to move virtio-mmio region.
- pick up acks & reviews.
v3:
- fix xen build.
- pick up acks & reviews.
take care,
Gerd
Gerd Hoffmann (4):
microvm: use 3G split unconditionally
microvm: drop max-ram-below-4g support
x86: move max-ram-below-4g to pc
microvm: move virtio base to 0xfeb00000
include/hw/i386/microvm.h | 2 +- include/hw/i386/pc.h | 2 ++ include/hw/i386/x86.h | 4 ---- hw/i386/microvm.c | 35 +---------------------------- hw/i386/pc.c | 46 +++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 10 ++++----- hw/i386/pc_q35.c | 10 ++++----- hw/i386/x86.c | 46 --------------------------------------- hw/i386/xen/xen-hvm.c | 2 +- 9 files changed, 61 insertions(+), 96 deletions(-)
Signature · 1 line
2.18.4
RE: [PATCH v3 3/4] x86: move max-ram-below-4g to pc
In reply to Gerd HoffmannQuoted 11 lines
-----Original Message-----
From: Gerd Hoffmann <[email protected]>
Sent: 29 May 2020 08:40
To: [email protected]
Cc: Paolo Bonzini <[email protected]>; Eduardo Habkost <[email protected]>; Sergio Lopez <[email protected]>; [email protected]; Marcel Apfelbaum <[email protected]>; Stefano Stabellini <[email protected]>; Paul Durrant <[email protected]>; [email protected]; Michael S. Tsirkin <[email protected]>; Anthony Perard <[email protected]>; Richard Henderson <[email protected]>; [email protected]; Gerd Hoffmann <[email protected]>
Subject: [PATCH v3 3/4] x86: move max-ram-below-4g to pc
Quoted 6 lines
Move from X86MachineClass to PCMachineClass so it disappears from microvm machine type property list.
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Acked-by Paolo Bonzini <[email protected]>
Xen change...
Quoted 266 lines
--- include/hw/i386/pc.h | 2 ++ include/hw/i386/x86.h | 4 ---- hw/i386/pc.c | 46 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 10 +++++----- hw/i386/pc_q35.c | 10 +++++----- hw/i386/x86.c | 46 ------------------------------------------- hw/i386/xen/xen-hvm.c | 2 +- 7 files changed, 59 insertions(+), 61 deletions(-)include/hw/i386/pc.h +2
-0@@ -35,6 +35,7 @@ struct PCMachineState {PFlashCFI01 *flash[2 ];/* Configuration options: */ +uint64_t max_ram_below_4g;OnOffAuto vmport;bool acpi_build_enabled;@@ -51,6 +52,7 @@ struct PCMachineState { };#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" +#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"#define PC_MACHINE_DEVMEM_REGION_SIZE "device-memory-region-size"#define PC_MACHINE_VMPORT "vmport"#define PC_MACHINE_SMBUS "smbus"include/hw/i386/x86.h +0
-4@@ -51,9 +51,6 @@ typedef struct {qemu_irq *gsi;GMappedFile *initrd_mapped_file; -/* Configuration options: */ -uint64_t max_ram_below_4g; -/* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size;@@ -82,7 +79,6 @@ typedef struct {AddressSpace *ioapic_as; } X86MachineState; -#define X86_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"#define X86_MACHINE_SMM "smm"#define X86_MACHINE_ACPI "acpi"hw/i386/pc.c +46
-0@@ -1831,6 +1831,45 @@ static void pc_machine_set_pit(Object *obj, bool value, Error **errp) pcms->pit_enabled = value; } +static void pc_machine_get_max_ram_below_4g (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); +uint64_t value = pcms->max_ram_below_4g; + +visit_type_size (v, name, &value, errp); +} + +static void pc_machine_set_max_ram_below_4g (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +PCMachineState *pcms =PC_MACHINE (obj); +Error *error =NULL ; +uint64_t value; + +visit_type_size (v, name, &value, &error); +if (error) { +error_propagate (errp, error); +return ; + } +if (value >4 * GiB) { +error_setg (&error, +"Machine option 'max-ram-below-4g=%" PRIu64 +"' expects size less than or equal to 4G" , value); +error_propagate (errp, error); +return ; + } + +if (value <1 * MiB) { +warn_report ("Only %" PRIu64" bytes of RAM below the 4GiB boundary," +"BIOS may not work with less than 1MiB" , value); + } + + pcms->max_ram_below_4g = value; +} +static void pc_machine_initfn (Object *obj) {PCMachineState *pcms =PC_MACHINE (obj);@@ -1840,6 +1879,7 @@ static void pc_machine_initfn(Object *obj)#else pcms->vmport =ON_OFF_AUTO_OFF ;#endif /* CONFIG_VMPORT */ + pcms->max_ram_below_4g =0 ;/* use default */ /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled =PC_MACHINE_GET_CLASS (pcms)->has_acpi_build; pcms->smbus_enabled = true;@@ -1938,6 +1978,12 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; +object_class_property_add (oc,PC_MACHINE_MAX_RAM_BELOW_4G ,"size" , + pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g, +NULL ,NULL ); +object_class_property_set_description (oc,PC_MACHINE_MAX_RAM_BELOW_4G , +"Maximum ram below the 4G boundary (32bit boundary)" ); +object_class_property_add (oc,PC_MACHINE_DEVMEM_REGION_SIZE ,"int" , pc_machine_get_device_memory_region_size,NULL ,NULL ,NULL );hw/i386/pc_piix.c +5
-5@@ -127,11 +127,11 @@ static void pc_init1(MachineState *machine,if (xen_enabled ()) {xen_hvm_init (pcms, &ram_memory); }else { -if (!x86ms->max_ram_below_4g) { - x86ms->max_ram_below_4g =0xe0000000 ;/* default: 3.5G */ +if (!pcms->max_ram_below_4g) { + pcms->max_ram_below_4g =0xe0000000 ;/* default: 3.5G */ } - lowmem = x86ms->max_ram_below_4g; -if (machine->ram_size >= x86ms->max_ram_below_4g) { + lowmem = pcms->max_ram_below_4g; +if (machine->ram_size >= pcms->max_ram_below_4g) {if (pcmc->gigabyte_align) {if (lowmem >0xc0000000 ) { lowmem =0xc0000000 ;@@ -140,7 +140,7 @@ static void pc_init1(MachineState *machine,warn_report ("Large machine and max_ram_below_4g " "(%" PRIu64") not a multiple of 1G; " "possible bad performance." , - x86ms->max_ram_below_4g); + pcms->max_ram_below_4g); } } }hw/i386/pc_q35.c +5
-5@@ -154,18 +154,18 @@ static void pc_q35_init(MachineState *machine)/* Handle the machine opt max-ram-below-4g. It is basically doing * min(qemu limit, user limit). */ -if (!x86ms->max_ram_below_4g) { - x86ms->max_ram_below_4g =4 * GiB; +if (!pcms->max_ram_below_4g) { + pcms->max_ram_below_4g =4 * GiB; } -if (lowmem > x86ms->max_ram_below_4g) { - lowmem = x86ms->max_ram_below_4g; +if (lowmem > pcms->max_ram_below_4g) { + lowmem = pcms->max_ram_below_4g;if (machine->ram_size - lowmem > lowmem && lowmem & (1 * GiB -1 )) {warn_report ("There is possibly poor performance as the ram size " " (0x%" PRIx64") is more then twice the size of" " max-ram-below-4g (%" PRIu64") and" " max-ram-below-4g is not a multiple of 1G." , - (uint64_t )machine->ram_size, x86ms->max_ram_below_4g); + (uint64_t )machine->ram_size, pcms->max_ram_below_4g); } }hw/i386/x86.c +0
-46@@ -846,45 +846,6 @@ void x86_bios_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) bios); } -static void x86_machine_get_max_ram_below_4g (Object *obj,Visitor *v, -const char *name,void *opaque, -Error **errp) -{ -X86MachineState *x86ms =X86_MACHINE (obj); -uint64_t value = x86ms->max_ram_below_4g; - -visit_type_size (v, name, &value, errp); -} - -static void x86_machine_set_max_ram_below_4g (Object *obj,Visitor *v, -const char *name,void *opaque, -Error **errp) -{ -X86MachineState *x86ms =X86_MACHINE (obj); -Error *error =NULL ; -uint64_t value; - -visit_type_size (v, name, &value, &error); -if (error) { -error_propagate (errp, error); -return ; - } -if (value >4 * GiB) { -error_setg (&error, -"Machine option 'max-ram-below-4g=%" PRIu64 -"' expects size less than or equal to 4G" , value); -error_propagate (errp, error); -return ; - } - -if (value <1 * MiB) { -warn_report ("Only %" PRIu64" bytes of RAM below the 4GiB boundary," -"BIOS may not work with less than 1MiB" , value); - } - - x86ms->max_ram_below_4g = value; -} -bool x86_machine_is_smm_enabled (X86MachineState *x86ms) {bool smm_available = false;@@ -958,7 +919,6 @@ static void x86_machine_initfn(Object *obj) x86ms->smm =ON_OFF_AUTO_AUTO ; x86ms->acpi =ON_OFF_AUTO_AUTO ; - x86ms->max_ram_below_4g =0 ;/* use default */ x86ms->smp_dies =1 ; x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx;@@ -980,12 +940,6 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) x86mc->save_tsc_khz = true; nc->nmi_monitor_handler = x86_nmi; -object_class_property_add (oc,X86_MACHINE_MAX_RAM_BELOW_4G ,"size" , - x86_machine_get_max_ram_below_4g, x86_machine_set_max_ram_below_4g, -NULL ,NULL ); -object_class_property_set_description (oc,X86_MACHINE_MAX_RAM_BELOW_4G , -"Maximum ram below the 4G boundary (32bit boundary)" ); -object_class_property_add (oc,X86_MACHINE_SMM ,"OnOffAuto" , x86_machine_get_smm, x86_machine_set_smm,NULL ,NULL );hw/i386/xen/xen-hvm.c +1
-2@@ -203,7 +203,7 @@ static void xen_ram_init(PCMachineState *pcms,ram_addr_t block_len;uint64_t user_lowmem =object_property_get_uint (qdev_get_machine (), -X86_MACHINE_MAX_RAM_BELOW_4G , +PC_MACHINE_MAX_RAM_BELOW_4G , &error_abort);/* Handle the machine opt max-ram-below-4g. It is basically doing -- 2.18.4
Quoted 2 lines · Gerd Hoffmann
With more microvm memory config tweaks split this into its owns series, the microvm acpi patch series is already big enough ...
Okay.
We might want to add pci to microvm and maybe we'll need more space then, but let's leave this for another day.
Quoted 30 lines
v2:
- use 3G split.
- add patch to move virtio-mmio region.
- pick up acks & reviews.
v3:
- fix xen build.
- pick up acks & reviews.take care,
GerdGerd Hoffmann (4):
microvm: use 3G split unconditionally
microvm: drop max-ram-below-4g support
x86: move max-ram-below-4g to pc
microvm: move virtio base to0xfeb00000include/hw/i386/microvm.h | 2 +- include/hw/i386/pc.h | 2 ++ include/hw/i386/x86.h | 4 ---- hw/i386/microvm.c | 35 +---------------------------- hw/i386/pc.c | 46 +++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 10 ++++----- hw/i386/pc_q35.c | 10 ++++----- hw/i386/x86.c | 46 --------------------------------------- hw/i386/xen/xen-hvm.c | 2 +- 9 files changed, 61 insertions(+), 96 deletions(-)Signature · 1 line
2.18.4
Quoted 11 lines · Gerd Hoffmann
With more microvm memory config tweaks split this into its owns series, the microvm acpi patch series is already big enough ...
v2:
- use 3G split.
- add patch to move virtio-mmio region.
- pick up acks & reviews.
v3:
- fix xen build.
- pick up acks & reviews.
Quoted 2 lines
take care,
Gerd
Ping. Anyone going to pick this up? MAINTAINERS lists Sergio+Paolo ... Or should I send a pull req myself?
take care,
Gerd
Quoted 2 lines · Gerd Hoffmann
With more microvm memory config tweaks split this into its owns series, the microvm acpi patch series is already big enough ...
Looks sane:
microvm things so should use that tree ...
Quoted 30 lines
v2:
- use 3G split.
- add patch to move virtio-mmio region.
- pick up acks & reviews.
v3:
- fix xen build.
- pick up acks & reviews.take care,
GerdGerd Hoffmann (4):
microvm: use 3G split unconditionally
microvm: drop max-ram-below-4g support
x86: move max-ram-below-4g to pc
microvm: move virtio base to0xfeb00000include/hw/i386/microvm.h | 2 +- include/hw/i386/pc.h | 2 ++ include/hw/i386/x86.h | 4 ---- hw/i386/microvm.c | 35 +---------------------------- hw/i386/pc.c | 46 +++++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 10 ++++----- hw/i386/pc_q35.c | 10 ++++----- hw/i386/x86.c | 46 --------------------------------------- hw/i386/xen/xen-hvm.c | 2 +- 9 files changed, 61 insertions(+), 96 deletions(-)Signature · 1 line
2.18.4
Re: [PATCH v3 4/4] microvm: move virtio base to 0xfeb00000
In reply to Gerd HoffmannQuoted 13 lines · Gerd Hoffmann
Place virtio-mmio devices near the other mmio regions, next ioapic is at @
0xfec00000.Signed-off-by Gerd Hoffmann <[email protected]>--- include/hw/i386/microvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/hw/i386/microvm.h +0
-0
include/hw/i386/microvm.h line 32
Quoted 8 lines
include/hw/i386/microvm.h +1
-1@@ -26,7 +26,7 @@#include "hw/i386/x86.h" /* Platform virtio definitions */ -#define VIRTIO_MMIO_BASE 0xc0000000 +#define VIRTIO_MMIO_BASE 0xfeb00000#define VIRTIO_IRQ_BASE 5#define VIRTIO_NUM_TRANSPORTS 8#define VIRTIO_CMDLINE_MAXLEN 64
OK, and let's hope we don't need to move it again.
Quoted 2 lines
Signature · 1 line
2.18.4
Quoted 2 lines · Gerd Hoffmann
Ping. Anyone going to pick this up?
MAINTAINERSlists Sergio+Paolo ... Or should I send a pull req myself?
Hmm, no reply. I guess that means "send a pull req" ...
take care,
Gerd