From nobody Fri May 10 13:42:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=huawei.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1627005688091755.4078933547584; Thu, 22 Jul 2021 19:01:28 -0700 (PDT) Received: from localhost ([::1]:55470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6kVD-0006u8-4Z for importer@patchew.org; Thu, 22 Jul 2021 22:01:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6kU1-0005PT-86 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 22:00:13 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:2258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6kTy-0008Oc-5j for qemu-devel@nongnu.org; Thu, 22 Jul 2021 22:00:13 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GWC6d4ppnz1CMnN; Fri, 23 Jul 2021 09:54:17 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 23 Jul 2021 10:00:06 +0800 Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 23 Jul 2021 10:00:05 +0800 From: Yanan Wang To: Subject: [PATCH for-6.1 v3 1/1] machine: Disallow specifying topology parameters as zero Date: Fri, 23 Jul 2021 10:00:02 +0800 Message-ID: <20210723020002.18456-2-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210723020002.18456-1-wangyanan55@huawei.com> References: <20210723020002.18456-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.255; envelope-from=wangyanan55@huawei.com; helo=szxga08-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , Pierre Morel , Pankaj Gupta , wanghaibin.wang@huawei.com, Cornelia Huck , Markus Armbruster , Yanan Wang , Cleber Rosa , yuzenghui@huawei.com, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1627005690185100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the SMP configuration, we should either specify a topology parameter with a reasonable value (equal to or greater than 1) or just leave it omitted and QEMU will calculate its value. Configurations which explicitly specify the topology parameters as zero like "sockets=3D0" are meaningless, so disallow them. However, the commit 1e63fe685804d (machine: pass QAPI struct to mc->smp_parse) has documented that '0' has the same semantics as omitting a parameter in the qapi comment for SMPConfiguration. So this patch fixes the doc and also adds the corresponding sanity check in the smp parsers. Reviewed-by: Andrew Jones Reviewed-by: Daniel P. Berrange Tested-by: Daniel P. Berrange Suggested-by: Andrew Jones Signed-off-by: Yanan Wang Reviewed-by: Cornelia Huck --- hw/core/machine.c | 15 +++++++++++++++ qapi/machine.json | 6 +++--- qemu-options.hx | 12 +++++++----- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 775add0795..d95e8b6903 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -829,6 +829,21 @@ static void machine_set_smp(Object *obj, Visitor *v, c= onst char *name, return; } =20 + /* + * The topology parameters must be specified equal to or great than one + * or just omitted, explicit configuration like "cpus=3D0" is not allo= wed. + */ + if ((config->has_cpus && config->cpus =3D=3D 0) || + (config->has_sockets && config->sockets =3D=3D 0) || + (config->has_dies && config->dies =3D=3D 0) || + (config->has_cores && config->cores =3D=3D 0) || + (config->has_threads && config->threads =3D=3D 0) || + (config->has_maxcpus && config->maxcpus =3D=3D 0)) { + error_setg(errp, "CPU topology parameters must be equal to " + "or greater than one if provided"); + goto out_free; + } + mc->smp_parse(ms, config, errp); if (errp) { goto out_free; diff --git a/qapi/machine.json b/qapi/machine.json index c3210ee1fb..9272cb3cf8 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1288,8 +1288,8 @@ ## # @SMPConfiguration: # -# Schema for CPU topology configuration. "0" or a missing value lets -# QEMU figure out a suitable value based on the ones that are provided. +# Schema for CPU topology configuration. A missing value lets QEMU +# figure out a suitable value based on the ones that are provided. # # @cpus: number of virtual CPUs in the virtual machine # @@ -1297,7 +1297,7 @@ # # @dies: number of dies per socket in the CPU topology # -# @cores: number of cores per thread in the CPU topology +# @cores: number of cores per die in the CPU topology # # @threads: number of threads per core in the CPU topology # diff --git a/qemu-options.hx b/qemu-options.hx index 99ed5ec5f1..b0168f8c48 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -223,11 +223,13 @@ SRST of computing the CPU maximum count. =20 Either the initial CPU count, or at least one of the topology paramete= rs - must be specified. Values for any omitted parameters will be computed - from those which are given. Historically preference was given to the - coarsest topology parameters when computing missing values (ie sockets - preferred over cores, which were preferred over threads), however, this - behaviour is considered liable to change. + must be specified. The specified parameters must be equal to or great + than one, explicit configuration like "cpus=3D0" is not allowed. Values + for any omitted parameters will be computed from those which are given. + Historically preference was given to the coarsest topology parameters + when computing missing values (ie sockets preferred over cores, which + were preferred over threads), however, this behaviour is considered + liable to change. ERST =20 DEF("numa", HAS_ARG, QEMU_OPTION_numa, --=20 2.19.1