From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:e348:0:0:0:0:0 with SMTP id c8csp405787lfk; Fri, 22 Apr 2022 05:19:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhQ2tUqaE51B2wSOqEacnLOn9ZeRQY6u9FVVj3DdeMES1uViU551MICGg7WkfeJQ07/q+b X-Received: by 2002:a05:620a:280e:b0:680:d1b9:6b0 with SMTP id f14-20020a05620a280e00b00680d1b906b0mr2422181qkp.391.1650629964085; Fri, 22 Apr 2022 05:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650629964; cv=none; d=google.com; s=arc-20160816; b=NJMjfD5YRxPKnv4QP1F4dK5Mi+NoMybRn175IO4PAc1/m0U3EscEX13gU2ZA8/wk0Y r8Jb5q2HqCuPDKoqMCZRbDLkRUOLJvJMza1ZDeNnKHXNc9IECrfc5cSqVB2wMRbpc/+3 +2MukZ5Rw6njqYF5FmxMDHre4+c2uHO8N1UfNSTmu/IzM4bgynbTNUYNvo/JWxSzv3DX /05iMvvmrVGuFv9xz9RLbk2ISm2Inkk563lHsuNjoRs6VzG0U3Ww8LEQOxdPr48Im+3s TRMKmWG//UYfxF/9xP9CZxAPreXxOV5wpLPbv6cHn6kswXNquzf7UTLHVK6rw35woqPR cYIg== 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-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :dkim-signature; bh=w53e7vCKVboYAmSlQP5cjTZ3K1ImtDdfqOY7qpw0MJs=; b=COZ59c0E73gmX5eXY5jhFxQQjkzwEADjQCrD51ULYXJ9ZA31lwDswPBpLdnzVlf3QK 5Hf/7M+EEYNrO0QV6t05HOncU+QrU5SOn6XZTOp/pppZdMpDcYP8lxXZI0QySPeZdYjd SBJ0rEYtQD9mF3ZFFHFxXLNzVy6/b4wk1m0sK+eWu0s4Gn1pEVDXmKSbPWP0TKIXt9ED cHf0G4hstP3EY/YSRRpGG0H8q1LfmrU+B99D/ECzVdvGAq1gRu05M0j+yLiM93WV+UY+ c0QxYID2EJah1Oqb5rVXp7F+lg4Zj6v1S3jRp64wrZ9jhlJnEAnTWEWNTcnnuxSn49+B LF8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=jKh1otUh; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-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 d76-20020a379b4f000000b0069b22f1534asi2067417qke.381.2022.04.22.05.19.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 05:19:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-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=jKh1otUh; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:58954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsFv-00079V-IE for alex.bennee@linaro.org; Fri, 22 Apr 2022 08:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrP4-00019B-K4 for qemu-arm@nongnu.org; Fri, 22 Apr 2022 07:24:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21031) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrP2-0000gr-PO for qemu-arm@nongnu.org; Fri, 22 Apr 2022 07:24:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650626684; 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=w53e7vCKVboYAmSlQP5cjTZ3K1ImtDdfqOY7qpw0MJs=; b=jKh1otUhynPBGPNc7SxSqZHHrmpQg7uBPLeMbjToWVo5E1sk0ZbvhJhoFRuCqRdMoq6A6g 8ChGAcgtomvWIIcsYvjkhJHV2uBh8RzWrYHqT9rUS8v55jDLNgp0tJ1Kn1detGZUw4pZqv jQ5+b7mfaEBMS0ucLhqa5+6jDuYEesQ= 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-167-CQOWBZY4MgiW1nQBa2t-4g-1; Fri, 22 Apr 2022 07:24:40 -0400 X-MC-Unique: CQOWBZY4MgiW1nQBa2t-4g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A8ED101AA42; Fri, 22 Apr 2022 11:24:40 +0000 (UTC) Received: from [10.72.13.230] (ovpn-13-230.pek2.redhat.com [10.72.13.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E24962026985; Fri, 22 Apr 2022 11:24:13 +0000 (UTC) Subject: Re: [PATCH v7 2/4] hw/arm/virt: Consider SMP configuration in CPU topology To: "wangyanan (Y)" , qemu-arm@nongnu.org References: <20220420104909.233058-1-gshan@redhat.com> <20220420104909.233058-3-gshan@redhat.com> <5f104799-20cf-2e2e-9dd8-bfee381ce670@huawei.com> From: Gavin Shan Message-ID: <40db867f-b214-c35c-9de9-eb21243d5089@redhat.com> Date: Fri, 22 Apr 2022 19:24:10 +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: <5f104799-20cf-2e2e-9dd8-bfee381ce670@huawei.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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: lvivier@redhat.com, eduardo@habkost.net, thuth@redhat.com, berrange@redhat.com, peter.maydell@linaro.org, armbru@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, zhenyzha@redhat.com, drjones@redhat.com, pbonzini@redhat.com, shan.gavin@gmail.com, Jonathan.Cameron@Huawei.com, ani@anisinha.ca, imammedo@redhat.com, eblake@redhat.com, f4bug@amsat.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: OSG7q4dNz3aZ Hi Yanan, On 4/21/22 7:50 PM, wangyanan (Y) wrote: > Hi Gavin, > Sorry I missed the v6. No problem at all. thanks for your review again :) > On 2022/4/20 18:49, 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. Besides, the used SMP >> configuration in qtest/numa-test/aarch64_numa_cpu() is corrcted >> to avoid testing failure >> >> Signed-off-by: Gavin Shan >> Reviewed-by: Yanan Wang >> --- >>   hw/arm/virt.c           | 15 ++++++++++++++- >>   tests/qtest/numa-test.c |  3 ++- >>   2 files changed, 16 insertions(+), 2 deletions(-) >> >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index d2e5ecd234..5443ecae92 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,20 @@ 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)); > nit: so the outermost "()" is unnecessary too. It was kept by intention so that it has same style as to other fields like cluster_id. I will remove it in v8 and it doesn't matter actually. >> +        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; >>   } >> diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c >> index 90bf68a5b3..aeda8c774c 100644 >> --- a/tests/qtest/numa-test.c >> +++ b/tests/qtest/numa-test.c >> @@ -223,7 +223,8 @@ static void aarch64_numa_cpu(const void *data) >>       QTestState *qts; >>       g_autofree char *cli = NULL; >> -    cli = make_cli(data, "-machine smp.cpus=2 " >> +    cli = make_cli(data, "-machine " >> +        "smp.cpus=2,smp.sockets=1,smp.clusters=1,smp.cores=1,smp.threads=2 " >>           "-numa node,nodeid=0,memdev=ram -numa node,nodeid=1 " >>           "-numa cpu,node-id=1,thread-id=0 " >>           "-numa cpu,node-id=0,thread-id=1"); As discussed with Igor, the changes to test/qtest/numa-test.c will be split into a separate patch in v8, which goes before this one. I assume your reviewed-by tag is still valid, even for the separate patch. Thanks, Gavin