From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:6a18:0:0:0:0:0 with SMTP id u24csp32230lfu; Mon, 4 Apr 2022 01:41:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyo3e4WeksgOiINEP7rWQrC7PZUOwkthpEC84YE+gp+GIz3lfosX50T60FMSZ1/t470o43S X-Received: by 2002:ac8:5e11:0:b0:2e1:e8fa:fd15 with SMTP id h17-20020ac85e11000000b002e1e8fafd15mr16205513qtx.154.1649061687224; Mon, 04 Apr 2022 01:41:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649061687; cv=none; d=google.com; s=arc-20160816; b=VJpM/436Jar6wK8YE68YFbOEyNkg3Z7DV1UexuAkLRk/XzAOpd0Y4shBy5kqnASMhq 4k5wzwmb50PpcbufDePWHzmft6zsMR8/77rICly+yX7OKCt1RQcK/WgenuLE5olD8dlW G4raavGSerQo5Jx6lSLfNeJYXwYGQsIG095MYYzMlE1/3Xs/FZVtLAocuQdEznHwgyo6 wtDfKlJTQvKROgvS1D3qUTrSFyG8OT/BLLGMZK3vC0lltr5ygUgRh0J5qeWGXP5P3JqZ F8rEYxT2nJ22/rLmjXBcNd9SMiDBGKFK8yhVm5qVFbnk8nVngtBQXcHYj/jYH8sMopx+ miAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:user-agent:in-reply-to:mime-version:references :message-id:subject:to:from:date:dkim-signature; bh=ehXtZsbWoUI40PUd11ymJ9Gansko/eBezW/nd3T/vz0=; b=AREY372ykHWx3U3zNUSFhUFV/qfvW1YJF16mzsTG8gItuXmJxCimgqI7JT4a2VHOkT Nch26Llad8FPVR+TEQaRBqiLWc5X95RyYGkcTEqq2bZIOfSAKfBBl57T+URmjt4CZHby NMV2J9ZvEWUWaD8aIP5ARQ2M4QvC78ua+yk95AsHOcuDYUs2Om+ZlGKKqrseKx+j58cy /3KwHXA7EbKTIY7flzk9kimmk9D6VhYWPKRMepl6cdaPy7NDK5hQ9wT+kC/J3crR5JZZ zHfvpVLWXRcS8UdtrFkDLVwYMGWwgDtHyNUS7XJboPhdIsYLWfDEW1DNTSXW/0SdHIE7 eWIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Jtod2Epv; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f64-20020a379c43000000b006809cbf08c9si2872388qke.58.2022.04.04.01.41.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Apr 2022 01:41:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Jtod2Epv; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:58440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbIH8-0007KH-LD for alex.bennee@linaro.org; Mon, 04 Apr 2022 04:41:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbIFg-0006ME-4n for qemu-devel@nongnu.org; Mon, 04 Apr 2022 04:39:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbIFa-0000DP-Co for qemu-devel@nongnu.org; Mon, 04 Apr 2022 04:39:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649061589; h=from:from:reply-to: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=ehXtZsbWoUI40PUd11ymJ9Gansko/eBezW/nd3T/vz0=; b=Jtod2EpvRsZAQ+s9JWE4xIXHdghCoN/R+50Lqy+yXORcajR+aiHHDFAWzWACO/eQlMV3+g xHuo3G9+FPYg21zfh57vO/0AREWvHHB3vUKu/wmB2b/cjCRejeEzB97ftFZPCH6HocydbR U3bFHx5IClndFJXEtNQke/5crKe61LA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-9wSUM1RBNcGTrC1mFAoyyA-1; Mon, 04 Apr 2022 04:39:49 -0400 X-MC-Unique: 9wSUM1RBNcGTrC1mFAoyyA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D7CB3841D26; Mon, 4 Apr 2022 08:39:47 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.158]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B097C65751; Mon, 4 Apr 2022 08:39:39 +0000 (UTC) Date: Mon, 4 Apr 2022 09:39:36 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Gavin Shan Subject: Re: [PATCH v5 2/4] hw/arm/virt: Consider SMP configuration in CPU topology Message-ID: References: <20220403145953.10522-1-gshan@redhat.com> <20220403145953.10522-3-gshan@redhat.com> MIME-Version: 1.0 In-Reply-To: <20220403145953.10522-3-gshan@redhat.com> User-Agent: Mutt/2.1.5 (2021-12-30) X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: peter.maydell@linaro.org, drjones@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, zhenyzha@redhat.com, wangyanan55@huawei.com, qemu-arm@nongnu.org, shan.gavin@gmail.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: DInE02vq1AS4 On Sun, Apr 03, 2022 at 10:59:51PM +0800, Gavin Shan wrote: > Currently, the SMP configuration isn't considered when the CPU > topology is populated. In this case, it's impossible to provide > the default CPU-to-NUMA mapping or association based on the socket > ID of the given CPU. > > This takes account of SMP configuration when the CPU topology > is populated. The die ID for the given CPU isn't assigned since > it's not supported on arm/virt machine yet. > > Signed-off-by: Gavin Shan > --- > hw/arm/virt.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d2e5ecd234..3174526730 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2505,6 +2505,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms) > int n; > unsigned int max_cpus = ms->smp.max_cpus; > VirtMachineState *vms = VIRT_MACHINE(ms); > + MachineClass *mc = MACHINE_GET_CLASS(vms); > > if (ms->possible_cpus) { > assert(ms->possible_cpus->len == max_cpus); > @@ -2518,8 +2519,21 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms) > ms->possible_cpus->cpus[n].type = ms->cpu_type; > ms->possible_cpus->cpus[n].arch_id = > virt_cpu_mp_affinity(vms, n); > + > + assert(!mc->smp_props.dies_supported); > + ms->possible_cpus->cpus[n].props.has_socket_id = true; > + ms->possible_cpus->cpus[n].props.socket_id = > + (n / (ms->smp.clusters * ms->smp.cores * ms->smp.threads)) % > + ms->smp.sockets; > + ms->possible_cpus->cpus[n].props.has_cluster_id = true; > + ms->possible_cpus->cpus[n].props.cluster_id = > + (n / (ms->smp.cores * ms->smp.threads)) % ms->smp.clusters; > + ms->possible_cpus->cpus[n].props.has_core_id = true; > + ms->possible_cpus->cpus[n].props.core_id = > + (n / ms->smp.threads) % ms->smp.cores; > ms->possible_cpus->cpus[n].props.has_thread_id = true; > - ms->possible_cpus->cpus[n].props.thread_id = n; > + ms->possible_cpus->cpus[n].props.thread_id = > + n % ms->smp.threads; Does this need to be conditionalized d behind a machine property, so that we don't change behaviour of existing machine type versions ? With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|