QEMU maxcpus support
cover QEMU maxcpus support
Hi,
This patch set adds the -maxcpus argument to QEMU and provides the needed patches to the BOCHS patch queue to make the BIOS use it.
Specifying -maxcpus allows the user to cap the limit of possibly cpus of the system, as opposed to -smp which specifies the number of running cpus at startup. This allows us to build BIOS tables accordingly when trying to scale up in size, and it also allows for the BIOS to build smaller tables when not needed.
I am going to submit a set of patches directly for BOCHS as well covering the BIOS part, but I am still waiting for my bochs-developers subscription to be enabled.
Avi asked me to post this both for QEMU and the BIOS part for BOCHS.
Cheers,
Jes
PATCH 1/2 Introduce -maxcpus flag to QEMU and pass the value to the BIOS through FW_CFG.
Follow on patch will use it to determine the size of the MADT and other BIOS tables.
--- hw/fw_cfg.c | 1 + hw/fw_cfg.h | 1 + qemu-options.hx | 9 +++++++++ sysemu.h | 1 + vl.c | 8 ++++++++ 5 files changed, 20 insertions(+)
hw/fw_cfg.c +1 -0
@@ -279,6 +279,7 @@ void *fw_cfg_init(uint32_t ctl_port, uinfw_cfg_add_bytes (s,FW_CFG_UUID , qemu_uuid,16 );fw_cfg_add_i16 (s,FW_CFG_NOGRAPHIC , (uint16_t )(display_type ==DT_NOGRAPHIC ));fw_cfg_add_i16 (s,FW_CFG_NB_CPUS , (uint16_t )smp_cpus); +fw_cfg_add_i16 (s,FW_CFG_MAX_CPUS , (uint16_t )max_cpus);register_savevm ("fw_cfg" ,-1 ,1 , fw_cfg_save, fw_cfg_load, s);qemu_register_reset (fw_cfg_reset,0 , s);
hw/fw_cfg.h +1 -0
@@ -15,6 +15,7 @@#define FW_CFG_INITRD_SIZE 0x0b#define FW_CFG_BOOT_DEVICE 0x0c#define FW_CFG_NUMA 0x0d +#define FW_CFG_MAX_CPUS 0x0e#define FW_CFG_MAX_ENTRY 0x10#define FW_CFG_WRITE_CHANNEL 0x4000
qemu-options.hx +9 -0
@@ -47,6 +47,15 @@ CPUs are supported. On Sparc32 target, L to 4. ETEXI +DEF("maxcpus", HAS_ARG, QEMU_OPTION_maxcpus, + "-maxcpus n set maximum number of possibly CPUs to 'n'\n") +STEXI +@item -maxcpus @var{n} +Set the maximum number of possible CPUs to @var(n). @var(n) has to be +bigger or equal to the value of -smp. If @var(n) is equal to -smp, +there will be no space for hotplug cpus to be added later. +ETEXI + DEF("numa", HAS_ARG, QEMU_OPTION_numa, "-numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node]\n") STEXI
sysemu.h +1 -0
@@ -118,6 +118,7 @@ extern int alt_grab;extern int usb_enabled;extern int no_virtio_balloon;extern int smp_cpus; +extern int max_cpus;extern int cursor_hide;extern int graphic_rotate;extern int no_quit;
vl.c +8 -0
@@ -241,6 +241,7 @@ int rtc_td_hack = 0;int usb_enabled =0 ;int singlestep =0 ;int smp_cpus =1 ; +int max_cpus =16 ;const char *vnc_display;int acpi_enabled =1 ;int no_hpet =0 ;
@@ -5556,6 +5557,13 @@ int main(int argc, char **argv, char **eexit (1 ); }break ; +case QEMU_OPTION_maxcpus: + max_cpus =atoi (optarg); +if ((max_cpus <1 ) || (max_cpus > machine->max_cpus)) { +fprintf (stderr,"Invalid number of CPUs\n" ); +exit (1 ); + } +break ;case QEMU_OPTION_vnc: display_type =DT_VNC ; vnc_display = optarg;
PATCH 2/2 QEMU BOCHS bios patches to use maxcpus value.
In reply to Jes Sorensen--- pc-bios/bios-pq/0017-qemu-kvm-cfg-maxcpus.patch | 57 +++++++++++++ pc-bios/bios-pq/0018-qemu-madt-maxcpus.patch | 105 ++++++++++++++++++++++++ pc-bios/bios-pq/series | 2 3 files changed, 164 insertions(+)
pc-bios/bios-pq/0017-qemu-kvm-cfg-maxcpus.patch new file +57 -0
@@ -0,0 +1,57 @@ +Read max_cpus variable from QEMU_CFG. If not provided, use value of +smp_cpus. + +Signed-off-by: Jes Sorensen <[email protected]> + +diff --git a/bios/rombios32.c b/bios/rombios32.c +index f861f81..f4a6300 100644 +--- a/bios/rombios32.c ++++ b/bios/rombios32.c +@@ -436,6 +436,7 @@ void delay_ms(int n) + } + + uint16_t smp_cpus; ++uint16_t max_cpus; + uint32_t cpuid_signature; + uint32_t cpuid_features; + uint32_t cpuid_ext_features; +@@ -474,6 +475,7 @@ void wrmsr_smp(uint32_t index, uint64_t val) + #define QEMU_CFG_ID 0x01 + #define QEMU_CFG_UUID 0x02 + #define QEMU_CFG_NUMA 0x0D ++#define QEMU_CFG_MAX_CPUS 0x0E + #define QEMU_CFG_ARCH_LOCAL 0x8000 + #define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) + #define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) +@@ -536,6 +538,19 @@ static uint16_t smbios_entries(void) + return cnt; + } + ++static uint16_t get_max_cpus(void) ++{ ++ uint16_t cnt; ++ ++ qemu_cfg_select(QEMU_CFG_MAX_CPUS); ++ qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt)); ++ ++ if (!cnt) ++ cnt = smp_cpus; ++ ++ return cnt; ++} ++ + uint64_t qemu_cfg_get64 (void) + { + uint64_t ret; +@@ -1655,6 +1670,11 @@ void acpi_bios_init(void) + uint16_t i, external_tables; + int nb_numa_nodes; + ++#ifdef BX_QEMU ++ max_cpus = get_max_cpus(); ++#else ++ max_cpus = smp_cpus; ++#endif + /* reserve memory space for tables */ + #ifdef BX_USE_EBDA_TABLES + ebda_cur_addr = align(ebda_cur_addr, 16);
pc-bios/bios-pq/0018-qemu-madt-maxcpus.patch new file +105 -0
105 lines not on this page · raw message
pc-bios/bios-pq/series +2 -0
@@ -14,3 +14,5 @@ 0014_add-srat-acpi-table-support.patch 0015_enable-power-button-even-generation.patch 0016-use-correct-mask-to-size-pci-option-rom-bar.patch +0017-qemu-kvm-cfg-maxcpus.patch +0018-qemu-madt-maxcpus.patch
Quoted 11 lines · Jes Sorensen
Hi,
This patch set adds the -maxcpus argument to QEMU and provides the needed patches to the BOCHS patch queue to make the BIOS use it.
Specifying -maxcpus allows the user to cap the limit of possibly cpus of the system, as opposed to -smp which specifies the number of running cpus at startup. This allows us to build BIOS tables accordingly when trying to scale up in size, and it also allows for the BIOS to build smaller tables when not needed.
Quoted 6 lines
I am going to submit a set of patches directly for BOCHS as well covering the BIOS part, but I am still waiting for my bochs-developers subscription to be enabled.
Avi asked me to post this both for QEMU and the BIOS part for BOCHS.
I should have said this at your previous post, but it only occurred to me now: we could have -smp 4,maxcpus=65536 instead of a new parameter.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 6 lines · Avi Kivity
Quoted 1 line · Jes Sorensen
Avi asked me to post this both for QEMU and the BIOS part for BOCHS.
I should have said this at your previous post, but it only occurred to me now: we could have -smp 4,maxcpus=65536 instead of a new parameter.
We could do that too, but is it really worth it? It seems to me -maxcpus is fine?
Cheers,
Jes
Quoted 7 lines · Jes Sorensen
Quoted 3 lines
I should have said this at your previous post, but it only occurred to me now: we could have -smp 4,maxcpus=65536 instead of a new parameter.
We could do that too, but is it really worth it? It seems to me -maxcpus is fine?
The trend is to consolidate related options into a single option, -to -avoid -command -lines -with -too -many -dashes.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 9 lines · Avi Kivity
Quoted 5 lines · Jes Sorensen
Quoted 2 lines
I should have said this at your previous post, but it only occurred to me now: we could have -smp 4,maxcpus=65536 instead of a new parameter.
We could do that too, but is it really worth it? It seems to me -maxcpus is fine?
The trend is to consolidate related options into a single option, -to -avoid -command -lines -with -too -many -dashes.
Ok, so how about this then?
Jes
Introduce -smp ,maxcpus= flag to specify maximum number of CPUS.
Follow on patch will use it to determine the size of the MADT and other BIOS tables.
--- hw/fw_cfg.c | 1 + hw/fw_cfg.h | 1 + qemu-options.hx | 5 ++++- sysemu.h | 1 + vl.c | 20 +++++++++++++++++++- 5 files changed, 26 insertions(+), 2 deletions(-)
hw/fw_cfg.c +1 -0
@@ -279,6 +279,7 @@ void *fw_cfg_init(uint32_t ctl_port, uinfw_cfg_add_bytes (s,FW_CFG_UUID , qemu_uuid,16 );fw_cfg_add_i16 (s,FW_CFG_NOGRAPHIC , (uint16_t )(display_type ==DT_NOGRAPHIC ));fw_cfg_add_i16 (s,FW_CFG_NB_CPUS , (uint16_t )smp_cpus); +fw_cfg_add_i16 (s,FW_CFG_MAX_CPUS , (uint16_t )max_cpus);register_savevm ("fw_cfg" ,-1 ,1 , fw_cfg_save, fw_cfg_load, s);qemu_register_reset (fw_cfg_reset,0 , s);
hw/fw_cfg.h +1 -0
@@ -15,6 +15,7 @@#define FW_CFG_INITRD_SIZE 0x0b#define FW_CFG_BOOT_DEVICE 0x0c#define FW_CFG_NUMA 0x0d +#define FW_CFG_MAX_CPUS 0x0e#define FW_CFG_MAX_ENTRY 0x10#define FW_CFG_WRITE_CHANNEL 0x4000
qemu-options.hx +4 -1
@@ -39,7 +39,10 @@ Select CPU model (-cpu ? for list and ad ETEXI DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp n set the number of CPUs to 'n' [default=1]\n") + "-smp n,[maxcpus=cpus]\n" + " set the number of CPUs to 'n' [default=1]\n" + " maxcpus= maximum number of total cpus, including\n" + " offline CPUs for hotplug etc.\n") STEXI @item -smp @var{n} Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255
sysemu.h +1 -0
@@ -118,6 +118,7 @@ extern int alt_grab;extern int usb_enabled;extern int no_virtio_balloon;extern int smp_cpus; +extern int max_cpus;extern int cursor_hide;extern int graphic_rotate;extern int no_quit;
vl.c +19 -1
@@ -241,6 +241,7 @@ int rtc_td_hack = 0;int usb_enabled =0 ;int singlestep =0 ;int smp_cpus =1 ; +int max_cpus =16 ;const char *vnc_display;int acpi_enabled =1 ;int no_hpet =0 ;
@@ -5550,12 +5551,29 @@ int main(int argc, char **argv, char **e usb_devices_index++;break ;case QEMU_OPTION_smp: - smp_cpus =atoi (optarg); + { +char *p; +char option[128 ]; + smp_cpus =strtol (optarg, &p,10 );if (smp_cpus <1 ) {fprintf (stderr,"Invalid number of CPUs\n" );exit (1 ); } +if (*p++ !=',' ) +break ; +if (get_param_value (option,128 ,"maxcpus" , p)) + max_cpus =strtol (option,NULL ,0 ); +if (max_cpus < smp_cpus) { +fprintf (stderr,"maxcpus must be equal to or greater than " +"smp\n" ); +exit (1 ); + } +if (max_cpus >255 ) { +fprintf (stderr,"Unsupported number of maxcpus\n" ); +exit (1 ); + }break ; + }case QEMU_OPTION_vnc: display_type =DT_VNC ; vnc_display = optarg;
Quoted 17 lines · Jes Sorensen
Quoted 10 lines · Avi Kivity
Quoted 6 lines · Jes Sorensen
Quoted 2 lines
I should have said this at your previous post, but it only occurred to me now: we could have -smp 4,maxcpus=65536 instead of a new parameter.
We could do that too, but is it really worth it? It seems to me -maxcpus
is fine?The trend is to consolidate related options into a single option, -to -avoid -command -lines -with -too -many -dashes.
Ok, so how about this then?
DEF("smp",
HAS_ARG,QEMU_OPTION_smp,
qemu-options.hx Select CPU model (-cpu ? for list and ad · line 42
Quoted 2 lines
qemu-options.hx +1
-1- "-smp n set the number of CPUs to 'n' [default=1]\n") + "-smp n,[maxcpus=cpus]\n"
-smp n[,maxcpus=cpus]
Quoted 6 lines
vl.c +1
-1@@ -5550,12 +5551,29 @@ int main(int argc, char **argv, char **e usb_devices_index++;break ;case QEMU_OPTION_smp: - smp_cpus =atoi (optarg); + {
vl.c int main(int argc, char **argv, char **e · line 5564
Quoted 10 lines
vl.c +5
-0+char *p; +char option[128 ]; + smp_cpus =strtol (optarg,&p,10 );if (smp_cpus<1 ) {fprintf (stderr,"Invalid number of CPUs\n" );exit (1 ); } +if (*p++ !=',' ) +break ;
Won't this misparse "-smp 17z"?
Quoted 4 lines
vl.c +4
-0+if (get_param_value (option,128 ,"maxcpus" , p)) + max_cpus =strtol (option,NULL ,0 ); +if (max_cpus< smp_cpus) { + fprintf(stderr, "maxcpus must be equal to or greater than "
vl.c int main(int argc, char **argv, char **e
Quoted 10 lines
vl.c +8
-0+ "smp\n"); +exit (1 ); + } +if (max_cpus>255 ) { +fprintf (stderr,"Unsupported number of maxcpus\n" ); +exit (1 ); + }break ; + }
We really need a table-driven parser for options.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 6 lines · Avi Kivity
Quoted 3 lines · Jes Sorensen
DEF("smp",
HAS_ARG,QEMU_OPTION_smp,
- "-smp n set the number of CPUs to 'n' [default=1]\n")
+ "-smp n,[maxcpus=cpus]\n"-smp n[,maxcpus=cpus]
I don't follow you there, please elaborate.
Quoted 4 lines
Quoted 2 lines
+ if (*p++ != ',')
+ break;Won't this misparse "-smp 17z"?
It will be parsed as -smp 17, which is consistent with how the rest of the options are parsed in QEMU. I am not going to rewrite the whole parser for you :)
Cheers,
Jes
Quoted 4 lines · Jes Sorensen
Quoted 3 lines · Avi Kivity
Quoted 1 line · Jes Sorensen
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
DEF("smp",
HAS_ARG,QEMU_OPTION_smp,
- "-smp n set the number of CPUs to 'n' [default=1]\n")
+ "-smp n,[maxcpus=cpus]\n"-smp n[,maxcpus=cpus]
I don't follow you there, please elaborate.
The comma should be inside the brackets, not outside.
Best regards,
Filip Navara