numa: forbid '-numa node, mem' for 5.1 and newer machine types
PATCH v4 1/1 numa: forbid '-numa node, mem' for 5.1 and newer machine types
Deprecation period is run out and it's a time to flip the switch introduced by cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.
'-numa node,memdev' shall be used instead of disabled option with new machine types.
---
v1:
- rebased on top of current master
- move compat mode from 4.2 to 5.0
v2:
- move deprection text to recently removed section
v3:
- increase title line length for (deprecated.rst)
'``-numa node,mem=``\ *size* (removed in 5.1)'
v4:
- use error_append_hint() for suggesting valid CLI
--- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-)
docs/system/deprecated.rst +20 -17
@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''
@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as an replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still +work with old machine types. User can check QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property.
hw/arm/virt.c +1 -1
@@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id ="mach-virt.ram" ;
@@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {virt_machine_5_1_options (mc); + mc->numa_mem_supported = true; }DEFINE_VIRT_MACHINE (5 ,0 )
hw/core/numa.c +7 -0
@@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, }if (node->has_mem) { +if (!mc->numa_mem_supported) { +error_setg (errp,"Parameter -numa node,mem is not supported by this" +" machine type" ); +error_append_hint (errp,"Use -numa node,memdev instead" ); +return ; + } + numa_info[nodenr].node_mem = node->mem;if (!qtest_enabled ()) { warn_report("Parameter -numa node,mem is deprecated,"
hw/i386/pc.c +0 -1
@@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
hw/i386/pc_piix.c +1 -0
@@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)pc_i440fx_5_1_machine_options (m); m->alias =NULL ; m->is_default = false; + 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); }
hw/i386/pc_q35.c +1 -0
@@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) {pc_q35_5_1_machine_options (m); m->alias =NULL ; + 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); }
hw/ppc/spapr.c +1 -1
@@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)* in which LMBs are represented and hot-added */ mc->numa_mem_align_shift =28 ; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ;
@@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) {spapr_machine_5_1_class_options (mc);compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false);
qemu-options.hx +5 -4
@@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If - '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have to
Signature · 1 line
2.26.2
Re: [PATCH v4] numa: forbid '-numa node,mem' for 5.1 and newer machine types
Quoted 9 lines · Igor Mammedov
Deprecation period is run out and it's a time to flip the switch introduced by
cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.'-numa node,memdev' shall be used instead of disabled option with new machine types.
Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Michal Privoznik <[email protected]>
numa things so I'm guessing Eduardo's tree?
Quoted 203 lines
---
v1:
- rebased on top of current master
- move compat mode from 4.2 to 5.0
v2:
- move deprection text to recently removed section
v3:
- increase title line length for (deprecated.rst)'``-numa node,mem=``\ *size* (removed in 5.1)'v4:
- useerror_append_hint()for suggesting valid CLI--- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-)docs/system/deprecated.rst +20
-17@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as an replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still +work with old machine types. User can check QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property.hw/arm/virt.c +1
-1@@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id ="mach-virt.ram" ;@@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {virt_machine_5_1_options (mc); + mc->numa_mem_supported = true; }DEFINE_VIRT_MACHINE (5 ,0 )hw/core/numa.c +7
-0@@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, }if (node->has_mem) { +if (!mc->numa_mem_supported) { +error_setg (errp,"Parameter -numa node,mem is not supported by this" +" machine type" ); +error_append_hint (errp,"Use -numa node,memdev instead" ); +return ; + } + numa_info[nodenr].node_mem = node->mem;if (!qtest_enabled ()) { warn_report("Parameter -numa node,mem is deprecated,"hw/i386/pc.c +0
-1@@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",hw/i386/pc_piix.c +1
-0@@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)pc_i440fx_5_1_machine_options (m); m->alias =NULL ; m->is_default = false; + 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); }hw/i386/pc_q35.c +1
-0@@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) {pc_q35_5_1_machine_options (m); m->alias =NULL ; + 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); }hw/ppc/spapr.c +1
-1@@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)* in which LMBs are represented and hot-added */ mc->numa_mem_align_shift =28 ; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ;@@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) {spapr_machine_5_1_class_options (mc);compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false);qemu-options.hx +5
-4@@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If - '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have toSignature · 1 line
2.26.2
Re: [PATCH v4] numa: forbid '-numa node,mem' for 5.1 and newer machine types
Quoted 5 lines · On Mon, 8 Jun 2020 08:55:08 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 4 lines · Igor Mammedov
Deprecation period is run out and it's a time to flip the switch introduced by
cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.
Quoted 8 lines
Quoted 5 lines
'-numa node,memdev' shall be used instead of disabled option with new machine types.
Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Michal Privoznik <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>
Thanks!
Quoted 1 line
numa things so I'm guessing Eduardo's tree?
yep, it's pure NUMA so it should go via Eduardo's tere.
Quoted 204 lines
Quoted 203 lines
---
v1:
- rebased on top of current master
- move compat mode from 4.2 to 5.0
v2:
- move deprection text to recently removed section
v3:
- increase title line length for (deprecated.rst)'``-numa node,mem=``\ *size* (removed in 5.1)'v4:
- useerror_append_hint()for suggesting valid CLI--- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-)docs/system/deprecated.rst +20
-17@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as an replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still +work with old machine types. User can check QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property.hw/arm/virt.c +1
-1@@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id ="mach-virt.ram" ;@@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {virt_machine_5_1_options (mc); + mc->numa_mem_supported = true; }DEFINE_VIRT_MACHINE (5 ,0 )hw/core/numa.c +7
-0@@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, }if (node->has_mem) { +if (!mc->numa_mem_supported) { +error_setg (errp,"Parameter -numa node,mem is not supported by this" +" machine type" ); +error_append_hint (errp,"Use -numa node,memdev instead" ); +return ; + } + numa_info[nodenr].node_mem = node->mem;if (!qtest_enabled ()) { warn_report("Parameter -numa node,mem is deprecated,"hw/i386/pc.c +0
-1@@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",hw/i386/pc_piix.c +1
-0@@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)pc_i440fx_5_1_machine_options (m); m->alias =NULL ; m->is_default = false; + 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); }hw/i386/pc_q35.c +1
-0@@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) {pc_q35_5_1_machine_options (m); m->alias =NULL ; + 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); }hw/ppc/spapr.c +1
-1@@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)* in which LMBs are represented and hot-added */ mc->numa_mem_align_shift =28 ; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ;@@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) {spapr_machine_5_1_class_options (mc);compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false);qemu-options.hx +5
-4@@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If - '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have toSignature · 1 line
2.26.2
Re: [PATCH v4] numa: forbid '-numa node,mem' for 5.1 and newer machine types
In reply to Igor MammedovQuoted 121 lines · On Mon, 8 Jun 2020 08:03:44 -0400 Igor Mammedov <[email protected]> wrote:
Deprecation period is run out and it's a time to flip the switch introduced by
cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.'-numa node,memdev' shall be used instead of disabled option with new machine types.
Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Michal Privoznik <[email protected]>---
v1:
- rebased on top of current master
- move compat mode from 4.2 to 5.0
v2:
- move deprection text to recently removed section
v3:
- increase title line length for (deprecated.rst)'``-numa node,mem=``\ *size* (removed in 5.1)'v4:
- useerror_append_hint()for suggesting valid CLI--- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-)docs/system/deprecated.rst +20
-17@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as an replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still +work with old machine types. User can check QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property.hw/arm/virt.c +1
-1@@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id ="mach-virt.ram" ;@@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {virt_machine_5_1_options (mc); + mc->numa_mem_supported = true; }DEFINE_VIRT_MACHINE (5 ,0 )hw/core/numa.c +0
-0
hw/core/numa.c static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, · line 123
Quoted 7 lines
hw/core/numa.c +4
-0@@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, }if (node->has_mem) { +if (!mc->numa_mem_supported) { +error_setg (errp,"Parameter -numa node,mem is not supported by this" +" machine type" ); +error_append_hint (errp,"Use -numa node,memdev instead" );
This lacks a terminating \n.
With that fixed, feel free to add:
Quoted 82 lines
hw/core/numa.c +3
-0+return ; + } + numa_info[nodenr].node_mem = node->mem;if (!qtest_enabled ()) { warn_report("Parameter -numa node,mem is deprecated,"hw/i386/pc.c +0
-1@@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",hw/i386/pc_piix.c +1
-0@@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)pc_i440fx_5_1_machine_options (m); m->alias =NULL ; m->is_default = false; + 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); }hw/i386/pc_q35.c +1
-0@@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) {pc_q35_5_1_machine_options (m); m->alias =NULL ; + 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); }hw/ppc/spapr.c +1
-1@@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)* in which LMBs are represented and hot-added */ mc->numa_mem_align_shift =28 ; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ;@@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) {spapr_machine_5_1_class_options (mc);compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false);qemu-options.hx +5
-4@@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If - '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have to
Re: [PATCH v4] numa: forbid '-numa node,mem' for 5.1 and newer machine types
In reply to Igor MammedovQuoted 13 lines · Igor Mammedov
Deprecation period is run out and it's a time to flip the switch introduced by
cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.'-numa node,memdev' shall be used instead of disabled option with new machine types.
Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Michal Privoznik <[email protected]>---
+++
b/docs/system/deprecated.rst
docs/system/deprecated.rst error in the future. · line 107
Quoted 7 lines
docs/system/deprecated.rst +0
-4@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of
Present tense in the old text made sense because the old way still worked...
Quoted 18 lines
docs/system/deprecated.rst +0
-13-guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as::
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 509
Quoted 10 lines
docs/system/deprecated.rst +8
-0qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of
...but in the new text, if we completely got rid of 'mem', then past tense is preferred to describe what used to work. s/is/was/
Other pre-existing typo and grammar problems worth fixing now:
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 510
Quoted 1 line
docs/system/deprecated.rst +1
-0+guest RAM to a NUMA node. But when using it, it's impossible to manage specified
s/manage/manage a/
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 512
Quoted 2 lines
docs/system/deprecated.rst +2
-0+RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance.
s/so guest end-ups/so the guest ends up/
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 515
Quoted 3 lines
docs/system/deprecated.rst +3
-0+However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev``
s/actualy/actually/
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 516
Quoted 1 line
docs/system/deprecated.rst +1
-0+with *memory-backend-ram* backend as an replacement for parameter ``mem``
s/an/a/
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 519
Quoted 3 lines
docs/system/deprecated.rst +3
-0+to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still
If this sentence is still true:
s/In future new/New/
If the sentence is false (that is, we completely dropped 'mem' even for old machine versions), drop it.
docs/system/deprecated.rst long starting at 1MiB, the old command:: · line 520
Quoted 1 line
docs/system/deprecated.rst +1
-0+work with old machine types. User can check QAPI schema to see if the legacy
s/check/check the/
Quoted 1 line
docs/system/deprecated.rst +1
-0+option is supported by looking at MachineInfo::numa-mem-supported property.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v4] numa: forbid '-numa node,mem' for 5.1 and newer machine types
In reply to Igor MammedovQuoted 201 lines · Igor Mammedov
Deprecation period is run out and it's a time to flip the switch introduced by
cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation.'-numa node,memdev' shall be used instead of disabled option with new machine types.
Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Michal Privoznik <[email protected]>---
v1:
- rebased on top of current master
- move compat mode from 4.2 to 5.0
v2:
- move deprection text to recently removed section
v3:
- increase title line length for (deprecated.rst)'``-numa node,mem=``\ *size* (removed in 5.1)'v4:
- useerror_append_hint()for suggesting valid CLI--- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-)docs/system/deprecated.rst +20
-17@@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''@@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` is used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so guest end-ups with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actualy manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as an replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +In future new machine versions will not accept the option but it will still +work with old machine types. User can check QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property.hw/arm/virt.c +1
-1@@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id ="mach-virt.ram" ;@@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)static void virt_machine_5_0_options (MachineClass *mc) {virt_machine_5_1_options (mc); + mc->numa_mem_supported = true; }DEFINE_VIRT_MACHINE (5 ,0 )hw/core/numa.c +7
-0@@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, }if (node->has_mem) { +if (!mc->numa_mem_supported) { +error_setg (errp,"Parameter -numa node,mem is not supported by this" +" machine type" ); +error_append_hint (errp,"Use -numa node,memdev instead" ); +return ; + } + numa_info[nodenr].node_mem = node->mem;if (!qtest_enabled ()) { warn_report("Parameter -numa node,mem is deprecated,"hw/i386/pc.c +0
-1@@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id ="pc.ram" ; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",hw/i386/pc_piix.c +1
-0@@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m)pc_i440fx_5_1_machine_options (m); m->alias =NULL ; m->is_default = false; + 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); }hw/i386/pc_q35.c +1
-0@@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) {pc_q35_5_1_machine_options (m); m->alias =NULL ; + 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); }hw/ppc/spapr.c +1
-1@@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)* in which LMBs are represented and hot-added */ mc->numa_mem_align_shift =28 ; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM ] =SPAPR_CAP_OFF ;@@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) {spapr_machine_5_1_class_options (mc);compat_props_add (mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false);qemu-options.hx +0
-2@@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If
qemu-options.hx SRST · line 249
Quoted 10 lines
qemu-options.hx +5
-2- '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have to
No, this one.
Paolo