From patchwork Tue Sep 28 03:57:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "wangyanan (Y)" X-Patchwork-Id: 1533689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJQk04Wg4z9t1C for ; Tue, 28 Sep 2021 13:59:20 +1000 (AEST) Received: from localhost ([::1]:33264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV4H0-0002dU-D4 for incoming@patchwork.ozlabs.org; Mon, 27 Sep 2021 23:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV4Fr-0000rG-TM; Mon, 27 Sep 2021 23:58:07 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:2868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV4Fo-00029M-H3; Mon, 27 Sep 2021 23:58:07 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4HJQfw2P0Dz1DHLl; Tue, 28 Sep 2021 11:56:40 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 28 Sep 2021 11:57:57 +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.2308.8; Tue, 28 Sep 2021 11:57:56 +0800 From: Yanan Wang To: Eduardo Habkost , Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Andrew Jones Subject: [PATCH v11 00/14] machine: smp parsing fixes and improvement Date: Tue, 28 Sep 2021 11:57:41 +0800 Message-ID: <20210928035755.11684-1-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected 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 , Pierre Morel , Pankaj Gupta , Cornelia Huck , qemu-devel@nongnu.org, Yanan Wang , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hi, This is a new version (v11) with some update in patch 11/14 suggested by Daniel. Please have another look, Thanks! Summary of v11: 1) Specifying a CPU topology parameter as zero was implicitly allowed but undocumented before, while now it's explicitly deprecated. 2) Refactor/fixes of the smp parsers. 3) For consistency, maxcpus is now uniformly used to calculate the omitted topology members. 4) Improve the error reporting of the parsers. 5) It's also suggested that we should start to prefer cores over sockets over threads on the newer machine types, which will make the computed virtual topology more reflective of the real hardware. Related discussion can be found in [1]. [1] https://lore.kernel.org/qemu-devel/YNIgInK00yNNI4Dy@redhat.com/ 6) In order to reduce code duplication and ease the code maintenance, smp_parse() is converted into a generic enough parser for all arches, so that the arch-specific ones (e.g. pc_smp_parse) can be removed. It's also convenient to introduce more topology members to the generic parser in the future. Related discussions can be found in [2] and [3]. [2] https://lore.kernel.org/qemu-devel/20210630115602.txmvmfe2jrzu7o67@gator.home/ [3] https://lore.kernel.org/qemu-devel/YPFN83pKBt7F97kW@redhat.com/ Changelogs: v10->v11: - only update patch 11/14 use GString APIs to build the cpu topology hierarchy string (Daniel) refine the comments of smp_parse() - v10: https://lore.kernel.org/qemu-devel/20210926084541.17352-1-wangyanan55@huawei.com/ v9->v10: - rebased on latest upstream commit 11a1199846. there is no change of the patches in v10, except minor update in 08/14 to resolve merge conflict with master. - To make this series more acceptable, drop the last two patches about SMP unit test, since the scalability of the test is not optimally designed after rethinking of it. So I will resend the test related patches separately after refining them. - v9: https://lore.kernel.org/qemu-devel/20210910073025.16480-1-wangyanan55@huawei.com/ Yanan Wang (14): machine: Deprecate "parameter=0" SMP configurations machine: Minor refactor/fix for the smp parsers machine: Uniformly use maxcpus to calculate the omitted parameters machine: Set the value of cpus to match maxcpus if it's omitted machine: Improve the error reporting of smp parsing qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split machine: Prefer cores over sockets in smp parsing since 6.2 machine: Use ms instead of global current_machine in sanity-check machine: Tweak the order of topology members in struct CpuTopology machine: Make smp_parse generic enough for all arches machine: Remove smp_parse callback from MachineClass machine: Move smp_prefer_sockets to struct SMPCompatProps machine: Put all sanity-check in the generic SMP parser docs/about/deprecated.rst | 15 +++ hw/arm/virt.c | 1 + hw/core/machine.c | 195 ++++++++++++++++++++++++++----------- hw/i386/pc.c | 63 +----------- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + include/hw/boards.h | 23 +++-- qapi/machine.json | 2 +- qemu-options.hx | 24 +++-- tests/qtest/numa-test.c | 6 +- 12 files changed, 195 insertions(+), 138 deletions(-) --- 2.19.1