
* Update to QEMU v9.0.0 --------- Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Cédric Le Goater <clg@redhat.com> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com> Signed-off-by: Ido Plat <ido.plat@ibm.com> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Signed-off-by: David Hildenbrand <david@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Gregory Price <gregory.price@memverge.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Lorenz Brun <lorenz@brun.one> Signed-off-by: Yao Xingtao <yaoxt.fnst@fujitsu.com> Signed-off-by: Arnaud Minier <arnaud.minier@telecom-paris.fr> Signed-off-by: Inès Varhol <ines.varhol@telecom-paris.fr> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Signed-off-by: Avihai Horon <avihaih@nvidia.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Joonas Kankaala <joonas.a.kankaala@gmail.com> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Glenn Miles <milesg@linux.ibm.com> Signed-off-by: Oleg Sviridov <oleg.sviridov@red-soft.ru> Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru> Signed-off-by: Yajun Wu <yajunw@nvidia.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Pierre-Clément Tosi <ptosi@google.com> Signed-off-by: Lei Wang <lei4.wang@intel.com> Signed-off-by: Wei Wang <wei.w.wang@intel.com> Signed-off-by: Martin Hundebøll <martin@geanix.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Signed-off-by: Wafer <wafer@jaguarmicro.com> Signed-off-by: Yuxue Liu <yuxue.liu@jaguarmicro.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com> Signed-off-by: Zack Buhman <zack@buhman.org> Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Yuquan Wang wangyuquan1236@phytium.com.cn Signed-off-by: Matheus Tavares Bernardino <quic_mathbern@quicinc.com> Signed-off-by: Cindy Lu <lulu@redhat.com> Co-authored-by: Peter Maydell <peter.maydell@linaro.org> Co-authored-by: Fabiano Rosas <farosas@suse.de> Co-authored-by: Peter Xu <peterx@redhat.com> Co-authored-by: Thomas Huth <thuth@redhat.com> Co-authored-by: Cédric Le Goater <clg@redhat.com> Co-authored-by: Zheyu Ma <zheyuma97@gmail.com> Co-authored-by: Ido Plat <ido.plat@ibm.com> Co-authored-by: Ilya Leoshkevich <iii@linux.ibm.com> Co-authored-by: Markus Armbruster <armbru@redhat.com> Co-authored-by: Marc-André Lureau <marcandre.lureau@redhat.com> Co-authored-by: Paolo Bonzini <pbonzini@redhat.com> Co-authored-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Co-authored-by: David Hildenbrand <david@redhat.com> Co-authored-by: Kevin Wolf <kwolf@redhat.com> Co-authored-by: Stefan Reiter <s.reiter@proxmox.com> Co-authored-by: Fiona Ebner <f.ebner@proxmox.com> Co-authored-by: Gregory Price <gregory.price@memverge.com> Co-authored-by: Lorenz Brun <lorenz@brun.one> Co-authored-by: Yao Xingtao <yaoxt.fnst@fujitsu.com> Co-authored-by: Philippe Mathieu-Daudé <philmd@linaro.org> Co-authored-by: Arnaud Minier <arnaud.minier@telecom-paris.fr> Co-authored-by: BALATON Zoltan <balaton@eik.bme.hu> Co-authored-by: Igor Mammedov <imammedo@redhat.com> Co-authored-by: Akihiko Odaki <akihiko.odaki@daynix.com> Co-authored-by: Richard Henderson <richard.henderson@linaro.org> Co-authored-by: Sven Schnelle <svens@stackframe.org> Co-authored-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Co-authored-by: Helge Deller <deller@kernel.org> Co-authored-by: Harsh Prateek Bora <harshpb@linux.ibm.com> Co-authored-by: Benjamin Gray <bgray@linux.ibm.com> Co-authored-by: Nicholas Piggin <npiggin@gmail.com> Co-authored-by: Avihai Horon <avihaih@nvidia.com> Co-authored-by: Michael Tokarev <mjt@tls.msk.ru> Co-authored-by: Joonas Kankaala <joonas.a.kankaala@gmail.com> Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Co-authored-by: Stefan Weil <sw@weilnetz.de> Co-authored-by: Dayu Liu <liu.dayu@zte.com.cn> Co-authored-by: Zhao Liu <zhao1.liu@intel.com> Co-authored-by: Glenn Miles <milesg@linux.vnet.ibm.com> Co-authored-by: Artem Chernyshev <artem.chernyshev@red-soft.ru> Co-authored-by: Yajun Wu <yajunw@nvidia.com> Co-authored-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Co-authored-by: Pierre-Clément Tosi <ptosi@google.com> Co-authored-by: Wei Wang <wei.w.wang@intel.com> Co-authored-by: Martin Hundebøll <martin@geanix.com> Co-authored-by: Michael S. Tsirkin <mst@redhat.com> Co-authored-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Co-authored-by: Wafer <wafer@jaguarmicro.com> Co-authored-by: lyx634449800 <yuxue.liu@jaguarmicro.com> Co-authored-by: Gerd Hoffmann <kraxel@redhat.com> Co-authored-by: Nguyen Dinh Phi <phind.uet@gmail.com> Co-authored-by: Zack Buhman <zack@buhman.org> Co-authored-by: Keith Packard <keithp@keithp.com> Co-authored-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> Co-authored-by: Matheus Tavares Bernardino <quic_mathbern@quicinc.com> Co-authored-by: Cindy Lu <lulu@redhat.com>
276 lines
10 KiB
C
276 lines
10 KiB
C
/*
|
|
* QEMU Machine core (related to -smp parsing)
|
|
*
|
|
* Copyright (c) 2021 Huawei Technologies Co., Ltd
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License,
|
|
* or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/boards.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
|
|
/*
|
|
* Report information of a machine's supported CPU topology hierarchy.
|
|
* Topology members will be ordered from the largest to the smallest
|
|
* in the string.
|
|
*/
|
|
static char *cpu_hierarchy_to_string(MachineState *ms)
|
|
{
|
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
|
GString *s = g_string_new(NULL);
|
|
|
|
if (mc->smp_props.drawers_supported) {
|
|
g_string_append_printf(s, "drawers (%u) * ", ms->smp.drawers);
|
|
}
|
|
|
|
if (mc->smp_props.books_supported) {
|
|
g_string_append_printf(s, "books (%u) * ", ms->smp.books);
|
|
}
|
|
|
|
g_string_append_printf(s, "sockets (%u)", ms->smp.sockets);
|
|
|
|
if (mc->smp_props.dies_supported) {
|
|
g_string_append_printf(s, " * dies (%u)", ms->smp.dies);
|
|
}
|
|
|
|
if (mc->smp_props.clusters_supported) {
|
|
g_string_append_printf(s, " * clusters (%u)", ms->smp.clusters);
|
|
}
|
|
|
|
g_string_append_printf(s, " * cores (%u)", ms->smp.cores);
|
|
g_string_append_printf(s, " * threads (%u)", ms->smp.threads);
|
|
|
|
return g_string_free(s, false);
|
|
}
|
|
|
|
/*
|
|
* machine_parse_smp_config: Generic function used to parse the given
|
|
* SMP configuration
|
|
*
|
|
* Any missing parameter in "cpus/maxcpus/sockets/cores/threads" will be
|
|
* automatically computed based on the provided ones.
|
|
*
|
|
* In the calculation of omitted sockets/cores/threads: we prefer sockets
|
|
* over cores over threads before 6.2, while preferring cores over sockets
|
|
* over threads since 6.2.
|
|
*
|
|
* In the calculation of cpus/maxcpus: When both maxcpus and cpus are omitted,
|
|
* maxcpus will be computed from the given parameters and cpus will be set
|
|
* equal to maxcpus. When only one of maxcpus and cpus is given then the
|
|
* omitted one will be set to its given counterpart's value. Both maxcpus and
|
|
* cpus may be specified, but maxcpus must be equal to or greater than cpus.
|
|
*
|
|
* For compatibility, apart from the parameters that will be computed, newly
|
|
* introduced topology members which are likely to be target specific should
|
|
* be directly set as 1 if they are omitted (e.g. dies for PC since 4.1).
|
|
*/
|
|
void machine_parse_smp_config(MachineState *ms,
|
|
const SMPConfiguration *config, Error **errp)
|
|
{
|
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
|
unsigned cpus = config->has_cpus ? config->cpus : 0;
|
|
unsigned drawers = config->has_drawers ? config->drawers : 0;
|
|
unsigned books = config->has_books ? config->books : 0;
|
|
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 cores = config->has_cores ? config->cores : 0;
|
|
unsigned threads = config->has_threads ? config->threads : 0;
|
|
unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
|
|
unsigned total_cpus;
|
|
|
|
/*
|
|
* Specified CPU topology parameters must be greater than zero,
|
|
* explicit configuration like "cpus=0" is not allowed.
|
|
*/
|
|
if ((config->has_cpus && config->cpus == 0) ||
|
|
(config->has_drawers && config->drawers == 0) ||
|
|
(config->has_books && config->books == 0) ||
|
|
(config->has_sockets && config->sockets == 0) ||
|
|
(config->has_dies && config->dies == 0) ||
|
|
(config->has_clusters && config->clusters == 0) ||
|
|
(config->has_cores && config->cores == 0) ||
|
|
(config->has_threads && config->threads == 0) ||
|
|
(config->has_maxcpus && config->maxcpus == 0)) {
|
|
error_setg(errp, "Invalid CPU topology: "
|
|
"CPU topology parameters must be greater than zero");
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* If not supported by the machine, a topology parameter must be
|
|
* omitted.
|
|
*/
|
|
if (!mc->smp_props.clusters_supported && config->has_clusters) {
|
|
if (config->clusters > 1) {
|
|
error_setg(errp, "clusters not supported by this "
|
|
"machine's CPU topology");
|
|
return;
|
|
} else {
|
|
/* Here clusters only equals 1 since we've checked zero case. */
|
|
warn_report("Deprecated CPU topology (considered invalid): "
|
|
"Unsupported clusters parameter mustn't be "
|
|
"specified as 1");
|
|
}
|
|
}
|
|
clusters = clusters > 0 ? clusters : 1;
|
|
|
|
if (!mc->smp_props.dies_supported && config->has_dies) {
|
|
if (config->dies > 1) {
|
|
error_setg(errp, "dies not supported by this "
|
|
"machine's CPU topology");
|
|
return;
|
|
} else {
|
|
/* Here dies only equals 1 since we've checked zero case. */
|
|
warn_report("Deprecated CPU topology (considered invalid): "
|
|
"Unsupported dies parameter mustn't be "
|
|
"specified as 1");
|
|
}
|
|
}
|
|
dies = dies > 0 ? dies : 1;
|
|
|
|
if (!mc->smp_props.books_supported && config->has_books) {
|
|
if (config->books > 1) {
|
|
error_setg(errp, "books not supported by this "
|
|
"machine's CPU topology");
|
|
return;
|
|
} else {
|
|
/* Here books only equals 1 since we've checked zero case. */
|
|
warn_report("Deprecated CPU topology (considered invalid): "
|
|
"Unsupported books parameter mustn't be "
|
|
"specified as 1");
|
|
}
|
|
}
|
|
books = books > 0 ? books : 1;
|
|
|
|
if (!mc->smp_props.drawers_supported && config->has_drawers) {
|
|
if (config->drawers > 1) {
|
|
error_setg(errp, "drawers not supported by this "
|
|
"machine's CPU topology");
|
|
return;
|
|
} else {
|
|
/* Here drawers only equals 1 since we've checked zero case. */
|
|
warn_report("Deprecated CPU topology (considered invalid): "
|
|
"Unsupported drawers parameter mustn't be "
|
|
"specified as 1");
|
|
}
|
|
}
|
|
drawers = drawers > 0 ? drawers : 1;
|
|
|
|
/* compute missing values based on the provided ones */
|
|
if (cpus == 0 && maxcpus == 0) {
|
|
sockets = sockets > 0 ? sockets : 1;
|
|
cores = cores > 0 ? cores : 1;
|
|
threads = threads > 0 ? threads : 1;
|
|
} else {
|
|
maxcpus = maxcpus > 0 ? maxcpus : cpus;
|
|
|
|
if (mc->smp_props.prefer_sockets) {
|
|
/* prefer sockets over cores before 6.2 */
|
|
if (sockets == 0) {
|
|
cores = cores > 0 ? cores : 1;
|
|
threads = threads > 0 ? threads : 1;
|
|
sockets = maxcpus /
|
|
(drawers * books * dies * clusters * cores * threads);
|
|
} else if (cores == 0) {
|
|
threads = threads > 0 ? threads : 1;
|
|
cores = maxcpus /
|
|
(drawers * books * sockets * dies * clusters * threads);
|
|
}
|
|
} else {
|
|
/* prefer cores over sockets since 6.2 */
|
|
if (cores == 0) {
|
|
sockets = sockets > 0 ? sockets : 1;
|
|
threads = threads > 0 ? threads : 1;
|
|
cores = maxcpus /
|
|
(drawers * books * sockets * dies * clusters * threads);
|
|
} else if (sockets == 0) {
|
|
threads = threads > 0 ? threads : 1;
|
|
sockets = maxcpus /
|
|
(drawers * books * dies * clusters * cores * threads);
|
|
}
|
|
}
|
|
|
|
/* try to calculate omitted threads at last */
|
|
if (threads == 0) {
|
|
threads = maxcpus /
|
|
(drawers * books * sockets * dies * clusters * cores);
|
|
}
|
|
}
|
|
|
|
total_cpus = drawers * books * sockets * dies * clusters * cores * threads;
|
|
maxcpus = maxcpus > 0 ? maxcpus : total_cpus;
|
|
cpus = cpus > 0 ? cpus : maxcpus;
|
|
|
|
ms->smp.cpus = cpus;
|
|
ms->smp.drawers = drawers;
|
|
ms->smp.books = books;
|
|
ms->smp.sockets = sockets;
|
|
ms->smp.dies = dies;
|
|
ms->smp.clusters = clusters;
|
|
ms->smp.cores = cores;
|
|
ms->smp.threads = threads;
|
|
ms->smp.max_cpus = maxcpus;
|
|
|
|
mc->smp_props.has_clusters = config->has_clusters;
|
|
|
|
/* sanity-check of the computed topology */
|
|
if (total_cpus != maxcpus) {
|
|
g_autofree char *topo_msg = cpu_hierarchy_to_string(ms);
|
|
error_setg(errp, "Invalid CPU topology: "
|
|
"product of the hierarchy must match maxcpus: "
|
|
"%s != maxcpus (%u)",
|
|
topo_msg, maxcpus);
|
|
return;
|
|
}
|
|
|
|
if (maxcpus < cpus) {
|
|
g_autofree char *topo_msg = cpu_hierarchy_to_string(ms);
|
|
error_setg(errp, "Invalid CPU topology: "
|
|
"maxcpus must be equal to or greater than smp: "
|
|
"%s == maxcpus (%u) < smp_cpus (%u)",
|
|
topo_msg, maxcpus, cpus);
|
|
return;
|
|
}
|
|
|
|
if (ms->smp.cpus < mc->min_cpus) {
|
|
error_setg(errp, "Invalid SMP CPUs %d. The min CPUs "
|
|
"supported by machine '%s' is %d",
|
|
ms->smp.cpus,
|
|
mc->name, mc->min_cpus);
|
|
return;
|
|
}
|
|
|
|
if (ms->smp.max_cpus > mc->max_cpus) {
|
|
error_setg(errp, "Invalid SMP CPUs %d. The max CPUs "
|
|
"supported by machine '%s' is %d",
|
|
ms->smp.max_cpus,
|
|
mc->name, mc->max_cpus);
|
|
return;
|
|
}
|
|
}
|
|
|
|
unsigned int machine_topo_get_cores_per_socket(const MachineState *ms)
|
|
{
|
|
return ms->smp.cores * ms->smp.clusters * ms->smp.dies;
|
|
}
|
|
|
|
unsigned int machine_topo_get_threads_per_socket(const MachineState *ms)
|
|
{
|
|
return ms->smp.threads * machine_topo_get_cores_per_socket(ms);
|
|
}
|