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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 6AE48C4727E for ; Wed, 23 Sep 2020 09:59:11 +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 17CAD2076A for ; Wed, 23 Sep 2020 09:59:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AVeVeGi5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17CAD2076A 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]:33800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1YM-0003yl-76 for qemu-devel@archiver.kernel.org; Wed, 23 Sep 2020 05:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL1Ul-0000gc-TG for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:55:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL1Uj-0000Do-NQ for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:55:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600854924; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5DeZ7opFeA53u28Lo2SXTMtLy3Dc7rSyC/jKBMrI4S8=; b=AVeVeGi59h5+YMnIVNylMPpU32T752qG9NkZhuiH7lrvhtAp7O5OzBFGOdGzchiSmSl/lg 2r4cL5kTAuMiQ0fLGH85cLU50Lelfwp3gLvBgBDhkukCQm8pk4oRhUIV+lOb9R10Mnn7Mp dWGtdHXk6PjEH+RqiIeeMy/sZ13JSkY= 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-450-lWTxHF3pNJC2RQwv_3HRxA-1; Wed, 23 Sep 2020 05:55:22 -0400 X-MC-Unique: lWTxHF3pNJC2RQwv_3HRxA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0B488030D2; Wed, 23 Sep 2020 09:55:21 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id F282D7881E; Wed, 23 Sep 2020 09:55:13 +0000 (UTC) Date: Wed, 23 Sep 2020 11:55:12 +0200 From: Igor Mammedov To: qemu-devel@nongnu.org Subject: Re: [PATCH v6 11/11] smp: drop support for deprecated (invalid topologies) Message-ID: <20200923115512.1644cd94@redhat.com> In-Reply-To: <20200923094650.1301166-12-imammedo@redhat.com> References: <20200923094650.1301166-1-imammedo@redhat.com> <20200923094650.1301166-12-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 00:53:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: lersek@redhat.com, ankur.a.arora@oracle.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 23 Sep 2020 05:46:50 -0400 Igor Mammedov wrote: > it's was deprecated since 3.1 > > Support for invalid topologies is removed, the user must ensure > that topologies described with -smp include all possible cpus, > i.e. (sockets * cores * threads) == maxcpus or QEMU will > exit with error. ignore this stowaway, it's not part of the series > Signed-off-by: Igor Mammedov > --- > docs/system/deprecated.rst | 26 +++++++++++++------------- > hw/core/machine.c | 16 ++++------------ > hw/i386/pc.c | 16 ++++------------ > 3 files changed, 21 insertions(+), 37 deletions(-) > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index 808c334fe7..fb95d2ecc4 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -47,19 +47,6 @@ The 'file' driver for drives is no longer appropriate for character or host > devices and will only accept regular files (S_IFREG). The correct driver > for these file types is 'host_cdrom' or 'host_device' as appropriate. > > -``-smp`` (invalid topologies) (since 3.1) > -''''''''''''''''''''''''''''''''''''''''' > - > -CPU topology properties should describe whole machine topology including > -possible CPUs. > - > -However, historically it was possible to start QEMU with an incorrect topology > -where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, > -which could lead to an incorrect topology enumeration by the guest. > -Support for invalid topologies will be removed, the user must ensure > -topologies described with -smp include all possible cpus, i.e. > -*sockets* * *cores* * *threads* = *maxcpus*. > - > ``-vnc acl`` (since 4.0.0) > '''''''''''''''''''''''''' > > @@ -642,6 +629,19 @@ New machine versions (since 5.1) will not accept the option but it will still > work with old machine types. User can check the QAPI schema to see if the legacy > option is supported by looking at MachineInfo::numa-mem-supported property. > > +``-smp`` (invalid topologies) (removed 5.2) > +''''''''''''''''''''''''''''''''''''''''''' > + > +CPU topology properties should describe whole machine topology including > +possible CPUs. > + > +However, historically it was possible to start QEMU with an incorrect topology > +where *n* <= *sockets* * *cores* * *threads* < *maxcpus*, > +which could lead to an incorrect topology enumeration by the guest. > +Support for invalid topologies is removed, the user must ensure > +topologies described with -smp include all possible cpus, i.e. > +*sockets* * *cores* * *threads* = *maxcpus*. > + > Block devices > ------------- > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ea26d61237..09aee4ea52 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -754,23 +754,15 @@ static void smp_parse(MachineState *ms, QemuOpts *opts) > exit(1); > } > > - if (sockets * cores * threads > ms->smp.max_cpus) { > - error_report("cpu topology: " > - "sockets (%u) * cores (%u) * threads (%u) > " > - "maxcpus (%u)", > + if (sockets * cores * threads != ms->smp.max_cpus) { > + error_report("Invalid CPU topology: " > + "sockets (%u) * cores (%u) * threads (%u) " > + "!= maxcpus (%u)", > sockets, cores, threads, > ms->smp.max_cpus); > exit(1); > } > > - if (sockets * cores * threads != ms->smp.max_cpus) { > - warn_report("Invalid CPU topology deprecated: " > - "sockets (%u) * cores (%u) * threads (%u) " > - "!= maxcpus (%u)", > - sockets, cores, threads, > - ms->smp.max_cpus); > - } > - > ms->smp.cpus = cpus; > ms->smp.cores = cores; > ms->smp.threads = threads; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 2af660c55e..53e21a186d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -748,23 +748,15 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) > exit(1); > } > > - if (sockets * dies * cores * threads > ms->smp.max_cpus) { > - error_report("cpu topology: " > - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " > - "maxcpus (%u)", > + if (sockets * dies * cores * threads != ms->smp.max_cpus) { > + error_report("Invalid CPU topology deprecated: " > + "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " > + "!= maxcpus (%u)", > sockets, dies, cores, threads, > ms->smp.max_cpus); > exit(1); > } > > - if (sockets * dies * cores * threads != ms->smp.max_cpus) { > - warn_report("Invalid CPU topology deprecated: " > - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " > - "!= maxcpus (%u)", > - sockets, dies, cores, threads, > - ms->smp.max_cpus); > - } > - > ms->smp.cpus = cpus; > ms->smp.cores = cores; > ms->smp.threads = threads;