* [PATCH 1/3] microvm: use 2G split unconditionally
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
@ 2020-05-25 13:40 ` Gerd Hoffmann
2020-05-25 13:41 ` [PATCH 2/3] microvm: drop max-ram-below-4g support Gerd Hoffmann
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Gerd Hoffmann @ 2020-05-25 13:40 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, Gerd Hoffmann,
Paolo Bonzini, imammedo, philmd, Richard Henderson
Looks like the logic was copied over from q35.
q35 does this for backward compatibility, there is no reason to do this
on microvm though. So split @ 2G unconditionally.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/microvm.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 937db10ae6a5..44c08f8a5ab0 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -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 = 0x80000000; /* 2G */
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).
--
2.18.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] microvm: drop max-ram-below-4g support
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
2020-05-25 13:40 ` [PATCH 1/3] microvm: use 2G split unconditionally Gerd Hoffmann
@ 2020-05-25 13:41 ` Gerd Hoffmann
2020-05-25 16:44 ` Igor Mammedov
2020-05-25 13:41 ` [PATCH 3/3] x86: move max-ram-below-4g to pc Gerd Hoffmann
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Gerd Hoffmann @ 2020-05-25 13:41 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, Gerd Hoffmann,
Paolo Bonzini, imammedo, philmd, Richard Henderson
Not useful for microvm and allows users to shot themself
into the foot (make ram + mmio overlap).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/i386/microvm.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 44c08f8a5ab0..4b6ec2bbe331 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -173,25 +173,6 @@ static void microvm_memory_init(MicrovmMachineState *mms)
ram_addr_t lowmem = 0x80000000; /* 2G */
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;
--
2.18.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] microvm: drop max-ram-below-4g support
2020-05-25 13:41 ` [PATCH 2/3] microvm: drop max-ram-below-4g support Gerd Hoffmann
@ 2020-05-25 16:44 ` Igor Mammedov
0 siblings, 0 replies; 9+ messages in thread
From: Igor Mammedov @ 2020-05-25 16:44 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, qemu-devel,
Paolo Bonzini, philmd, Richard Henderson
On Mon, 25 May 2020 15:41:00 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:
> Not useful for microvm and allows users to shot themself
s/shot/shoot/
> into the foot (make ram + mmio overlap).
also see my toher reply to previous version, parhaps we can drop some more logic here
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/i386/microvm.c | 19 -------------------
> 1 file changed, 19 deletions(-)
>
> diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
> index 44c08f8a5ab0..4b6ec2bbe331 100644
> --- a/hw/i386/microvm.c
> +++ b/hw/i386/microvm.c
> @@ -173,25 +173,6 @@ static void microvm_memory_init(MicrovmMachineState *mms)
> ram_addr_t lowmem = 0x80000000; /* 2G */
> 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;
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] x86: move max-ram-below-4g to pc
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
2020-05-25 13:40 ` [PATCH 1/3] microvm: use 2G split unconditionally Gerd Hoffmann
2020-05-25 13:41 ` [PATCH 2/3] microvm: drop max-ram-below-4g support Gerd Hoffmann
@ 2020-05-25 13:41 ` Gerd Hoffmann
2020-05-25 13:46 ` Philippe Mathieu-Daudé
2020-05-25 13:56 ` [PATCH 0/3] microvm: memory config tweaks Paolo Bonzini
` (2 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Gerd Hoffmann @ 2020-05-25 13:41 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, Gerd Hoffmann,
Paolo Bonzini, imammedo, philmd, Richard Henderson
Move from X86MachineClass to PCMachineClass so it disappears
from microvm machine type property list.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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 -------------------------------------------
6 files changed, 58 insertions(+), 60 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 8d764f965cd3..e6135c34d656 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -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"
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index b52285481687..b79f24e28545 100644
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -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"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2128f3d6fe8b..80a6cac3b56f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1856,6 +1856,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);
@@ -1865,6 +1904,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;
@@ -1963,6 +2003,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);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index f66e1d73ce0b..503c35f7bf4c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -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);
}
}
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 4ba8ac8774e4..90e8fb2cb737 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -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);
}
}
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 7a3bc7ab6639..49884e5c1597 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -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);
--
2.18.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] x86: move max-ram-below-4g to pc
2020-05-25 13:41 ` [PATCH 3/3] x86: move max-ram-below-4g to pc Gerd Hoffmann
@ 2020-05-25 13:46 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-25 13:46 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, Paolo Bonzini,
imammedo, Richard Henderson
On 5/25/20 3:41 PM, Gerd Hoffmann wrote:
> Move from X86MachineClass to PCMachineClass so it disappears
> from microvm machine type property list.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> 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 -------------------------------------------
> 6 files changed, 58 insertions(+), 60 deletions(-)
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 8d764f965cd3..e6135c34d656 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -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"
> diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
> index b52285481687..b79f24e28545 100644
> --- a/include/hw/i386/x86.h
> +++ b/include/hw/i386/x86.h
> @@ -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"
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 2128f3d6fe8b..80a6cac3b56f 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1856,6 +1856,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);
> @@ -1865,6 +1904,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;
> @@ -1963,6 +2003,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);
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index f66e1d73ce0b..503c35f7bf4c 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -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);
> }
> }
> }
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 4ba8ac8774e4..90e8fb2cb737 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -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);
> }
> }
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 7a3bc7ab6639..49884e5c1597 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -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);
>
Good!
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] microvm: memory config tweaks
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
` (2 preceding siblings ...)
2020-05-25 13:41 ` [PATCH 3/3] x86: move max-ram-below-4g to pc Gerd Hoffmann
@ 2020-05-25 13:56 ` Paolo Bonzini
2020-05-26 1:47 ` no-reply
2020-05-26 1:52 ` no-reply
5 siblings, 0 replies; 9+ messages in thread
From: Paolo Bonzini @ 2020-05-25 13:56 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
Cc: Eduardo Habkost, Sergio Lopez, Michael S. Tsirkin, imammedo,
philmd, Richard Henderson
On 25/05/20 15:40, Gerd Hoffmann wrote:
> With more microvm memory config tweaks split this into its owns series,
> the microvm acpi patch series is already big enough ...
>
> take care,
> Gerd
>
> Gerd Hoffmann (3):
> microvm: use 2G split unconditionally
> microvm: drop max-ram-below-4g support
> x86: move max-ram-below-4g to pc
>
> 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 -------------------------------------------
> 7 files changed, 59 insertions(+), 94 deletions(-)
>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/3] microvm: memory config tweaks
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
` (3 preceding siblings ...)
2020-05-25 13:56 ` [PATCH 0/3] microvm: memory config tweaks Paolo Bonzini
@ 2020-05-26 1:47 ` no-reply
2020-05-26 1:52 ` no-reply
5 siblings, 0 replies; 9+ messages in thread
From: no-reply @ 2020-05-26 1:47 UTC (permalink / raw)
To: kraxel
Cc: ehabkost, slp, mst, qemu-devel, kraxel, imammedo, pbonzini, philmd, rth
Patchew URL: https://patchew.org/QEMU/20200525134101.24740-1-kraxel@redhat.com/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
CC aarch64-softmmu/qapi/qapi-types-machine-target.o
CC aarch64-softmmu/qapi/qapi-types-misc-target.o
/tmp/qemu-test/src/hw/i386/xen/xen-hvm.c: In function 'xen_ram_init':
/tmp/qemu-test/src/hw/i386/xen/xen-hvm.c:206:34: error: 'X86_MACHINE_MAX_RAM_BELOW_4G' undeclared (first use in this function)
X86_MACHINE_MAX_RAM_BELOW_4G,
^
/tmp/qemu-test/src/hw/i386/xen/xen-hvm.c:206:34: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [hw/i386/xen/xen-hvm.o] Error 1
make[1]: *** Waiting for unfinished jobs....
CC aarch64-softmmu/qapi/qapi-types.o
CC aarch64-softmmu/qapi/qapi-visit-machine-target.o
---
CC aarch64-softmmu/qapi/qapi-events-machine-target.o
CC aarch64-softmmu/qapi/qapi-events-misc-target.o
CC aarch64-softmmu/qapi/qapi-events.o
make: *** [x86_64-softmmu/all] Error 2
make: *** Waiting for unfinished jobs....
CC aarch64-softmmu/qapi/qapi-commands-machine-target.o
CC aarch64-softmmu/qapi/qapi-commands-misc-target.o
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=6355d775870e40b7b24b057ce98613cb', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-nzkk4v5m/src/docker-src.2020-05-25-21.44.46.13774:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=6355d775870e40b7b24b057ce98613cb
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-nzkk4v5m/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 3m1.633s
user 0m8.168s
The full log is available at
http://patchew.org/logs/20200525134101.24740-1-kraxel@redhat.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/3] microvm: memory config tweaks
2020-05-25 13:40 [PATCH 0/3] microvm: memory config tweaks Gerd Hoffmann
` (4 preceding siblings ...)
2020-05-26 1:47 ` no-reply
@ 2020-05-26 1:52 ` no-reply
5 siblings, 0 replies; 9+ messages in thread
From: no-reply @ 2020-05-26 1:52 UTC (permalink / raw)
To: kraxel
Cc: ehabkost, slp, mst, qemu-devel, kraxel, imammedo, pbonzini, philmd, rth
Patchew URL: https://patchew.org/QEMU/20200525134101.24740-1-kraxel@redhat.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
CC x86_64-softmmu/target/i386/excp_helper.o
CC x86_64-softmmu/target/i386/fpu_helper.o
CC x86_64-softmmu/target/i386/int_helper.o
/tmp/qemu-test/src/hw/i386/xen/xen-hvm.c:206:34: error: use of undeclared identifier 'X86_MACHINE_MAX_RAM_BELOW_4G'
X86_MACHINE_MAX_RAM_BELOW_4G,
^
1 error generated.
make[1]: *** [/tmp/qemu-test/src/rules.mak:69: hw/i386/xen/xen-hvm.o] Error 1
make[1]: *** Waiting for unfinished jobs....
CC x86_64-softmmu/target/i386/mem_helper.o
make: *** [Makefile:527: x86_64-softmmu/all] Error 2
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
sys.exit(main())
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=a2fe8fb6681b4eafbb6da25a6234866a', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=x86_64-softmmu', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-u67ad0wm/src/docker-src.2020-05-25-21.48.27.23221:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-debug']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=a2fe8fb6681b4eafbb6da25a6234866a
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-u67ad0wm/src'
make: *** [docker-run-test-debug@fedora] Error 2
real 4m14.520s
user 0m8.700s
The full log is available at
http://patchew.org/logs/20200525134101.24740-1-kraxel@redhat.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 9+ messages in thread