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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 01862C07E95 for ; Tue, 20 Jul 2021 06:58:55 +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 35D126113B for ; Tue, 20 Jul 2021 06:58:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35D126113B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5jiP-0004x7-BU for qemu-devel@archiver.kernel.org; Tue, 20 Jul 2021 02:58:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5jhn-0004IU-3z for qemu-devel@nongnu.org; Tue, 20 Jul 2021 02:58:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5jhi-000563-MD for qemu-devel@nongnu.org; Tue, 20 Jul 2021 02:58:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626764288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YiOeBzVbWMdCazkIOJNcBewfNgxrkfMuFgJ6Dw8Xj5U=; b=T1xy0BqsmDfVa10iQJ2ZsGqXmaTgHFr5LT0r+Wyr45CfwYLwaU23XzWKJIHrOTeZ1gStFZ LbVGDPfDISXqDjbhCRVcwLv0CH6U5R3IrOAIR0LS8SRWFaeUluV7P7NJvKCzuGwV5O/KVI mZWj+ThU8HpUfiz/1h1zVE/M4ga94tc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-s-qfEdvwMneOctbZs8ydGg-1; Tue, 20 Jul 2021 02:58:07 -0400 X-MC-Unique: s-qfEdvwMneOctbZs8ydGg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6FA63100CCC2; Tue, 20 Jul 2021 06:58:05 +0000 (UTC) Received: from localhost (ovpn-112-105.ams2.redhat.com [10.36.112.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9985260938; Tue, 20 Jul 2021 06:58:00 +0000 (UTC) From: Cornelia Huck To: Yanan Wang , qemu-devel@nongnu.org Subject: Re: [PATCH for-6.2 v2 02/11] machine: Make smp_parse generic enough for all arches In-Reply-To: <20210719032043.25416-3-wangyanan55@huawei.com> Organization: Red Hat GmbH References: <20210719032043.25416-1-wangyanan55@huawei.com> <20210719032043.25416-3-wangyanan55@huawei.com> User-Agent: Notmuch/0.32.1 (https://notmuchmail.org) Date: Tue, 20 Jul 2021 08:57:58 +0200 Message-ID: <87zguh8oax.fsf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.469, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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_P_=2E_Berrang=C3=A9?= , Eduardo Habkost , Pierre Morel , "Michael S . Tsirkin" , Richard Henderson , Greg Kurz , Halil Pasic , Paolo Bonzini , Thomas Huth , IgorMammedov , yuzenghui@huawei.com, wanghaibin.wang@huawei.com, Yanan Wang , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Jul 19 2021, Yanan Wang wrote: > Currently the only difference between smp_parse and pc_smp_parse > is the support of multi-dies and the related error reporting code. > With an arch compat variable "bool smp_dies_supported", we can > easily make smp_parse generic enough for all arches and the PC > specific one can be removed. > > Making smp_parse() generic enough can reduce code duplication and > ease the code maintenance, and also allows extending the topology > with more arch specific members (e.g., clusters) in the future. So I guess that should also allow us to include s390x books/drawers? > > No functional change intended. > > Suggested-by: Andrew Jones > Signed-off-by: Yanan Wang > --- > hw/core/machine.c | 28 ++++++++++------- > hw/i386/pc.c | 76 +-------------------------------------------- > include/hw/boards.h | 1 + > 3 files changed, 19 insertions(+), 86 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d73daa10f4..ed6712e964 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -743,6 +743,7 @@ void machine_set_cpu_numa_node(MachineState *machine, > > 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; > @@ -761,7 +762,7 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) > return; > } > > - if (dies > 1) { > + if (!mc->smp_dies_supported && dies > 1) { > error_setg(errp, "dies not supported by this machine's CPU topology"); > return; > } I'm wondering how we should handle parameters that are not supported by a certain machine type. E.g. if we add support for books/drawers, specifying them is unlikely to make sense on anything but s390x. Would we allow to specify books=1 on a non-s390x machine, even though that is quite bogus? Or do we want to disallow setting any parameters that are not supported by the machine type? > @@ -772,23 +773,25 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) > threads = threads > 0 ? threads : 1; > if (cpus == 0) { > sockets = sockets > 0 ? sockets : 1; > - cpus = cores * threads * sockets; > + cpus = sockets * dies * cores * threads; > } else { > maxcpus = maxcpus > 0 ? maxcpus : cpus; > - sockets = maxcpus / (cores * threads); > + sockets = maxcpus / (dies * cores * threads); > } > } else if (cores == 0) { > threads = threads > 0 ? threads : 1; > - cores = cpus / (sockets * threads); > + cores = cpus / (sockets * dies * threads); > cores = cores > 0 ? cores : 1; > } else if (threads == 0) { > - threads = cpus / (cores * sockets); > + threads = cpus / (sockets * dies * cores); > threads = threads > 0 ? threads : 1; > - } else if (sockets * cores * threads < cpus) { > + } else if (sockets * dies * cores * threads < cpus) { > + g_autofree char *dies_msg = g_strdup_printf( > + mc->smp_dies_supported ? " * dies (%u)" : "", dies); > error_setg(errp, "cpu topology: " > - "sockets (%u) * cores (%u) * threads (%u) < " > + "sockets (%u)%s * cores (%u) * threads (%u) < " > "smp_cpus (%u)", > - sockets, cores, threads, cpus); > + sockets, dies_msg, cores, threads, cpus); > return; > } > > @@ -799,17 +802,20 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) > return; > } > > - if (sockets * cores * threads != maxcpus) { > + 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) * cores (%u) * threads (%u) " > + "sockets (%u)%s * cores (%u) * threads (%u) " > "!= maxcpus (%u)", > - sockets, cores, threads, > + sockets, dies_msg, cores, threads, > maxcpus); Similarily here; do we want to mention parameters that are not applicable for the machine type? That might be confusing, but a conditional error message may get too complex if we add some more parameters. > 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/i386/pc.c b/hw/i386/pc.c > index c6b63c00a5..d94ef582b5 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -708,80 +708,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) > } > } > > -/* > - * This function is very similar to smp_parse() > - * in hw/core/machine.c but includes CPU die support. > - */ > -static void pc_smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) > -{ > - 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; > - } > - > - /* compute missing values, prefer sockets over cores over threads */ > - if (cpus == 0 || sockets == 0) { > - cores = cores > 0 ? cores : 1; > - threads = threads > 0 ? threads : 1; > - if (cpus == 0) { > - sockets = sockets > 0 ? sockets : 1; > - cpus = cores * threads * dies * sockets; > - } else { > - maxcpus = maxcpus > 0 ? maxcpus : cpus; > - sockets = maxcpus / (cores * threads * dies); > - } > - } else if (cores == 0) { > - threads = threads > 0 ? threads : 1; > - cores = cpus / (sockets * dies * threads); > - cores = cores > 0 ? cores : 1; > - } else if (threads == 0) { > - threads = cpus / (cores * dies * sockets); > - threads = threads > 0 ? threads : 1; > - } else if (sockets * dies * cores * threads < cpus) { > - error_setg(errp, "cpu topology: " > - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) < " > - "smp_cpus (%u)", > - sockets, dies, cores, threads, cpus); > - return; > - } > - > - maxcpus = maxcpus > 0 ? maxcpus : cpus; > - > - if (maxcpus < cpus) { > - error_setg(errp, "maxcpus must be equal to or greater than smp"); > - return; > - } > - > - if (sockets * dies * cores * threads != maxcpus) { > - error_setg(errp, "Invalid CPU topology deprecated: " > - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " > - "!= maxcpus (%u)", > - sockets, dies, cores, threads, > - maxcpus); > - 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 pc_machine_done(Notifier *notifier, void *data) > { > @@ -1735,7 +1661,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) > mc->auto_enable_numa_with_memdev = true; > mc->has_hotpluggable_cpus = true; > mc->default_boot_order = "cad"; > - mc->smp_parse = pc_smp_parse; We can probably remove smp_parse, and call the generic parser directly? > mc->block_default_type = IF_IDE; > mc->max_cpus = 255; > mc->reset = pc_machine_reset; > @@ -1746,6 +1671,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) > hc->unplug = pc_machine_device_unplug_cb; > mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; > mc->nvdimm_supported = true; > + mc->smp_dies_supported = true; > mc->default_ram_id = "pc.ram"; > > object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size", > diff --git a/include/hw/boards.h b/include/hw/boards.h > index accd6eff35..b6161cee88 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -246,6 +246,7 @@ struct MachineClass { > bool smbus_no_migration_support; > bool nvdimm_supported; > bool numa_mem_supported; > + bool smp_dies_supported; > bool auto_enable_numa; > const char *default_ram_id; > > -- > 2.19.1