From nobody Sat Nov 1 07:33:54 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509734967880737.0297940092183; Fri, 3 Nov 2017 11:49:27 -0700 (PDT) Received: from localhost ([::1]:38037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAh1k-0000TM-2z for importer@patchew.org; Fri, 03 Nov 2017 14:49:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAh0J-0007xP-3R for qemu-devel@nongnu.org; Fri, 03 Nov 2017 14:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAh0H-0005zb-PE for qemu-devel@nongnu.org; Fri, 03 Nov 2017 14:47:43 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:59897) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAh0B-0005sw-Tt; Fri, 03 Nov 2017 14:47:36 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id ED5872068B; Fri, 3 Nov 2017 14:47:33 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Fri, 03 Nov 2017 14:47:33 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id AD63F7E17C; Fri, 3 Nov 2017 14:47:33 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=mesmtp; bh=R35HrC6qbDhAOdRUlj9bkRNpYbO4HDZFssnO7Y AZ6QY=; b=XiE8/g+zoPhv2KoSQa4aOCoAIdEME4i90rJunSgf9nGfQQd0U2qAEc gal3ijnykZqmoZtZbcsY0mSIBSU7j62viq0US+3arPu/z9tKAcI1GMOitKGpqq5S NYJPQX35YiqA8htXgc4bYArYUPLYrEAqkKYFUo3PyQ/zzuvQ9O9wk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=R35HrC6qbDhAOdRUl j9bkRNpYbO4HDZFssnO7YAZ6QY=; b=NPec+E0dWSLt/eRZV9iqV/TaHg5ORsodS fX8UuXbXBhykYAy6NfADY2iW1XbioxLWO1LyINZ8SK/UBNzH++PO6c/LyuSdXTv7 7R49B+bUunYCd1HV5d6NsMZXpAhGxyqZN6LTyQ+m3zYCjOUMlcXHlMnjiPuARHec CaW9VAD5Hr0Ttrfs97ySOFQsix6cT4df7yu1TOVgKtfOtB2EeLAy7Go9wjdSVueQ yEn/wKbFYYleFKhZ3IFId9gbdV0rsL8axpJEub4Pc0aGgN/0fTwVH3YYQmj5j6Si Rh1GXUEheXOWrZ/0q4aQhRJuof6eRxQQMxC3IyygSTZbTYL37ZZjg== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 14:47:33 -0400 Message-Id: <1509734853-3014-1-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.28 Subject: [Qemu-devel] [PATCH] hw: add .min_cpus and .default_cpus fields to machine_class X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , Igor Mitsyanko , Richard Henderson , Alistair Francis , qemu-arm@nongnu.org, Marcel Apfelbaum , "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" max_cpus needs to be an upper bound on the number of vCPUs initialized; otherwise TCG region initialization breaks. Some boards initialize a hard-coded number of vCPUs, which is not captured by the global max_cpus. Fix it by adding the .min_cpus field to machine_class. This commit also changes some user-facing behaviour: we now die if -smp is below this hard-coded vCPU minimum instead of silently ignoring the passed -smp value (sometimes announcing this by printing a warning). However, the introduction of .default_cpus lessens the likelihood that users will notice this: if -smp isn't set, we now assign the value in .default_cpus to both smp_cpus and max_cpus. IOW, if a user does not set -smp, they always get a correct number of vCPUs. This change fixes 3468b59 ("tcg: enable multiple TCG contexts in softmmu", 2017-10-24), which broke TCG initialization for some ARM boards. Fixes: 3468b59e18b179bc63c7ce934de912dfa9596122 Reported-by: Thomas Huth Suggested-by: Peter Maydell Signed-off-by: Emilio G. Cota Acked-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/exynos4_boards.c | 12 ++++-------- hw/arm/raspi.c | 2 ++ hw/arm/xlnx-zcu102.c | 5 +++++ include/hw/boards.h | 5 +++++ vl.c | 28 +++++++++++++++++++++++++--- 5 files changed, 41 insertions(+), 11 deletions(-) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index f1441ec..750162c 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" -#include "sysemu/qtest.h" #include "hw/sysbus.h" #include "net/net.h" #include "hw/arm/arm.h" @@ -129,13 +128,6 @@ exynos4_boards_init_common(MachineState *machine, Exynos4BoardType board_type) { Exynos4BoardState *s =3D g_new(Exynos4BoardState, 1); - MachineClass *mc =3D MACHINE_GET_CLASS(machine); - - if (smp_cpus !=3D EXYNOS4210_NCPUS && !qtest_enabled()) { - error_report("%s board supports only %d CPU cores, ignoring smp_cp= us" - " value", - mc->name, EXYNOS4210_NCPUS); - } =20 exynos4_board_binfo.ram_size =3D exynos4_board_ram_size[board_type]; exynos4_board_binfo.board_id =3D exynos4_board_id[board_type]; @@ -189,6 +181,8 @@ static void nuri_class_init(ObjectClass *oc, void *data) mc->desc =3D "Samsung NURI board (Exynos4210)"; mc->init =3D nuri_init; mc->max_cpus =3D EXYNOS4210_NCPUS; + mc->min_cpus =3D EXYNOS4210_NCPUS; + mc->default_cpus =3D EXYNOS4210_NCPUS; mc->ignore_memory_transaction_failures =3D true; } =20 @@ -205,6 +199,8 @@ static void smdkc210_class_init(ObjectClass *oc, void *= data) mc->desc =3D "Samsung SMDKC210 board (Exynos4210)"; mc->init =3D smdkc210_init; mc->max_cpus =3D EXYNOS4210_NCPUS; + mc->min_cpus =3D EXYNOS4210_NCPUS; + mc->default_cpus =3D EXYNOS4210_NCPUS; mc->ignore_memory_transaction_failures =3D true; } =20 diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 5941c9f..cd5fa8c 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -167,6 +167,8 @@ static void raspi2_machine_init(MachineClass *mc) mc->no_floppy =3D 1; mc->no_cdrom =3D 1; mc->max_cpus =3D BCM2836_NCPUS; + mc->min_cpus =3D BCM2836_NCPUS; + mc->default_cpus =3D BCM2836_NCPUS; mc->default_ram_size =3D 1024 * 1024 * 1024; mc->ignore_memory_transaction_failures =3D true; }; diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index e2d15a1..395d1b5 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -185,6 +185,9 @@ static void xlnx_ep108_machine_class_init(ObjectClass *= oc, void *data) mc->block_default_type =3D IF_IDE; mc->units_per_default_bus =3D 1; mc->ignore_memory_transaction_failures =3D true; + mc->max_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS; + mc->min_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS; + mc->default_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS; } =20 static const TypeInfo xlnx_ep108_machine_init_typeinfo =3D { @@ -241,6 +244,8 @@ static void xlnx_zcu102_machine_class_init(ObjectClass = *oc, void *data) mc->units_per_default_bus =3D 1; mc->ignore_memory_transaction_failures =3D true; mc->max_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS; + mc->min_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS; + mc->default_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS; } =20 static const TypeInfo xlnx_zcu102_machine_init_typeinfo =3D { diff --git a/include/hw/boards.h b/include/hw/boards.h index 191a5b3..62f160e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -102,6 +102,9 @@ typedef struct { =20 /** * MachineClass: + * @max_cpus: maximum number of CPUs supported. Default: 1 + * @min_cpus: minimum number of CPUs supported. Default: 1 + * @default_cpus: number of CPUs instantiated if none are specified. Defau= lt: 1 * @get_hotplug_handler: this function is called during bus-less * device hotplug. If defined it returns pointer to an instance * of HotplugHandler object, which handles hotplug operation @@ -167,6 +170,8 @@ struct MachineClass { BlockInterfaceType block_default_type; int units_per_default_bus; int max_cpus; + int min_cpus; + int default_cpus; unsigned int no_serial:1, no_parallel:1, use_virtcon:1, diff --git a/vl.c b/vl.c index ec29909..3ca5ee8 100644 --- a/vl.c +++ b/vl.c @@ -160,8 +160,8 @@ Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; Chardev *sclp_hds[MAX_SCLP_CONSOLES]; int win2k_install_hack =3D 0; int singlestep =3D 0; -int smp_cpus =3D 1; -unsigned int max_cpus =3D 1; +int smp_cpus; +unsigned int max_cpus; int smp_cores =3D 1; int smp_threads =3D 1; int acpi_enabled =3D 1; @@ -4330,12 +4330,34 @@ int main(int argc, char **argv, char **envp) smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); =20 machine_class->max_cpus =3D machine_class->max_cpus ?: 1; /* Default t= o UP */ + machine_class->min_cpus =3D machine_class->min_cpus ?: 1; + machine_class->default_cpus =3D machine_class->default_cpus ?: 1; + + /* if -smp is not set, default to mc->default_cpus */ + if (!smp_cpus) { + smp_cpus =3D machine_class->default_cpus; + max_cpus =3D machine_class->default_cpus; + } + + /* sanity-check smp_cpus and max_cpus */ + if (smp_cpus < machine_class->min_cpus) { + error_report("Invalid SMP CPUs %d. The min CPUs " + "supported by machine '%s' is %d", smp_cpus, + machine_class->name, machine_class->min_cpus); + exit(1); + } if (max_cpus > machine_class->max_cpus) { - error_report("Invalid SMP CPUs %d. The max CPUs " + error_report("Invalid max SMP CPUs %d. The max CPUs " "supported by machine '%s' is %d", max_cpus, machine_class->name, machine_class->max_cpus); exit(1); } + if (max_cpus < machine_class->min_cpus) { + error_report("Invalid max SMP CPUs %d. The min CPUs " + "supported by machine '%s' is %d", max_cpus, + machine_class->name, machine_class->min_cpus); + exit(1); + } =20 /* * Get the default machine options from the machine if it is not alrea= dy --=20 2.7.4