From patchwork Wed Apr 20 10:49:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 12820076 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 D06EBC433F5 for ; Wed, 20 Apr 2022 11:13:35 +0000 (UTC) Received: from localhost ([::1]:46896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nh8H8-00067l-R2 for qemu-devel@archiver.kernel.org; Wed, 20 Apr 2022 07:13:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nh7wD-000549-LK for qemu-devel@nongnu.org; Wed, 20 Apr 2022 06:51:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nh7wA-0001BJ-48 for qemu-devel@nongnu.org; Wed, 20 Apr 2022 06:51:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650451913; h=from:from: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; bh=homN2cKdawCz7Q/UC9xijV8F0GPTwG08OlTeIgXknuA=; b=JQu21uuooPoATgOnaH5kW8EE8SdnnfQc84SDITxtvFwLRy0re7QOIPD1XZUT5feMHLQWRS igw7sCB7BKtTmzBSq/IqsZEfZ1fsIw/ZhG2dwg+Jjp/ZWE7YhiuMmf5ZL+bXmJIejaLnhE eKquxOegt/eAC0oIDW3kPAwnivbyVyQ= 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-156-T5fHvoQ6P_mZcdnFHChQlQ-1; Wed, 20 Apr 2022 06:51:49 -0400 X-MC-Unique: T5fHvoQ6P_mZcdnFHChQlQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8D298038E3; Wed, 20 Apr 2022 10:51:48 +0000 (UTC) Received: from gshan.redhat.com (ovpn-13-230.pek2.redhat.com [10.72.13.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10D60403D19A; Wed, 20 Apr 2022 10:51:39 +0000 (UTC) From: Gavin Shan To: qemu-arm@nongnu.org Subject: [PATCH v7 0/4] hw/arm/virt: Fix CPU's default NUMA node ID Date: Wed, 20 Apr 2022 18:49:05 +0800 Message-Id: <20220420104909.233058-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=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: , Cc: lvivier@redhat.com, eduardo@habkost.net, thuth@redhat.com, berrange@redhat.com, shan.gavin@gmail.com, peter.maydell@linaro.org, Jonathan.Cameron@Huawei.com, zhenyzha@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, wangyanan55@huawei.com, imammedo@redhat.com, ani@anisinha.ca, pbonzini@redhat.com, drjones@redhat.com, eblake@redhat.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When the CPU-to-NUMA association isn't provided by user, the default NUMA node ID for the specific CPU is returned from virt_get_default_cpu_node_id(). Unfortunately, the default NUMA node ID breaks socket boundary and leads to the broken CPU topology warning message in Linux guest. This series intends to fix the issue. PATCH[1/4] Add cluster-id to CPU instance property PATCH[2/4] Uses SMP configuration to populate CPU topology PATCH[3/4] Fixes the broken CPU topology by considering the socket boundary when the default NUMA node ID is given PATCH[4/4] Uses the populated CPU topology to build PPTT table, instead of calculate it again Changelog ========= v6/v7: * Fixed description for 'cluster-id' and 'core-id' (Yanan) * Remove '% ms->smp.sockets' in socket ID calculation (Yanan) * Fixed tests/qtest/numa-test/aarch64_numa_cpu() (Yanan) * Initialized offset variables in build_pptt() (Jonathan) * Added comments about the expected and sorted layout of cpus[n].props.*_id and assert() on the exceptional cases (Igor) v4/v5: * Split PATCH[v3 1/3] to PATCH[v5 1/4] and PATCH[v5 2/4]. Verify or dump 'clsuter-id' in various spots (Yanan) * s/within cluster/within cluster\/die/ for 'core-id' in qapi/machine.json (Igor) * Apply '% ms->smp.{sockets, clusters, cores, threads} in virt_possible_cpu_arch_ids() as x86 does (Igor) * Use [0 - possible_cpus->len] as ACPI processor UID to build PPTT table and PATCH[v3 4/4] is dropped (Igor) * Simplified build_pptt() to add all entries in one loop on ms->possible_cpus (Igor) v3: * Split PATCH[v2 1/3] to PATCH[v3 1/4] and PATCH[v3 2/4] (Yanan) * Don't take account of die ID in CPU topology population and added assert(!mc->smp_props.dies_supported) (Yanan/Igor) * Assign cluster_id and use it when building PPTT table (Yanan/Igor) v2: * Populate the CPU topology in virt_possible_cpu_arch_ids() so that it can be reused in virt_get_default_cpu_node_id() (Igor) * Added PATCH[2/3] to use the existing CPU topology when the PPTT table is built (Igor) * Added PATCH[3/3] to take thread ID as ACPI processor ID in MADT and SRAT table (Gavin) Gavin Shan (4): qapi/machine.json: Add cluster-id hw/arm/virt: Consider SMP configuration in CPU topology hw/arm/virt: Fix CPU's default NUMA node ID hw/acpi/aml-build: Use existing CPU topology to build PPTT table hw/acpi/aml-build.c | 109 ++++++++++++++++--------------------- hw/arm/virt.c | 19 ++++++- hw/core/machine-hmp-cmds.c | 4 ++ hw/core/machine.c | 16 ++++++ qapi/machine.json | 6 +- tests/qtest/numa-test.c | 3 +- 6 files changed, 90 insertions(+), 67 deletions(-)