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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B0FD5C433F5 for ; Thu, 14 Apr 2022 00:10:43 +0000 (UTC) Received: from localhost ([::1]:42236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nen4M-0002zM-Nm for qemu-devel@archiver.kernel.org; Wed, 13 Apr 2022 20:10:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nen2r-00021l-C3 for qemu-devel@nongnu.org; Wed, 13 Apr 2022 20:09:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:59959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nen2p-0005o1-PC for qemu-devel@nongnu.org; Wed, 13 Apr 2022 20:09:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649894947; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wc8saHFTHDJVGdJxVdnsqOAZ5jFxaUefTb1pve8qx5k=; b=RNmIaWiChaA8gfzeDtTMrMR6ZpTjgtJiwzT0a+4BGJIv6ZSPZlYH+ElDgan25rOfTEUkGY pLNt5f4pXw13EctnhVTs5zYWpwuK4viIT1Q6iCKle1+gLJiis3N8RrpRYaIrpbGzbxLGja HDY40NULead8poLFzXj9Ydt29iVWf9M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-595-KyqlbVgkPR-VagMUtJ-3Uw-1; Wed, 13 Apr 2022 20:09:06 -0400 X-MC-Unique: KyqlbVgkPR-VagMUtJ-3Uw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9AA4318A65B2; Thu, 14 Apr 2022 00:09:05 +0000 (UTC) Received: from [10.72.13.171] (ovpn-13-171.pek2.redhat.com [10.72.13.171]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8FDD32166B4F; Thu, 14 Apr 2022 00:08:56 +0000 (UTC) Subject: Re: [PATCH v5 2/4] hw/arm/virt: Consider SMP configuration in CPU topology To: "wangyanan (Y)" , qemu-arm@nongnu.org References: <20220403145953.10522-1-gshan@redhat.com> <20220403145953.10522-3-gshan@redhat.com> <6f713fec-71e6-3300-a504-817f45a82a51@huawei.com> From: Gavin Shan Message-ID: <27df8771-ebe0-b5fe-39c4-83696e21e3a3@redhat.com> Date: Thu, 14 Apr 2022 08:08:52 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.0 MIME-Version: 1.0 In-Reply-To: <6f713fec-71e6-3300-a504-817f45a82a51@huawei.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gshan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=gshan@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, NICE_REPLY_A=-0.001, 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: Gavin Shan Cc: peter.maydell@linaro.org, drjones@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, zhenyzha@redhat.com, shan.gavin@gmail.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Yanan, On 4/13/22 8:39 PM, wangyanan (Y) wrote: > On 2022/4/3 22:59, 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; > No need for "% ms->smp.sockets". Yeah, lets remove it in v6. >> +        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; >>       } >>       return ms->possible_cpus; >>   } > Otherwise, looks good to me: > Reviewed-by: Yanan Wang > Thanks for your time to review :) Thanks, Gavin