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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 BDAA2C31E5B for ; Wed, 19 Jun 2019 19:28:44 +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 99BAB2084B for ; Wed, 19 Jun 2019 19:28:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99BAB2084B 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]:41324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdgGB-0007LG-El for qemu-devel@archiver.kernel.org; Wed, 19 Jun 2019 15:28:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49630) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdgD0-0004mr-6E for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdgCw-0004NF-1O for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:25:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdgCq-0004El-NW for qemu-devel@nongnu.org; Wed, 19 Jun 2019 15:25:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1CA5B30C1AD5; Wed, 19 Jun 2019 19:25:09 +0000 (UTC) Received: from localhost (ovpn-116-76.gru2.redhat.com [10.97.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BD685C21E; Wed, 19 Jun 2019 19:25:08 +0000 (UTC) Date: Wed, 19 Jun 2019 16:25:07 -0300 From: Eduardo Habkost To: Like Xu Message-ID: <20190619192507.GF26409@habkost.net> References: <20190612084104.34984-1-like.xu@linux.intel.com> <20190612084104.34984-10-like.xu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190612084104.34984-10-like.xu@linux.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 19 Jun 2019 19:25:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v3 9/9] vl.c: Add -smp, dies=* command line support and update doc 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: Paolo Bonzini , qemu-devel@nongnu.org, "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Jun 12, 2019 at 04:41:04PM +0800, Like Xu wrote: > For PC target, users could configure the number of dies per one package > via command line with this patch, such as "-smp dies=2,cores=4". > > The parsing rules of new cpu-topology model obey the same restrictions/logic > as the legacy socket/core/thread model especially on missing values computing. > > Signed-off-by: Like Xu > --- > hw/i386/pc.c | 32 ++++++++++++++++++-------------- > qemu-options.hx | 17 +++++++++-------- > vl.c | 3 +++ > 3 files changed, 30 insertions(+), 22 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 63b44bd2bd..8a5da4f0c1 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1543,10 +1543,13 @@ static void pc_new_cpu(PCMachineState *pcms, int64_t apic_id, Error **errp) > > void pc_smp_parse(MachineState *ms, QemuOpts *opts) > { > - /* copy it from legacy smp_parse() in vl.c */ > + PCMachineState *pcms = (PCMachineState *) > + object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE); > + Any specific reason for doing this instead of PC_MACHINE(ms)? The rest of the patch looks good. > if (opts) { > unsigned cpus = qemu_opt_get_number(opts, "cpus", 0); > unsigned sockets = qemu_opt_get_number(opts, "sockets", 0); > + unsigned dies = qemu_opt_get_number(opts, "dies", 1); > unsigned cores = qemu_opt_get_number(opts, "cores", 0); > unsigned threads = qemu_opt_get_number(opts, "threads", 0); > > @@ -1556,24 +1559,24 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) > threads = threads > 0 ? threads : 1; > if (cpus == 0) { > sockets = sockets > 0 ? sockets : 1; > - cpus = cores * threads * sockets; > + cpus = cores * threads * dies * sockets; > } else { > ms->smp.max_cpus = > qemu_opt_get_number(opts, "maxcpus", cpus); > - sockets = ms->smp.max_cpus / (cores * threads); > + sockets = ms->smp.max_cpus / (cores * threads * dies); > } > } 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 / (cores * dies * sockets); > threads = threads > 0 ? threads : 1; > - } else if (sockets * cores * threads < cpus) { > + } else if (sockets * dies * cores * threads < cpus) { > error_report("cpu topology: " > - "sockets (%u) * cores (%u) * threads (%u) < " > + "sockets (%u) * dies (%u) * cores (%u) * threads (%u) < " > "smp_cpus (%u)", > - sockets, cores, threads, cpus); > + sockets, dies, cores, threads, cpus); > exit(1); > } > > @@ -1585,26 +1588,27 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) > exit(1); > } > > - if (sockets * cores * threads > ms->smp.max_cpus) { > + if (sockets * dies * cores * threads > ms->smp.max_cpus) { > error_report("cpu topology: " > - "sockets (%u) * cores (%u) * threads (%u) > " > + "sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " > "maxcpus (%u)", > - sockets, cores, threads, > + sockets, dies, cores, threads, > ms->smp.max_cpus); > exit(1); > } > > - if (sockets * cores * threads != ms->smp.max_cpus) { > + if (sockets * dies * cores * threads != ms->smp.max_cpus) { > warn_report("Invalid CPU topology deprecated: " > - "sockets (%u) * cores (%u) * threads (%u) " > + "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " > "!= maxcpus (%u)", > - sockets, cores, threads, > + sockets, dies, cores, threads, > ms->smp.max_cpus); > } > > ms->smp.cpus = cpus; > ms->smp.cores = cores; > ms->smp.threads = threads; > + pcms->smp_dies = dies; > } > > if (ms->smp.cpus > 1) { > diff --git a/qemu-options.hx b/qemu-options.hx > index 0d8beb4afd..a5b314a448 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -138,25 +138,26 @@ no incompatible TCG features have been enabled (e.g. icount/replay). > ETEXI > > DEF("smp", HAS_ARG, QEMU_OPTION_smp, > - "-smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n" > + "-smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,dies=dies][,sockets=sockets]\n" > " set the number of CPUs to 'n' [default=1]\n" > " maxcpus= maximum number of total cpus, including\n" > " offline CPUs for hotplug, etc\n" > - " cores= number of CPU cores on one socket\n" > + " cores= number of CPU cores on one socket (for PC, it's on one die)\n" > " threads= number of threads on one CPU core\n" > + " dies= number of CPU dies on one socket (for PC only)\n" > " sockets= number of discrete sockets in the system\n", > QEMU_ARCH_ALL) > STEXI > -@item -smp [cpus=]@var{n}[,cores=@var{cores}][,threads=@var{threads}][,sockets=@var{sockets}][,maxcpus=@var{maxcpus}] > +@item -smp [cpus=]@var{n}[,cores=@var{cores}][,threads=@var{threads}][,dies=dies][,sockets=@var{sockets}][,maxcpus=@var{maxcpus}] > @findex -smp > Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255 > CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs > to 4. > -For the PC target, the number of @var{cores} per socket, the number > -of @var{threads} per cores and the total number of @var{sockets} can be > -specified. Missing values will be computed. If any on the three values is > -given, the total number of CPUs @var{n} can be omitted. @var{maxcpus} > -specifies the maximum number of hotpluggable CPUs. > +For the PC target, the number of @var{cores} per die, the number of @var{threads} > +per cores, the number of @var{dies} per packages and the total number of > +@var{sockets} can be specified. Missing values will be computed. > +If any on the three values is given, the total number of CPUs @var{n} can be omitted. > +@var{maxcpus} specifies the maximum number of hotpluggable CPUs. > ETEXI > > DEF("numa", HAS_ARG, QEMU_OPTION_numa, > diff --git a/vl.c b/vl.c > index 53ea9b6d6f..c6d1339442 100644 > --- a/vl.c > +++ b/vl.c > @@ -1231,6 +1231,9 @@ static QemuOptsList qemu_smp_opts = { > }, { > .name = "sockets", > .type = QEMU_OPT_NUMBER, > + }, { > + .name = "dies", > + .type = QEMU_OPT_NUMBER, > }, { > .name = "cores", > .type = QEMU_OPT_NUMBER, > -- > 2.21.0 > -- Eduardo