From patchwork Thu Aug 19 03:10:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "wangyanan (Y)" X-Patchwork-Id: 1518296 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 ozlabs.org (Postfix) with ESMTPS id 4GqqZD08wdz9t0G for ; Thu, 19 Aug 2021 13:12:18 +1000 (AEST) Received: from localhost ([::1]:33670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGYTX-0006Cl-A3 for incoming@patchwork.ozlabs.org; Wed, 18 Aug 2021 23:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGYS8-0006CB-NO for qemu-devel@nongnu.org; Wed, 18 Aug 2021 23:10:48 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:2289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGYS5-0003Oe-PO for qemu-devel@nongnu.org; Wed, 18 Aug 2021 23:10:48 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GqqWj5Xcnz1CY0T; Thu, 19 Aug 2021 11:10:09 +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; Thu, 19 Aug 2021 11:10:34 +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; Thu, 19 Aug 2021 11:10:33 +0800 From: Yanan Wang To: Subject: [PATCH v6 00/16] machine: smp parsing fixes and improvement Date: Thu, 19 Aug 2021 11:10:11 +0800 Message-ID: <20210819031027.41104-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: dggems706-chm.china.huawei.com (10.3.19.183) 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, 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 , Cornelia Huck , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Eduardo Habkost , Pierre Morel , "Michael S . Tsirkin" , Pankaj Gupta , Richard Henderson , Greg Kurz , Halil Pasic , wanghaibin.wang@huawei.com, Thomas Huth , Paolo Bonzini , Yanan Wang , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Rebased on upstream v6.1.0-rc4 with two more patches added. This series introduces some fixes and improvement for the SMP parsing. Behavior of specifying a CPU topology parameter as zero was implicitly allowed but undocumented before, while now it's explicitly deprecated. maxcpus is now uniformly used to calculate the omitted topology members. 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. 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. A unit test for the SMP parsing is added. In the test, all possible collections of the topology parameters and the corresponding expected results are listed, including the valid and invalid ones. The preference of sockets over cores and the preference of cores over sockets, and the support of dies are also taken into consideration. --- Changelogs: v5->v6: - deprecate "parameter=0" SMP configurations (patch #1 and #2 added) - rebased on upstream v6.1.0-rc4 - v6: https://lore.kernel.org/qemu-devel/20210813023912.105880-1-wangyanan55@huawei.com/ v4->v5: - refactor out the duplicated "threads == 0" case in patch #6 (Pankaj) - pick up more R-b tags from v4 (thanks very much for the review!) - v4: https://lore.kernel.org/qemu-devel/20210803080527.156556-1-wangyanan55@huawei.com/ v3->v4: - put all the sanity check into the parser - refine the unit test and add it back to the series - add the R-b/A-b tags for the reviewed/acked patches - v3: https://lore.kernel.org/qemu-devel/20210728034848.75228-1-wangyanan55@huawei.com/ v2->v3: - apply the calculation improvement to smp_parse and pc_smp_parse separately and then convert the finally improved parsers into a generic one, so that patches can be reviewed separately. - to ease review, drop the unit test part for a while until we have a good enough generic parser. - send the patch "machine: Disallow specifying topology parameters as zero" for 6.1 separately. - v2: https://lore.kernel.org/qemu-devel/20210719032043.25416-1-wangyanan55@huawei.com/ v1->v2: - disallow "anything=0" in the smp configuration (Andrew) - make function smp_parse() a generic helper for all arches - improve the error reporting in the parser - start to prefer cores over sockets since 6.2 (Daniel) - add a unit test for the smp parsing (Daniel) - v1: https://lore.kernel.org/qemu-devel/20210702100739.13672-1-wangyanan55@huawei.com/ --- Yanan Wang (16): docs/about/removed-features: Remove duplicated doc about -smp 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 hw: Add compat machines for 6.2 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 machine: Split out the smp parsing code tests/unit: Add a unit test for smp parsing MAINTAINERS | 2 + docs/about/deprecated.rst | 15 + docs/about/removed-features.rst | 21 +- hw/arm/virt.c | 10 +- hw/core/machine-smp.c | 200 ++++++++ hw/core/machine.c | 93 +--- hw/core/meson.build | 1 + hw/i386/pc.c | 66 +-- hw/i386/pc_piix.c | 15 +- hw/i386/pc_q35.c | 14 +- hw/ppc/spapr.c | 16 +- hw/s390x/s390-virtio-ccw.c | 15 +- include/hw/boards.h | 27 +- include/hw/i386/pc.h | 3 + qapi/machine.json | 2 +- qemu-options.hx | 24 +- tests/unit/meson.build | 1 + tests/unit/test-smp-parse.c | 866 ++++++++++++++++++++++++++++++++ 18 files changed, 1205 insertions(+), 186 deletions(-) create mode 100644 hw/core/machine-smp.c create mode 100644 tests/unit/test-smp-parse.c -- 2.19.1