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 15143C433EF for ; Thu, 14 Apr 2022 07:47:42 +0000 (UTC) Received: from localhost ([::1]:50488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neuCb-000887-3V for qemu-devel@archiver.kernel.org; Thu, 14 Apr 2022 03:47:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neuB4-0007D9-SP for qemu-devel@nongnu.org; Thu, 14 Apr 2022 03:46:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:43708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neuB2-00082i-KP for qemu-devel@nongnu.org; Thu, 14 Apr 2022 03:46:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649922363; 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=lmHF9vnVIFh9savDjiiWs4qWFwScQIi2/s1pB0gNzlc=; b=a7wKQh4PezSN7X+Cb5yWAihZUul6P8dYkNkZT4hn4zvCMmMMC57qsdoxXC9/X/EVTLPYhD yIHmgJPLFL/rCvWKvQ8+lhIt8iNnZI9JCIkwHdQ1yqVT5tlqSBmks66IfDT+fAIUN1p3+f LH6n+wl6UrRiJ7ctKeHUZdzCbwZ67wY= 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-495-W-65vpJtMwuw_Evnyp7Ntw-1; Thu, 14 Apr 2022 03:45:53 -0400 X-MC-Unique: W-65vpJtMwuw_Evnyp7Ntw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BEEB2296A614; Thu, 14 Apr 2022 07:45:52 +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 67B0A401E65; Thu, 14 Apr 2022 07:45:48 +0000 (UTC) Subject: Re: [PATCH v5 4/4] hw/acpi/aml-build: Use existing CPU topology to build PPTT table To: "wangyanan (Y)" , qemu-arm@nongnu.org References: <20220403145953.10522-1-gshan@redhat.com> <20220403145953.10522-5-gshan@redhat.com> From: Gavin Shan Message-ID: <6dfb4635-bf26-e337-742c-691077f7c24b@redhat.com> Date: Thu, 14 Apr 2022 15:45:45 +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: X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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/14/22 11:09 AM, wangyanan (Y) wrote: > On 2022/4/3 22:59, Gavin Shan wrote: >> When the PPTT table is built, the CPU topology is re-calculated, but >> it's unecessary because the CPU topology has been populated in >> virt_possible_cpu_arch_ids() on arm/virt machine. >> >> This reworks build_pptt() to avoid by reusing the existing one in >> ms->possible_cpus. Currently, the only user of build_pptt() is >> arm/virt machine. >> >> Signed-off-by: Gavin Shan >> --- >>   hw/acpi/aml-build.c | 100 +++++++++++++++++--------------------------- >>   1 file changed, 38 insertions(+), 62 deletions(-) >> >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 4086879ebf..4b0f9df3e3 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -2002,86 +2002,62 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms, >>                   const char *oem_id, const char *oem_table_id) >>   { >>       MachineClass *mc = MACHINE_GET_CLASS(ms); >> -    GQueue *list = g_queue_new(); >> -    guint pptt_start = table_data->len; >> -    guint parent_offset; >> -    guint length, i; >> -    int uid = 0; >> -    int socket; >> +    CPUArchIdList *cpus = ms->possible_cpus; >> +    int64_t socket_id = -1, cluster_id = -1, core_id = -1; > nit: why not using "int" for the ID variables? (to be consistent with how > the IDs are stored in CpuInstanceProperties). > They're actually "int64_t". CPUInstanceProperty is declared in qemu/build/qapi/qapi-types-machine.h like below: struct CpuInstanceProperties { bool has_node_id; int64_t node_id; bool has_socket_id; int64_t socket_id; bool has_die_id; int64_t die_id; bool has_cluster_id; int64_t cluster_id; bool has_core_id; int64_t core_id; bool has_thread_id; int64_t thread_id; }; I doubt if we're using same configurations to build QEMU. I use the following one: configure_qemu() { ./configure --target-list=aarch64-softmmu --enable-numa \ --enable-debug --disable-werror --enable-fdt --enable-kvm \ --disable-mpath --disable-xen --disable-vnc --disable-docs \ --python=/usr/bin/python3 $@ } >> +    uint32_t socket_offset, cluster_offset, core_offset; >> +    uint32_t pptt_start = table_data->len; >> +    int n; >>       AcpiTable table = { .sig = "PPTT", .rev = 2, >>                           .oem_id = oem_id, .oem_table_id = oem_table_id }; >>       acpi_table_begin(&table, table_data); >> -    for (socket = 0; socket < ms->smp.sockets; socket++) { >> -        g_queue_push_tail(list, >> -            GUINT_TO_POINTER(table_data->len - pptt_start)); >> -        build_processor_hierarchy_node( >> -            table_data, >> -            /* >> -             * Physical package - represents the boundary >> -             * of a physical package >> -             */ >> -            (1 << 0), >> -            0, socket, NULL, 0); >> -    } >> +    for (n = 0; n < cpus->len; n++) { >> +        if (cpus->cpus[n].props.socket_id != socket_id) { >> +            socket_id = cpus->cpus[n].props.socket_id; >> +            cluster_id = -1; >> +            core_id = -1; >> +            socket_offset = table_data->len - pptt_start; >> +            build_processor_hierarchy_node(table_data, >> +                (1 << 0), /* Physical package */ >> +                0, socket_id, NULL, 0); >> +        } >> -    if (mc->smp_props.clusters_supported) { >> -        length = g_queue_get_length(list); >> -        for (i = 0; i < length; i++) { >> -            int cluster; >> - >> -            parent_offset = GPOINTER_TO_UINT(g_queue_pop_head(list)); >> -            for (cluster = 0; cluster < ms->smp.clusters; cluster++) { >> -                g_queue_push_tail(list, >> -                    GUINT_TO_POINTER(table_data->len - pptt_start)); >> -                build_processor_hierarchy_node( >> -                    table_data, >> -                    (0 << 0), /* not a physical package */ >> -                    parent_offset, cluster, NULL, 0); >> +        if (mc->smp_props.clusters_supported) { >> +            if (cpus->cpus[n].props.cluster_id != cluster_id) { >> +                cluster_id = cpus->cpus[n].props.cluster_id; >> +                core_id = -1; >> +                cluster_offset = table_data->len - pptt_start; >> +                build_processor_hierarchy_node(table_data, >> +                    (0 << 0), /* Not a physical package */ >> +                    socket_offset, cluster_id, NULL, 0); >>               } >> +        } else { >> +            cluster_offset = socket_offset; >>           } >> -    } >> -    length = g_queue_get_length(list); >> -    for (i = 0; i < length; i++) { >> -        int core; >> - >> -        parent_offset = GPOINTER_TO_UINT(g_queue_pop_head(list)); >> -        for (core = 0; core < ms->smp.cores; core++) { >> -            if (ms->smp.threads > 1) { >> -                g_queue_push_tail(list, >> -                    GUINT_TO_POINTER(table_data->len - pptt_start)); >> -                build_processor_hierarchy_node( >> -                    table_data, >> +        if (ms->smp.threads <= 1) { >> +            build_processor_hierarchy_node(table_data, >> +                (1 << 1) | /* ACPI Processor ID valid */ >> +                (1 << 3),  /* Node is a Leaf */ >> +                cluster_offset, n, NULL, 0); >> +        } else { >> +            if (cpus->cpus[n].props.core_id != core_id) { >> +                core_id = cpus->cpus[n].props.core_id; >> +                core_offset = table_data->len - pptt_start; >> +                build_processor_hierarchy_node(table_data, >>                       (0 << 0), /* not a physical package */ >> -                    parent_offset, core, NULL, 0); >> -            } else { >> -                build_processor_hierarchy_node( >> -                    table_data, >> -                    (1 << 1) | /* ACPI Processor ID valid */ >> -                    (1 << 3),  /* Node is a Leaf */ >> -                    parent_offset, uid++, NULL, 0); >> +                    cluster_offset, core_id, NULL, 0); >>               } >> -        } >> -    } >> - >> -    length = g_queue_get_length(list); >> -    for (i = 0; i < length; i++) { >> -        int thread; >> -        parent_offset = GPOINTER_TO_UINT(g_queue_pop_head(list)); >> -        for (thread = 0; thread < ms->smp.threads; thread++) { >> -            build_processor_hierarchy_node( >> -                table_data, >> +            build_processor_hierarchy_node(table_data, >>                   (1 << 1) | /* ACPI Processor ID valid */ >>                   (1 << 2) | /* Processor is a Thread */ >>                   (1 << 3),  /* Node is a Leaf */ >> -                parent_offset, uid++, NULL, 0); >> +                core_offset, n, NULL, 0); >>           } >>       } >> -    g_queue_free(list); >>       acpi_table_end(linker, &table); >>   } Thanks, Gavin