[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support
From: |
Like Xu |
Subject: |
[Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support |
Date: |
Mon, 14 Jan 2019 20:24:56 +0800 |
This patch updates the check rules on legeacy -smp parse from user command
and it's designed to obey the same restrictions as socket/core/thread model.
Signed-off-by: Like Xu <address@hidden>
---
hmp.c | 3 +++
hw/core/machine.c | 12 ++++++++++++
vl.c | 33 ++++++++++++++++++++-------------
3 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/hmp.c b/hmp.c
index 80aa5ab..05ac133 100644
--- a/hmp.c
+++ b/hmp.c
@@ -3013,6 +3013,9 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict
*qdict)
if (c->has_socket_id) {
monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n",
c->socket_id);
}
+ if (c->has_die_id) {
+ monitor_printf(mon, " die-id: \"%" PRIu64 "\"\n", c->die_id);
+ }
if (c->has_core_id) {
monitor_printf(mon, " core-id: \"%" PRIu64 "\"\n", c->core_id);
}
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 95dc7c3..05bc545 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -601,6 +601,11 @@ void machine_set_cpu_numa_node(MachineState *machine,
return;
}
+ if (props->has_die_id && !slot->props.has_die_id) {
+ error_setg(errp, "die-id is not supported");
+ return;
+ }
+
if (props->has_socket_id && !slot->props.has_socket_id) {
error_setg(errp, "socket-id is not supported");
return;
@@ -615,6 +620,10 @@ void machine_set_cpu_numa_node(MachineState *machine,
continue;
}
+ if (props->has_die_id && props->die_id != slot->props.die_id) {
+ continue;
+ }
+
if (props->has_socket_id && props->socket_id != slot->props.socket_id)
{
continue;
}
@@ -849,6 +858,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
if (cpu->props.has_socket_id) {
g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
}
+ if (cpu->props.has_die_id) {
+ g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
+ }
if (cpu->props.has_core_id) {
if (s->len) {
g_string_append_printf(s, ", ");
diff --git a/vl.c b/vl.c
index 9b8ea3f..72be689 100644
--- a/vl.c
+++ b/vl.c
@@ -169,6 +169,7 @@ int win2k_install_hack = 0;
int singlestep = 0;
int smp_cpus;
unsigned int max_cpus;
+int smp_dies = 1;
int smp_cores = 1;
int smp_threads = 1;
int acpi_enabled = 1;
@@ -1208,6 +1209,9 @@ static QemuOptsList qemu_smp_opts = {
.name = "sockets",
.type = QEMU_OPT_NUMBER,
}, {
+ .name = "dies",
+ .type = QEMU_OPT_NUMBER,
+ }, {
.name = "cores",
.type = QEMU_OPT_NUMBER,
}, {
@@ -1226,32 +1230,34 @@ static void smp_parse(QemuOpts *opts)
if (opts) {
unsigned cpus = qemu_opt_get_number(opts, "cpus", 0);
unsigned sockets = qemu_opt_get_number(opts, "sockets", 0);
+ unsigned dies = qemu_opt_get_number(opts, "dies", 0);
unsigned cores = qemu_opt_get_number(opts, "cores", 0);
unsigned threads = qemu_opt_get_number(opts, "threads", 0);
/* compute missing values, prefer sockets over cores over threads */
+ dies = dies > 0 ? dies : 1;
if (cpus == 0 || sockets == 0) {
cores = cores > 0 ? cores : 1;
threads = threads > 0 ? threads : 1;
if (cpus == 0) {
sockets = sockets > 0 ? sockets : 1;
- cpus = cores * threads * sockets;
+ cpus = cores * threads * dies * sockets;
} else {
max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
- sockets = max_cpus / (cores * threads);
+ sockets = max_cpus / (cores * threads * dies);
}
} else if (cores == 0) {
threads = threads > 0 ? threads : 1;
- cores = cpus / (sockets * threads);
+ cores = cpus / (sockets * dies * threads);
cores = cores > 0 ? cores : 1;
} else if (threads == 0) {
- threads = cpus / (cores * sockets);
+ threads = cpus / (cores * dies * sockets);
threads = threads > 0 ? threads : 1;
- } else if (sockets * cores * threads < cpus) {
+ } else if (sockets * dies * cores * threads < cpus) {
error_report("cpu topology: "
- "sockets (%u) * cores (%u) * threads (%u) < "
+ "sockets (%u) * dies (%u) * cores (%u) * threads (%u)
< "
"smp_cpus (%u)",
- sockets, cores, threads, cpus);
+ sockets, dies, cores, threads, cpus);
exit(1);
}
@@ -1262,22 +1268,23 @@ static void smp_parse(QemuOpts *opts)
exit(1);
}
- if (sockets * cores * threads > max_cpus) {
+ if (sockets * dies * cores * threads > max_cpus) {
error_report("cpu topology: "
- "sockets (%u) * cores (%u) * threads (%u) > "
+ "sockets (%u) * dies (%u) * cores (%u) * threads (%u)
> "
"maxcpus (%u)",
- sockets, cores, threads, max_cpus);
+ sockets, dies, cores, threads, max_cpus);
exit(1);
}
- if (sockets * cores * threads != max_cpus) {
+ if (sockets * dies * cores * threads != max_cpus) {
warn_report("Invalid CPU topology deprecated: "
- "sockets (%u) * cores (%u) * threads (%u) "
+ "sockets (%u) * dies (%u) * cores (%u) * threads (%u) "
"!= maxcpus (%u)",
- sockets, cores, threads, max_cpus);
+ sockets, dies, cores, threads, max_cpus);
}
smp_cpus = cpus;
+ smp_dies = dies;
smp_cores = cores;
smp_threads = threads;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v1 0/5] Introduce cpu die topology and enable CPUID.1F for i386, Like Xu, 2019/01/13
- [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support,
Like Xu <=
- Re: [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support, Eduardo Habkost, 2019/01/14
- Re: [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support, Xu, Like, 2019/01/14
- Re: [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support, Daniel P . Berrangé, 2019/01/16
- Re: [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support, Like Xu, 2019/01/16
- Re: [Qemu-devel] [PATCH v1 2/5] vl.c: add -smp, dies=* command line support, Daniel P . Berrangé, 2019/01/17
[Qemu-devel] [PATCH v1 3/5] i386: extend x86_apicid_* functions for smp_dies support, Like Xu, 2019/01/13
[Qemu-devel] [PATCH v1 1/5] cpu: introduce die, the new cpu toppolgy emulation level, Like Xu, 2019/01/13
[Qemu-devel] [PATCH v1 4/5] i386: enable CPUID.1F leaf generation based on spec, Like Xu, 2019/01/13