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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, T_HK_NAME_DR,URIBL_BLOCKED,USER_AGENT_MUTT 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 37109C04AAF for ; Tue, 21 May 2019 17:13:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0608F21019 for ; Tue, 21 May 2019 17:13:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0608F21019 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 ([127.0.0.1]:57089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT8KN-0005KQ-7L for qemu-devel@archiver.kernel.org; Tue, 21 May 2019 13:13:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT8Jb-00051x-DK for qemu-devel@nongnu.org; Tue, 21 May 2019 13:12:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hT8Ja-0005ql-8b for qemu-devel@nongnu.org; Tue, 21 May 2019 13:12:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36928) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hT8Ja-0005qM-0V for qemu-devel@nongnu.org; Tue, 21 May 2019 13:12:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BACDA308330B; Tue, 21 May 2019 17:12:36 +0000 (UTC) Received: from work-vm (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E53FE53786; Tue, 21 May 2019 17:12:32 +0000 (UTC) Date: Tue, 21 May 2019 18:12:30 +0100 From: "Dr. David Alan Gilbert" To: Like Xu Message-ID: <20190521171229.GD2824@work-vm> References: <20190520165056.175475-1-like.xu@linux.intel.com> <20190520165056.175475-3-like.xu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520165056.175475-3-like.xu@linux.intel.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 21 May 2019 17:12:37 +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 v2 2/5] i386/cpu: Consolidate die-id validity in smp context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Daniel P =?iso-8859-1?Q?=2E_Berrang=E9?= , Eduardo Habkost , Peter Crosthwaite , Marcelo Tosatti , qemu-devel@nongnu.org, Markus Armbruster , Brice Goglin , Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Like Xu (like.xu@linux.intel.com) wrote: > Following the legacy smp check rules, the die_id validity is added to > the same contexts as leagcy smp variables such as hmp_hotpluggable_cpus(), > machine_set_cpu_numa_node(), cpu_slot_to_string() and pc_cpu_pre_plug(). > > Signed-off-by: Like Xu > --- > hmp.c | 3 +++ > hw/core/machine.c | 12 ++++++++++++ > hw/i386/pc.c | 11 +++++++++++ > 3 files changed, 26 insertions(+) > > diff --git a/hmp.c b/hmp.c > index 56a3ed7375..7deb7b7226 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -3112,6 +3112,9 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) > if (c->has_socket_id) { > monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n", c->socket_id); > } > + if (c->has_die_id) { > + monitor_printf(mon, " die-id: \"%" PRIu64 "\"\n", c->die_id); > + } > if (c->has_core_id) { > monitor_printf(mon, " core-id: \"%" PRIu64 "\"\n", c->core_id); > } > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 5d046a43e3..5116429732 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -659,6 +659,11 @@ void machine_set_cpu_numa_node(MachineState *machine, > return; > } > > + if (props->has_die_id && !slot->props.has_die_id) { > + error_setg(errp, "die-id is not supported"); > + return; > + } > + > /* skip slots with explicit mismatch */ > if (props->has_thread_id && props->thread_id != slot->props.thread_id) { > continue; > @@ -668,6 +673,10 @@ void machine_set_cpu_numa_node(MachineState *machine, > continue; > } > > + if (props->has_die_id && props->die_id != slot->props.die_id) { > + continue; > + } > + > if (props->has_socket_id && props->socket_id != slot->props.socket_id) { > continue; > } > @@ -925,6 +934,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) > if (cpu->props.has_socket_id) { > g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id); > } > + if (cpu->props.has_die_id) { > + g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id); > + } > if (cpu->props.has_core_id) { > if (s->len) { > g_string_append_printf(s, ", "); > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 83ab53c814..00be2463af 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2321,6 +2321,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u", > cpu->socket_id, max_socket); > return; > + } else if (cpu->die_id > max_socket) { > + error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u", > + cpu->die_id, max_socket); > + return; Can you explain why the die_id is related to max_socket? I'd assumed you could have a 2 socket system where each socket has 4 dies. However, for the HMP side of it: Acked-by: Dr. David Alan Gilbert > } > if (cpu->core_id < 0) { > error_setg(errp, "CPU core-id is not set"); > @@ -2378,6 +2382,13 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > } > cpu->socket_id = topo.pkg_id; > > + if (cpu->die_id != -1 && cpu->die_id != topo.die_id) { > + error_setg(errp, "property die-id: %u doesn't match set apic-id:" > + " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo.die_id); > + return; > + } > + cpu->die_id = topo.die_id; > + > if (cpu->core_id != -1 && cpu->core_id != topo.core_id) { > error_setg(errp, "property core-id: %u doesn't match set apic-id:" > " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id, topo.core_id); > -- > 2.21.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK