smp: drop support for deprecated (invalid topologies)
PATCH 1/1 smp: drop support for deprecated (invalid topologies)
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure that topologies described with -smp include all possible cpus, i.e. (sockets * cores * threads) == maxcpus or QEMU will exit with error.
--- docs/system/deprecated.rst | 26 +++++++++++++------------- hw/core/machine.c | 16 ++++------------ hw/i386/pc.c | 16 ++++------------ 3 files changed, 21 insertions(+), 37 deletions(-)
docs/system/deprecated.rst +13 -13
@@ -47,19 +47,6 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. -``-smp`` (invalid topologies) (since 3.1) -''''''''''''''''''''''''''''''''''''''''' - -CPU topology properties should describe whole machine topology including -possible CPUs. - -However, historically it was possible to start QEMU with an incorrect topology -where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, -which could lead to an incorrect topology enumeration by the guest. -Support for invalid topologies will be removed, the user must ensure -topologies described with -smp include all possible cpus, i.e. -*sockets* * *cores* * *threads* = *maxcpus*. - ``-vnc acl`` (since 4.0.0) ''''''''''''''''''''''''''
@@ -618,6 +605,19 @@ New machine versions (since 5.1) will not accept the option but it will still work with old machine types. User can check the QAPI schema to see if the legacy option is supported by looking at MachineInfo::numa-mem-supported property. +``-smp`` (invalid topologies) (removed 5.2) +''''''''''''''''''''''''''''''''''''''''''' + +CPU topology properties should describe whole machine topology including +possible CPUs. + +However, historically it was possible to start QEMU with an incorrect topology +where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies is removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. +*sockets* * *cores* * *threads* = *maxcpus*. + Block devices -------------
hw/core/machine.c +4 -12
@@ -754,23 +754,15 @@ static void smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology: " +"sockets (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;
hw/i386/pc.c +4 -12
@@ -746,23 +746,15 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * dies * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * dies * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology deprecated: " +"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, dies, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * dies * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, dies, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;
Signature · 1 line
2.27.0
Quoted 8 lines · Igor Mammedov
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure that topologies described with -smp include all possible cpus, i.e. (sockets * cores * threads) == maxcpus or QEMU will exit with error.
Signed-off-by Igor Mammedov <[email protected]>
Acked-by:
memory tree I guess?
Quoted 116 lines
--- docs/system/deprecated.rst | 26 +++++++++++++------------- hw/core/machine.c | 16 ++++------------ hw/i386/pc.c | 16 ++++------------ 3 files changed, 21 insertions(+), 37 deletions(-)docs/system/deprecated.rst +13
-13@@ -47,19 +47,6 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. -``-smp`` (invalid topologies) (since 3.1) -''''''''''''''''''''''''''''''''''''''''' - -CPU topology properties should describe whole machine topology including -possible CPUs. - -However, historically it was possible to start QEMU with an incorrect topology -where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, -which could lead to an incorrect topology enumeration by the guest. -Support for invalid topologies will be removed, the user must ensure -topologies described with -smp include all possible cpus, i.e. -*sockets* * *cores* * *threads* = *maxcpus*. - ``-vnc acl`` (since 4.0.0) ''''''''''''''''''''''''''@@ -618,6 +605,19 @@ New machine versions (since 5.1) will not accept the option but it will still work with old machine types. User can check the QAPI schema to see if the legacy option is supported by looking at MachineInfo::numa-mem-supported property. +``-smp`` (invalid topologies) (removed 5.2) +''''''''''''''''''''''''''''''''''''''''''' + +CPU topology properties should describe whole machine topology including +possible CPUs. + +However, historically it was possible to start QEMU with an incorrect topology +where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies is removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. +*sockets* * *cores* * *threads* = *maxcpus*. + Block devices -------------hw/core/machine.c +4
-12@@ -754,23 +754,15 @@ static void smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology: " +"sockets (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;hw/i386/pc.c +4
-12@@ -746,23 +746,15 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * dies * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * dies * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology deprecated: " +"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, dies, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * dies * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, dies, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;Signature · 1 line
2.27.0
Quoted 8 lines · On Fri, 11 Sep 2020 11:04:47 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 7 lines · Igor Mammedov
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure that topologies described with -smp include all possible cpus, i.e. (sockets * cores * threads) == maxcpus or QEMU will exit with error.
Quoted 5 lines
Quoted 1 line
Signed-off-by Igor Mammedov <[email protected]>Acked-by:
memory tree I guess?
It would be better for Paolo to take it since he has queued numa deprecations, due to context confilict in deprecated.rst.
Paolo,
can you queue this patch as well?
Quoted 118 lines
Quoted 117 lines
--- docs/system/deprecated.rst | 26 +++++++++++++------------- hw/core/machine.c | 16 ++++------------ hw/i386/pc.c | 16 ++++------------ 3 files changed, 21 insertions(+), 37 deletions(-)docs/system/deprecated.rst +13
-13@@ -47,19 +47,6 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. -``-smp`` (invalid topologies) (since 3.1) -''''''''''''''''''''''''''''''''''''''''' - -CPU topology properties should describe whole machine topology including -possible CPUs. - -However, historically it was possible to start QEMU with an incorrect topology -where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, -which could lead to an incorrect topology enumeration by the guest. -Support for invalid topologies will be removed, the user must ensure -topologies described with -smp include all possible cpus, i.e. -*sockets* * *cores* * *threads* = *maxcpus*. - ``-vnc acl`` (since 4.0.0) ''''''''''''''''''''''''''@@ -618,6 +605,19 @@ New machine versions (since 5.1) will not accept the option but it will still work with old machine types. User can check the QAPI schema to see if the legacy option is supported by looking at MachineInfo::numa-mem-supported property. +``-smp`` (invalid topologies) (removed 5.2) +''''''''''''''''''''''''''''''''''''''''''' + +CPU topology properties should describe whole machine topology including +possible CPUs. + +However, historically it was possible to start QEMU with an incorrect topology +where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies is removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. +*sockets* * *cores* * *threads* = *maxcpus*. + Block devices -------------hw/core/machine.c +4
-12@@ -754,23 +754,15 @@ static void smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology: " +"sockets (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;hw/i386/pc.c +4
-12@@ -746,23 +746,15 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts)exit (1 ); } -if (sockets * dies * cores * threads > ms->smp.max_cpus) { -error_report ("cpu topology: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " -"maxcpus (%u)" , +if (sockets * dies * cores * threads != ms->smp.max_cpus) { +error_report ("Invalid CPU topology deprecated: " +"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " +"!= maxcpus (%u)" , sockets, dies, cores, threads, ms->smp.max_cpus);exit (1 ); } -if (sockets * dies * cores * threads != ms->smp.max_cpus) { -warn_report ("Invalid CPU topology deprecated: " -"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " -"!= maxcpus (%u)" , - sockets, dies, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads;Signature · 1 line
2.27.0
Quoted 15 lines · Igor Mammedov
Quoted 12 lines · On Fri, 11 Sep 2020 11:04:47 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 8 lines · Igor Mammedov
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure that topologies described with -smp include all possible cpus, i.e. (sockets * cores * threads) == maxcpus or QEMU will exit with error.
Signed-off-by Igor Mammedov <[email protected]>Acked-by:
Quoted 8 lines
Quoted 1 line
memory tree I guess?
It would be better for Paolo to take it since he has queued numa deprecations, due to context confilict in
deprecated.rst.Paolo,
can you queue this patch as well?
I'm queueing this in machine-next (sorry for not noticing it before I sent today's pull request).
Signature · 1 line
Eduardo
Quoted 22 lines · Eduardo Habkost
Quoted 21 lines · Igor Mammedov
Quoted 8 lines · On Fri, 11 Sep 2020 11:04:47 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 7 lines · Igor Mammedov
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure that topologies described with -smp include all possible cpus, i.e. (sockets * cores * threads) == maxcpus or QEMU will exit with error.
Quoted 5 lines
Quoted 1 line
Signed-off-by Igor Mammedov <[email protected]>Acked-by:
memory tree I guess?
It would be better for Paolo to take it since he has queued numa deprecations, due to context confilict in
deprecated.rst.
Quoted 5 lines
Quoted 2 lines
Paolo,
can you queue this patch as well?I'm queueing this in machine-next (sorry for not noticing it before I sent today's pull request).
It's not part of my pending pull request, so whoever comes second will drop the patch.
Paolo