From: Zhao Liu <zhao1.liu@intel.com>
Add "modules" parameter parsing support in -smp.
Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Changes since v8:
* Add module description in qemu_smp_opts.
Changes since v7:
* New commit to introduce module level in -smp.
---
hw/core/machine-smp.c | 39 +++++++++++++++++++++++++++++----------
hw/core/machine.c | 1 +
qapi/machine.json | 3 +++
system/vl.c | 3 +++
4 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index a0a30da59aa4..8a8296b0d05b 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -51,6 +51,10 @@ static char *cpu_hierarchy_to_string(MachineState *ms)
g_string_append_printf(s, " * clusters (%u)", ms->smp.clusters);
}
+ if (mc->smp_props.modules_supported) {
+ g_string_append_printf(s, " * modules (%u)", ms->smp.clusters);
+ }
+
g_string_append_printf(s, " * cores (%u)", ms->smp.cores);
g_string_append_printf(s, " * threads (%u)", ms->smp.threads);
@@ -88,6 +92,7 @@ void machine_parse_smp_config(MachineState *ms,
unsigned sockets = config->has_sockets ? config->sockets : 0;
unsigned dies = config->has_dies ? config->dies : 0;
unsigned clusters = config->has_clusters ? config->clusters : 0;
+ unsigned modules = config->has_modules ? config->modules : 0;
unsigned cores = config->has_cores ? config->cores : 0;
unsigned threads = config->has_threads ? config->threads : 0;
unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
@@ -102,6 +107,7 @@ void machine_parse_smp_config(MachineState *ms,
(config->has_sockets && config->sockets == 0) ||
(config->has_dies && config->dies == 0) ||
(config->has_clusters && config->clusters == 0) ||
+ (config->has_modules && config->modules == 0) ||
(config->has_cores && config->cores == 0) ||
(config->has_threads && config->threads == 0) ||
(config->has_maxcpus && config->maxcpus == 0)) {
@@ -117,12 +123,12 @@ void machine_parse_smp_config(MachineState *ms,
error_setg(errp, "dies not supported by this machine's CPU topology");
return;
}
+ dies = dies > 0 ? dies : 1;
+
if (!mc->smp_props.clusters_supported && clusters > 1) {
error_setg(errp, "clusters not supported by this machine's CPU topology");
return;
}
-
- dies = dies > 0 ? dies : 1;
clusters = clusters > 0 ? clusters : 1;
if (!mc->smp_props.books_supported && books > 1) {
@@ -138,6 +144,13 @@ void machine_parse_smp_config(MachineState *ms,
}
drawers = drawers > 0 ? drawers : 1;
+ if (!mc->smp_props.modules_supported && modules > 1) {
+ error_setg(errp, "modules not supported by this "
+ "machine's CPU topology");
+ return;
+ }
+ modules = modules > 0 ? modules : 1;
+
/* compute missing values based on the provided ones */
if (cpus == 0 && maxcpus == 0) {
sockets = sockets > 0 ? sockets : 1;
@@ -152,11 +165,13 @@ void machine_parse_smp_config(MachineState *ms,
cores = cores > 0 ? cores : 1;
threads = threads > 0 ? threads : 1;
sockets = maxcpus /
- (drawers * books * dies * clusters * cores * threads);
+ (drawers * books * dies * clusters *
+ modules * cores * threads);
} else if (cores == 0) {
threads = threads > 0 ? threads : 1;
cores = maxcpus /
- (drawers * books * sockets * dies * clusters * threads);
+ (drawers * books * sockets * dies *
+ clusters * modules * threads);
}
} else {
/* prefer cores over sockets since 6.2 */
@@ -164,23 +179,26 @@ void machine_parse_smp_config(MachineState *ms,
sockets = sockets > 0 ? sockets : 1;
threads = threads > 0 ? threads : 1;
cores = maxcpus /
- (drawers * books * sockets * dies * clusters * threads);
+ (drawers * books * sockets * dies *
+ clusters * modules * threads);
} else if (sockets == 0) {
threads = threads > 0 ? threads : 1;
sockets = maxcpus /
- (drawers * books * dies * clusters * cores * threads);
+ (drawers * books * dies * clusters *
+ modules * cores * threads);
}
}
/* try to calculate omitted threads at last */
if (threads == 0) {
threads = maxcpus /
- (drawers * books * sockets * dies * clusters * cores);
+ (drawers * books * sockets * dies *
+ clusters * modules * cores);
}
}
maxcpus = maxcpus > 0 ? maxcpus : drawers * books * sockets * dies *
- clusters * cores * threads;
+ clusters * modules * cores * threads;
cpus = cpus > 0 ? cpus : maxcpus;
ms->smp.cpus = cpus;
@@ -189,6 +207,7 @@ void machine_parse_smp_config(MachineState *ms,
ms->smp.sockets = sockets;
ms->smp.dies = dies;
ms->smp.clusters = clusters;
+ ms->smp.modules = modules;
ms->smp.cores = cores;
ms->smp.threads = threads;
ms->smp.max_cpus = maxcpus;
@@ -196,8 +215,8 @@ void machine_parse_smp_config(MachineState *ms,
mc->smp_props.has_clusters = config->has_clusters;
/* sanity-check of the computed topology */
- if (drawers * books * sockets * dies * clusters * cores * threads !=
- maxcpus) {
+ if (drawers * books * sockets * dies * clusters * modules * cores *
+ threads != maxcpus) {
g_autofree char *topo_msg = cpu_hierarchy_to_string(ms);
error_setg(errp, "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 36fe3a4806f2..030b7e250ac5 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -872,6 +872,7 @@ static void machine_get_smp(Object *obj, Visitor *v, const char *name,
.has_sockets = true, .sockets = ms->smp.sockets,
.has_dies = true, .dies = ms->smp.dies,
.has_clusters = true, .clusters = ms->smp.clusters,
+ .has_modules = true, .modules = ms->smp.modules,
.has_cores = true, .cores = ms->smp.cores,
.has_threads = true, .threads = ms->smp.threads,
.has_maxcpus = true, .maxcpus = ms->smp.max_cpus,
diff --git a/qapi/machine.json b/qapi/machine.json
index 93b46772869e..5233a8947556 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1640,6 +1640,8 @@
#
# @clusters: number of clusters per parent container (since 7.0)
#
+# @modules: number of modules per parent container (since 9.0)
+#
# @cores: number of cores per parent container
#
# @threads: number of threads per core
@@ -1653,6 +1655,7 @@
'*sockets': 'int',
'*dies': 'int',
'*clusters': 'int',
+ '*modules': 'int',
'*cores': 'int',
'*threads': 'int',
'*maxcpus': 'int' } }
diff --git a/system/vl.c b/system/vl.c
index b8469d9965da..15ff95b89b57 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -741,6 +741,9 @@ static QemuOptsList qemu_smp_opts = {
}, {
.name = "clusters",
.type = QEMU_OPT_NUMBER,
+ }, {
+ .name = "modules",
+ .type = QEMU_OPT_NUMBER,
}, {
.name = "cores",
.type = QEMU_OPT_NUMBER,
--
2.34.1
On 2/27/2024 6:32 PM, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
>
> Add "modules" parameter parsing support in -smp.
>
> Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
> Tested-by: Yongwei Ma <yongwei.ma@intel.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> Changes since v8:
> * Add module description in qemu_smp_opts.
>
> Changes since v7:
> * New commit to introduce module level in -smp.
> ---
> hw/core/machine-smp.c | 39 +++++++++++++++++++++++++++++----------
> hw/core/machine.c | 1 +
> qapi/machine.json | 3 +++
> system/vl.c | 3 +++
> 4 files changed, 36 insertions(+), 10 deletions(-)
>
> diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
> index a0a30da59aa4..8a8296b0d05b 100644
> --- a/hw/core/machine-smp.c
> +++ b/hw/core/machine-smp.c
> @@ -51,6 +51,10 @@ static char *cpu_hierarchy_to_string(MachineState *ms)
> g_string_append_printf(s, " * clusters (%u)", ms->smp.clusters);
> }
>
> + if (mc->smp_props.modules_supported) {
> + g_string_append_printf(s, " * modules (%u)", ms->smp.clusters);
> + }
smp.clusters -> smp.modules?
> +
> g_string_append_printf(s, " * cores (%u)", ms->smp.cores);
> g_string_append_printf(s, " * threads (%u)", ms->smp.threads);
>
> @@ -88,6 +92,7 @@ void machine_parse_smp_config(MachineState *ms,
> unsigned sockets = config->has_sockets ? config->sockets : 0;
> unsigned dies = config->has_dies ? config->dies : 0;
> unsigned clusters = config->has_clusters ? config->clusters : 0;
> + unsigned modules = config->has_modules ? config->modules : 0;
> unsigned cores = config->has_cores ? config->cores : 0;
> unsigned threads = config->has_threads ? config->threads : 0;
> unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
> @@ -102,6 +107,7 @@ void machine_parse_smp_config(MachineState *ms,
> (config->has_sockets && config->sockets == 0) ||
> (config->has_dies && config->dies == 0) ||
> (config->has_clusters && config->clusters == 0) ||
> + (config->has_modules && config->modules == 0) ||
> (config->has_cores && config->cores == 0) ||
> (config->has_threads && config->threads == 0) ||
> (config->has_maxcpus && config->maxcpus == 0)) {
> @@ -117,12 +123,12 @@ void machine_parse_smp_config(MachineState *ms,
> error_setg(errp, "dies not supported by this machine's CPU topology");
> return;
> }
> + dies = dies > 0 ? dies : 1;
> +
> if (!mc->smp_props.clusters_supported && clusters > 1) {
> error_setg(errp, "clusters not supported by this machine's CPU topology");
> return;
> }
> -
> - dies = dies > 0 ? dies : 1;
> clusters = clusters > 0 ? clusters : 1;
>
> if (!mc->smp_props.books_supported && books > 1) {
> @@ -138,6 +144,13 @@ void machine_parse_smp_config(MachineState *ms,
> }
> drawers = drawers > 0 ? drawers : 1;
>
> + if (!mc->smp_props.modules_supported && modules > 1) {
> + error_setg(errp, "modules not supported by this "
> + "machine's CPU topology");
> + return;
> + }
> + modules = modules > 0 ? modules : 1;
> +
> /* compute missing values based on the provided ones */
> if (cpus == 0 && maxcpus == 0) {
> sockets = sockets > 0 ? sockets : 1;
> @@ -152,11 +165,13 @@ void machine_parse_smp_config(MachineState *ms,
> cores = cores > 0 ? cores : 1;
> threads = threads > 0 ? threads : 1;
> sockets = maxcpus /
> - (drawers * books * dies * clusters * cores * threads);
> + (drawers * books * dies * clusters *
> + modules * cores * threads);
> } else if (cores == 0) {
> threads = threads > 0 ? threads : 1;
> cores = maxcpus /
> - (drawers * books * sockets * dies * clusters * threads);
> + (drawers * books * sockets * dies *
> + clusters * modules * threads);
> }
> } else {
> /* prefer cores over sockets since 6.2 */
> @@ -164,23 +179,26 @@ void machine_parse_smp_config(MachineState *ms,
> sockets = sockets > 0 ? sockets : 1;
> threads = threads > 0 ? threads : 1;
> cores = maxcpus /
> - (drawers * books * sockets * dies * clusters * threads);
> + (drawers * books * sockets * dies *
> + clusters * modules * threads);
> } else if (sockets == 0) {
> threads = threads > 0 ? threads : 1;
> sockets = maxcpus /
> - (drawers * books * dies * clusters * cores * threads);
> + (drawers * books * dies * clusters *
> + modules * cores * threads);
> }
> }
>
> /* try to calculate omitted threads at last */
> if (threads == 0) {
> threads = maxcpus /
> - (drawers * books * sockets * dies * clusters * cores);
> + (drawers * books * sockets * dies *
> + clusters * modules * cores);
> }
> }
>
> maxcpus = maxcpus > 0 ? maxcpus : drawers * books * sockets * dies *
> - clusters * cores * threads;
> + clusters * modules * cores * threads;
> cpus = cpus > 0 ? cpus : maxcpus;
>
> ms->smp.cpus = cpus;
> @@ -189,6 +207,7 @@ void machine_parse_smp_config(MachineState *ms,
> ms->smp.sockets = sockets;
> ms->smp.dies = dies;
> ms->smp.clusters = clusters;
> + ms->smp.modules = modules;
> ms->smp.cores = cores;
> ms->smp.threads = threads;
> ms->smp.max_cpus = maxcpus;
> @@ -196,8 +215,8 @@ void machine_parse_smp_config(MachineState *ms,
> mc->smp_props.has_clusters = config->has_clusters;
>
> /* sanity-check of the computed topology */
> - if (drawers * books * sockets * dies * clusters * cores * threads !=
> - maxcpus) {
> + if (drawers * books * sockets * dies * clusters * modules * cores *
> + threads != maxcpus) {
> g_autofree char *topo_msg = cpu_hierarchy_to_string(ms);
> error_setg(errp, "Invalid CPU topology: "
> "product of the hierarchy must match maxcpus: "
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 36fe3a4806f2..030b7e250ac5 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -872,6 +872,7 @@ static void machine_get_smp(Object *obj, Visitor *v, const char *name,
> .has_sockets = true, .sockets = ms->smp.sockets,
> .has_dies = true, .dies = ms->smp.dies,
> .has_clusters = true, .clusters = ms->smp.clusters,
> + .has_modules = true, .modules = ms->smp.modules,
> .has_cores = true, .cores = ms->smp.cores,
> .has_threads = true, .threads = ms->smp.threads,
> .has_maxcpus = true, .maxcpus = ms->smp.max_cpus,
> diff --git a/qapi/machine.json b/qapi/machine.json
> index 93b46772869e..5233a8947556 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -1640,6 +1640,8 @@
> #
> # @clusters: number of clusters per parent container (since 7.0)
> #
> +# @modules: number of modules per parent container (since 9.0)
> +#
> # @cores: number of cores per parent container
> #
> # @threads: number of threads per core
> @@ -1653,6 +1655,7 @@
> '*sockets': 'int',
> '*dies': 'int',
> '*clusters': 'int',
> + '*modules': 'int',
> '*cores': 'int',
> '*threads': 'int',
> '*maxcpus': 'int' } }
> diff --git a/system/vl.c b/system/vl.c
> index b8469d9965da..15ff95b89b57 100644
> --- a/system/vl.c
> +++ b/system/vl.c
> @@ -741,6 +741,9 @@ static QemuOptsList qemu_smp_opts = {
> }, {
> .name = "clusters",
> .type = QEMU_OPT_NUMBER,
> + }, {
> + .name = "modules",
> + .type = QEMU_OPT_NUMBER,
> }, {
> .name = "cores",
> .type = QEMU_OPT_NUMBER,
> > @@ -51,6 +51,10 @@ static char *cpu_hierarchy_to_string(MachineState *ms)
> > g_string_append_printf(s, " * clusters (%u)", ms->smp.clusters);
> > }
> > + if (mc->smp_props.modules_supported) {
> > + g_string_append_printf(s, " * modules (%u)", ms->smp.clusters);
> > + }
>
> smp.clusters -> smp.modules?
>
Good catch! Thanks!
-Zhao
Zhao Liu <zhao1.liu@linux.intel.com> writes: > From: Zhao Liu <zhao1.liu@intel.com> > > Add "modules" parameter parsing support in -smp. > > Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com> > Tested-by: Yongwei Ma <yongwei.ma@intel.com> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> QAPI schema Acked-by: Markus Armbruster <armbru@redhat.com>
© 2016 - 2024 Red Hat, Inc.