From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12341C63793 for ; Thu, 22 Jul 2021 14:30:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 00A9A61264 for ; Thu, 22 Jul 2021 14:30:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00A9A61264 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6ZiT-0002yd-Uv for qemu-devel@archiver.kernel.org; Thu, 22 Jul 2021 10:30:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6Zhh-0002Jd-15 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 10:29:37 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6Zhd-0000Uo-NH for qemu-devel@nongnu.org; Thu, 22 Jul 2021 10:29:36 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GVvrT5xX0zcgtG; Thu, 22 Jul 2021 22:26:01 +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, 22 Jul 2021 22:29:25 +0800 Received: from [10.174.187.128] (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_CBC_SHA256) id 15.1.2176.2; Thu, 22 Jul 2021 22:29:24 +0800 Subject: Re: [PATCH for-6.2 v2 10/11] machine: Split out the smp parsing code To: Andrew Jones References: <20210719032043.25416-1-wangyanan55@huawei.com> <20210719032043.25416-11-wangyanan55@huawei.com> <20210719172009.yujvlk4mu2xcl25g@gator> <20210722130752.6yl64tkfmtl4ruq6@gator> From: "wangyanan (Y)" Message-ID: <5b873c72-b38b-ed5f-4a3d-8bdb8edc2af1@huawei.com> Date: Thu, 22 Jul 2021 22:29:24 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210722130752.6yl64tkfmtl4ruq6@gator> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggeme716-chm.china.huawei.com (10.1.199.112) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.188; envelope-from=wangyanan55@huawei.com; helo=szxga02-in.huawei.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.203, 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 , Thomas Huth , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Eduardo Habkost , "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, Richard Henderson , qemu-devel@nongnu.org, Greg Kurz , Halil Pasic , Igor Mammedov , yuzenghui@huawei.com, Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2021/7/22 21:07, Andrew Jones wrote: > On Thu, Jul 22, 2021 at 02:24:03PM +0800, wangyanan (Y) wrote: >> On 2021/7/20 1:20, Andrew Jones wrote: >>> On Mon, Jul 19, 2021 at 11:20:42AM +0800, Yanan Wang wrote: >>>> We are going to introduce an unit test for the parser smp_parse() >>>> in hw/core/machine.c, but now machine.c is only built in softmmu. >>>> >>>> In order to solve the build dependency on the smp parsing code and >>>> avoid building unrelated stuff for the unit tests, move the related >>>> code from machine.c into a new common file, i.e., machine-smp.c. >>>> >>>> Signed-off-by: Yanan Wang >>>> --- >>>> MAINTAINERS | 1 + >>>> hw/core/machine-smp.c | 124 ++++++++++++++++++++++++++++++++++++++++++ >>>> hw/core/machine.c | 109 ------------------------------------- >>>> hw/core/meson.build | 1 + >>>> include/hw/boards.h | 1 + >>>> 5 files changed, 127 insertions(+), 109 deletions(-) >>>> create mode 100644 hw/core/machine-smp.c >>>> >>>> diff --git a/MAINTAINERS b/MAINTAINERS >>>> index 9100f9a043..70633e3bf4 100644 >>>> --- a/MAINTAINERS >>>> +++ b/MAINTAINERS >>>> @@ -1626,6 +1626,7 @@ F: cpu.c >>>> F: hw/core/cpu.c >>>> F: hw/core/machine-qmp-cmds.c >>>> F: hw/core/machine.c >>>> +F: hw/core/machine-smp.c > I just noticed that the spacing in this change might not be right. Right, will fix it. >>>> F: hw/core/null-machine.c >>>> F: hw/core/numa.c >>>> F: hw/cpu/cluster.c >>>> diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c >>>> new file mode 100644 >>>> index 0000000000..6a00cfe44a >>>> --- /dev/null >>>> +++ b/hw/core/machine-smp.c >>>> @@ -0,0 +1,124 @@ >>>> +/* >>>> + * QEMU Machine (related to SMP configuration) >>>> + * >>>> + * Copyright (C) 2014 Red Hat Inc >>>> + * >>>> + * Authors: >>>> + * Marcel Apfelbaum >>> This header was obviously copy+pasted without being updated. >> Yes, the header was kept unchanged. >> >> But actually I'm not completely sure which field should be updated. :) >> Should I add "Copyright (C) 2021, Huawei, Inc." and also the authorship >> "Yanan Wang " behind the existing ones >> or just replace them? > I see what you were attempting to do now. You were deriving this new work > (a source file) from an existing work and you wanted to preserve the > original copyright and authorship. It's not so simple with these types of > projects though. In this case, smp_parse wasn't even part of the original > machine.c file (it came over with commit 6f479566a87d). I think it's > pretty common for these projects to just put whatever your preferred > (or your employer's preferred) copyright/authorship on new files. So, I'd > just replace the fields. I see, will have some update. Thanks, Yanan > I'm interested in what others have to say about this though. > > Thanks, > drew > > >>>> + * >>>> + * This work is licensed under the terms of the GNU GPL, version 2 or later. >>>> + * See the COPYING file in the top-level directory. >>>> + */ >>>> + >>>> +#include "qemu/osdep.h" >>>> +#include "hw/boards.h" >>>> +#include "qapi/error.h" >>>> + >>>> +/* >>>> + * smp_parse - Generic function used to parse the given SMP configuration >>>> + * >>>> + * The topology parameters must be specified equal to or great than one >>>> + * or just omitted, explicit configuration like "cpus=0" is not allowed. >>>> + * The omitted parameters will be calculated based on the provided ones. >>>> + * >>>> + * maxcpus will default to the value of cpus if omitted and will be used >>>> + * to compute the missing sockets/cores/threads. cpus will be calculated >>>> + * from the computed parametrs if omitted. >>>> + * >>>> + * In calculation of omitted arch-netural sockets/cores/threads, we prefer >>>> + * sockets over cores over threads before 6.2, while prefer cores over >>>> + * sockets over threads since 6.2 on. The arch-specific dies will directly >>>> + * default to 1 if omitted. >>>> + */ >>>> +void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) >>>> +{ >>>> + MachineClass *mc = MACHINE_GET_CLASS(ms); >>>> + unsigned cpus = config->has_cpus ? config->cpus : 0; >>>> + unsigned sockets = config->has_sockets ? config->sockets : 0; >>>> + unsigned dies = config->has_dies ? config->dies : 1; >>>> + unsigned cores = config->has_cores ? config->cores : 0; >>>> + unsigned threads = config->has_threads ? config->threads : 0; >>>> + unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0; >>>> + >>>> + if ((config->has_cpus && config->cpus == 0) || >>>> + (config->has_sockets && config->sockets == 0) || >>>> + (config->has_dies && config->dies == 0) || >>>> + (config->has_cores && config->cores == 0) || >>>> + (config->has_threads && config->threads == 0) || >>>> + (config->has_maxcpus && config->maxcpus == 0)) { >>>> + error_setg(errp, "parameters must be equal to or greater than one" >>>> + "if provided"); >>>> + return; >>>> + } >>>> + >>>> + if (!mc->smp_dies_supported && dies > 1) { >>>> + error_setg(errp, "dies not supported by this machine's CPU topology"); >>>> + return; >>>> + } >>>> + >>>> + maxcpus = maxcpus > 0 ? maxcpus : cpus; >>>> + >>>> + /* prefer sockets over cores over threads before 6.2 */ >>>> + if (mc->smp_prefer_sockets) { >>>> + if (sockets == 0) { >>>> + cores = cores > 0 ? cores : 1; >>>> + threads = threads > 0 ? threads : 1; >>>> + sockets = maxcpus / (dies * cores * threads); >>>> + sockets = sockets > 0 ? sockets : 1; >>>> + } else if (cores == 0) { >>>> + threads = threads > 0 ? threads : 1; >>>> + cores = maxcpus / (sockets * dies * threads); >>>> + cores = cores > 0 ? cores : 1; >>>> + } else if (threads == 0) { >>>> + threads = maxcpus / (sockets * dies * cores); >>>> + threads = threads > 0 ? threads : 1; >>>> + } >>>> + /* prefer cores over sockets over threads since 6.2 */ >>>> + } else { >>>> + if (cores == 0) { >>>> + sockets = sockets > 0 ? sockets : 1; >>>> + threads = threads > 0 ? threads : 1; >>>> + cores = maxcpus / (sockets * dies * threads); >>>> + cores = cores > 0 ? cores : 1; >>>> + } else if (sockets == 0) { >>>> + threads = threads > 0 ? threads : 1; >>>> + sockets = maxcpus / (dies * cores * threads); >>>> + sockets = sockets > 0 ? sockets : 1; >>>> + } else if (threads == 0) { >>>> + threads = maxcpus / (sockets * dies * cores); >>>> + threads = threads > 0 ? threads : 1; >>>> + } >>>> + } >>>> + >>>> + /* use the computed parameters to calculate the omitted cpus */ >>>> + cpus = cpus > 0 ? cpus : sockets * dies * cores * threads; >>>> + maxcpus = maxcpus > 0 ? maxcpus : cpus; >>>> + >>>> + if (sockets * dies * cores * threads != maxcpus) { >>>> + g_autofree char *dies_msg = g_strdup_printf( >>>> + mc->smp_dies_supported ? " * dies (%u)" : "", dies); >>>> + error_setg(errp, "Invalid CPU topology: " >>>> + "sockets (%u)%s * cores (%u) * threads (%u) " >>>> + "!= maxcpus (%u)", >>>> + sockets, dies_msg, cores, threads, >>>> + maxcpus); >>>> + return; >>>> + } >>>> + >>>> + if (sockets * dies * cores * threads < cpus) { >>>> + g_autofree char *dies_msg = g_strdup_printf( >>>> + mc->smp_dies_supported ? " * dies (%u)" : "", dies); >>>> + error_setg(errp, "Invalid CPU topology: " >>>> + "sockets (%u)%s * cores (%u) * threads (%u) < " >>>> + "smp_cpus (%u)", >>>> + sockets, dies_msg, cores, threads, cpus); >>>> + return; >>>> + } >>>> + >>>> + ms->smp.cpus = cpus; >>>> + ms->smp.sockets = sockets; >>>> + ms->smp.dies = dies; >>>> + ms->smp.cores = cores; >>>> + ms->smp.threads = threads; >>>> + ms->smp.max_cpus = maxcpus; >>>> +} >>>> diff --git a/hw/core/machine.c b/hw/core/machine.c >>>> index 9d24b67ef3..61be266b6c 100644 >>>> --- a/hw/core/machine.c >>>> +++ b/hw/core/machine.c >>>> @@ -744,115 +744,6 @@ void machine_set_cpu_numa_node(MachineState *machine, >>>> } >>>> } >>>> -/* >>>> - * smp_parse - Generic function used to parse the given SMP configuration >>>> - * >>>> - * The topology parameters must be specified equal to or great than one >>>> - * or just omitted, explicit configuration like "cpus=0" is not allowed. >>>> - * The omitted parameters will be calculated based on the provided ones. >>>> - * >>>> - * maxcpus will default to the value of cpus if omitted and will be used >>>> - * to compute the missing sockets/cores/threads. cpus will be calculated >>>> - * from the computed parametrs if omitted. >>>> - * >>>> - * In calculation of omitted arch-netural sockets/cores/threads, we prefer >>>> - * sockets over cores over threads before 6.2, while prefer cores over >>>> - * sockets over threads since 6.2 on. The arch-specific dies will directly >>>> - * default to 1 if omitted. >>>> - */ >>>> -static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) >>>> -{ >>>> - MachineClass *mc = MACHINE_GET_CLASS(ms); >>>> - unsigned cpus = config->has_cpus ? config->cpus : 0; >>>> - unsigned sockets = config->has_sockets ? config->sockets : 0; >>>> - unsigned dies = config->has_dies ? config->dies : 1; >>>> - unsigned cores = config->has_cores ? config->cores : 0; >>>> - unsigned threads = config->has_threads ? config->threads : 0; >>>> - unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0; >>>> - >>>> - if ((config->has_cpus && config->cpus == 0) || >>>> - (config->has_sockets && config->sockets == 0) || >>>> - (config->has_dies && config->dies == 0) || >>>> - (config->has_cores && config->cores == 0) || >>>> - (config->has_threads && config->threads == 0) || >>>> - (config->has_maxcpus && config->maxcpus == 0)) { >>>> - error_setg(errp, "parameters must be equal to or greater than one" >>>> - "if provided"); >>>> - return; >>>> - } >>>> - >>>> - if (!mc->smp_dies_supported && dies > 1) { >>>> - error_setg(errp, "dies not supported by this machine's CPU topology"); >>>> - return; >>>> - } >>>> - >>>> - maxcpus = maxcpus > 0 ? maxcpus : cpus; >>>> - >>>> - /* prefer sockets over cores over threads before 6.2 */ >>>> - if (mc->smp_prefer_sockets) { >>>> - if (sockets == 0) { >>>> - cores = cores > 0 ? cores : 1; >>>> - threads = threads > 0 ? threads : 1; >>>> - sockets = maxcpus / (dies * cores * threads); >>>> - sockets = sockets > 0 ? sockets : 1; >>>> - } else if (cores == 0) { >>>> - threads = threads > 0 ? threads : 1; >>>> - cores = maxcpus / (sockets * dies * threads); >>>> - cores = cores > 0 ? cores : 1; >>>> - } else if (threads == 0) { >>>> - threads = maxcpus / (sockets * dies * cores); >>>> - threads = threads > 0 ? threads : 1; >>>> - } >>>> - /* prefer cores over sockets over threads since 6.2 */ >>>> - } else { >>>> - if (cores == 0) { >>>> - sockets = sockets > 0 ? sockets : 1; >>>> - threads = threads > 0 ? threads : 1; >>>> - cores = maxcpus / (sockets * dies * threads); >>>> - cores = cores > 0 ? cores : 1; >>>> - } else if (sockets == 0) { >>>> - threads = threads > 0 ? threads : 1; >>>> - sockets = maxcpus / (dies * cores * threads); >>>> - sockets = sockets > 0 ? sockets : 1; >>>> - } else if (threads == 0) { >>>> - threads = maxcpus / (sockets * dies * cores); >>>> - threads = threads > 0 ? threads : 1; >>>> - } >>>> - } >>>> - >>>> - /* use the computed parameters to calculate the omitted cpus */ >>>> - cpus = cpus > 0 ? cpus : sockets * dies * cores * threads; >>>> - maxcpus = maxcpus > 0 ? maxcpus : cpus; >>>> - >>>> - if (sockets * dies * cores * threads != maxcpus) { >>>> - g_autofree char *dies_msg = g_strdup_printf( >>>> - mc->smp_dies_supported ? " * dies (%u)" : "", dies); >>>> - error_setg(errp, "Invalid CPU topology: " >>>> - "sockets (%u)%s * cores (%u) * threads (%u) " >>>> - "!= maxcpus (%u)", >>>> - sockets, dies_msg, cores, threads, >>>> - maxcpus); >>>> - return; >>>> - } >>>> - >>>> - if (sockets * dies * cores * threads < cpus) { >>>> - g_autofree char *dies_msg = g_strdup_printf( >>>> - mc->smp_dies_supported ? " * dies (%u)" : "", dies); >>>> - error_setg(errp, "Invalid CPU topology: " >>>> - "sockets (%u)%s * cores (%u) * threads (%u) < " >>>> - "smp_cpus (%u)", >>>> - sockets, dies_msg, cores, threads, cpus); >>>> - return; >>>> - } >>>> - >>>> - ms->smp.cpus = cpus; >>>> - ms->smp.sockets = sockets; >>>> - ms->smp.dies = dies; >>>> - ms->smp.cores = cores; >>>> - ms->smp.threads = threads; >>>> - ms->smp.max_cpus = maxcpus; >>>> -} >>>> - >>>> static void machine_get_smp(Object *obj, Visitor *v, const char *name, >>>> void *opaque, Error **errp) >>>> { >>>> diff --git a/hw/core/meson.build b/hw/core/meson.build >>>> index 18f44fb7c2..6d727c7742 100644 >>>> --- a/hw/core/meson.build >>>> +++ b/hw/core/meson.build >>>> @@ -14,6 +14,7 @@ hwcore_files = files( >>>> ) >>>> common_ss.add(files('cpu-common.c')) >>>> +common_ss.add(files('machine-smp.c')) >>>> common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) >>>> common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) >>>> common_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) >>>> diff --git a/include/hw/boards.h b/include/hw/boards.h >>>> index 12ab0f5968..071eec1e74 100644 >>>> --- a/include/hw/boards.h >>>> +++ b/include/hw/boards.h >>>> @@ -34,6 +34,7 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine); >>>> void machine_set_cpu_numa_node(MachineState *machine, >>>> const CpuInstanceProperties *props, >>>> Error **errp); >>>> +void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp); >>>> /** >>>> * machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices >>>> -- >>>> 2.19.1 >>>> >>> Otherwise >>> >>> Reviewed-by: Andrew Jones >>> >> Thanks, >> Yanan >> . >> > .