From nobody Fri May 10 19:48:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677307084; cv=none; d=zohomail.com; s=zohoarc; b=D7TUhq+0ri/xSQnMIHcZnbFbvQ8pQSebbd82cPB1iYl5lgImGcQvKEKvVWDFXnfWp6Wdw1o7LHUdFziQCzGYvKCBKazHbvZUGgCgRnq1DKBfu6rBZ1WSxwI6QKr5Qw0ikMMh0/15xPQilqTn2yHrVI6QW6FpfLEhuaPbHw7pEIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677307084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AvwX+6I19q2WUJFwmfrI35ZFcd0wLfTIDvUwDVYFUtQ=; b=QNCDcZdHxtF0lzXXeLQOmN6hJLPO9oQDjDzP128yhhnEgnxuT1thJeY7qXaEhpkOUJSy6ziVG2NRI8cm3kg0yC45YpFHy9hqHIXeoHH057AoBjC4ka2dinlzfyUqm8P5NeyFSvYbUSrBRn2K0U+ZanPK/Ec7Z0oMgbNwz/CSn9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677307084900535.7135904942802; Fri, 24 Feb 2023 22:38:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVoBQ-0000cA-Ax; Sat, 25 Feb 2023 01:37:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoBA-0000b2-US for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoB9-0002q3-90 for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:08 -0500 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-595-AkI_uq8CPIuhE2uwEa2_AA-1; Sat, 25 Feb 2023 01:37:03 -0500 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 3C76B1C05EB1; Sat, 25 Feb 2023 06:37:02 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-20.bne.redhat.com [10.64.54.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25E1740C945A; Sat, 25 Feb 2023 06:36:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677307026; 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: in-reply-to:in-reply-to:references:references; bh=AvwX+6I19q2WUJFwmfrI35ZFcd0wLfTIDvUwDVYFUtQ=; b=i/Toi4lxlEm467j+JETLcl93XTlZz7D3DBPCuFOYiMq+uMOrFaTkhqB+B4YvIKhNaoeWCH kl3EOsTy0O72OmaCYiG+QUxad+2yxT8ZKkD5/a3Xlg5ZDB/vCbEcf37Y8r6qSdcrCaD0vJ 7jWQlA3k8UrQLknmoYOqWoKAn9iV6f4= X-MC-Unique: AkI_uq8CPIuhE2uwEa2_AA-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, rad@semihalf.com, peter.maydell@linaro.org, quic_llindhol@quicinc.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, yihyu@redhat.com, ajones@ventanamicro.com, berrange@redhat.com, dbarboza@ventanamicro.com, shan.gavin@gmail.com Subject: [PATCH v3 1/3] numa: Validate cluster and NUMA node boundary if required Date: Sat, 25 Feb 2023 14:35:25 +0800 Message-Id: <20230225063527.281479-2-gshan@redhat.com> In-Reply-To: <20230225063527.281479-1-gshan@redhat.com> References: <20230225063527.281479-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677307086485100001 Content-Type: text/plain; charset="utf-8" For some architectures like ARM64, multiple CPUs in one cluster can be associated with different NUMA nodes, which is irregular configuration because we shouldn't have this in baremetal environment. The irregular configuration causes Linux guest to misbehave, as the following warning messages indicate. -smp 6,maxcpus=3D6,sockets=3D2,clusters=3D1,cores=3D3,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram0 \ -numa node,nodeid=3D1,cpus=3D2-3,memdev=3Dram1 \ -numa node,nodeid=3D2,cpus=3D4-5,memdev=3Dram2 \ ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/sched/topology.c:2271 build_sched_domain= s+0x284/0x910 Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.14.0-268.el9.aarch64 #1 pstate: 00400005 (nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=3D--) pc : build_sched_domains+0x284/0x910 lr : build_sched_domains+0x184/0x910 sp : ffff80000804bd50 x29: ffff80000804bd50 x28: 0000000000000002 x27: 0000000000000000 x26: ffff800009cf9a80 x25: 0000000000000000 x24: ffff800009cbf840 x23: ffff000080325000 x22: ffff0000005df800 x21: ffff80000a4ce508 x20: 0000000000000000 x19: ffff000080324440 x18: 0000000000000014 x17: 00000000388925c0 x16: 000000005386a066 x15: 000000009c10cc2e x14: 00000000000001c0 x13: 0000000000000001 x12: ffff00007fffb1a0 x11: ffff00007fffb180 x10: ffff80000a4ce508 x9 : 0000000000000041 x8 : ffff80000a4ce500 x7 : ffff80000a4cf920 x6 : 0000000000000001 x5 : 0000000000000001 x4 : 0000000000000007 x3 : 0000000000000002 x2 : 0000000000001000 x1 : ffff80000a4cf928 x0 : 0000000000000001 Call trace: build_sched_domains+0x284/0x910 sched_init_domains+0xac/0xe0 sched_init_smp+0x48/0xc8 kernel_init_freeable+0x140/0x1ac kernel_init+0x28/0x140 ret_from_fork+0x10/0x20 Improve the situation to warn when multiple CPUs in one cluster have been associated with different NUMA nodes. However, one NUMA node is allowed to be associated with different clusters. Signed-off-by: Gavin Shan Acked-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/hw/boards.h | 1 + 2 files changed, 43 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index f29e700ee4..3513df5a86 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1252,6 +1252,45 @@ static void machine_numa_finish_cpu_init(MachineStat= e *machine) g_string_free(s, true); } =20 +static void validate_cpu_cluster_to_numa_boundary(MachineState *ms) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(ms); + NumaState *state =3D ms->numa_state; + const CPUArchIdList *possible_cpus =3D mc->possible_cpu_arch_ids(ms); + const CPUArchId *cpus =3D possible_cpus->cpus; + int len =3D possible_cpus->len, i, j; + + if (state->num_nodes <=3D 1 || len <=3D 1) { + return; + } + + /* + * The Linux scheduling domain can't be parsed when the multiple CPUs + * in one cluster have been associated with different NUMA nodes. Howe= ver, + * it's fine to associate one NUMA node with CPUs in different cluster= s. + */ + for (i =3D 0; i < len; i++) { + for (j =3D i + 1; j < len; j++) { + if (cpus[i].props.has_socket_id && + cpus[i].props.has_cluster_id && + cpus[i].props.has_node_id && + cpus[j].props.has_socket_id && + cpus[j].props.has_cluster_id && + cpus[j].props.has_node_id && + cpus[i].props.socket_id =3D=3D cpus[j].props.socket_id && + cpus[i].props.cluster_id =3D=3D cpus[j].props.cluster_id && + cpus[i].props.node_id !=3D cpus[j].props.node_id) { + warn_report("CPU-%d and CPU-%d in socket-%ld-cluster-%ld " + "have been associated with node-%ld and node-= %ld " + "respectively. It can cause OSes like Linux t= o" + "misbehave", i, j, cpus[i].props.socket_id, + cpus[i].props.cluster_id, cpus[i].props.node_= id, + cpus[j].props.node_id); + } + } + } +} + MemoryRegion *machine_consume_memdev(MachineState *machine, HostMemoryBackend *backend) { @@ -1337,6 +1376,9 @@ void machine_run_board_init(MachineState *machine, co= nst char *mem_path, Error * numa_complete_configuration(machine); if (machine->numa_state->num_nodes) { machine_numa_finish_cpu_init(machine); + if (machine_class->cpu_cluster_has_numa_boundary) { + validate_cpu_cluster_to_numa_boundary(machine); + } } } =20 diff --git a/include/hw/boards.h b/include/hw/boards.h index 6fbbfd56c8..c9793b2789 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -273,6 +273,7 @@ struct MachineClass { bool nvdimm_supported; bool numa_mem_supported; bool auto_enable_numa; + bool cpu_cluster_has_numa_boundary; SMPCompatProps smp_props; const char *default_ram_id; =20 --=20 2.23.0 From nobody Fri May 10 19:48:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677307099; cv=none; d=zohomail.com; s=zohoarc; b=hzs6crkouJMROQcnbQmyPB/BrbbD9aef/AHZF/hrbOTxicnHZpI8h+XhouGXJO+Kq2VX34sflVWK2xcRm6dY1PjeBBDSPMBvqOmqFejQV6qH8p6t0pAeQA8Phb4YZtjLPdyBsDh40APyZigK2kWXukiz0UmYgNB6m7EQHY/RcLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677307099; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QfrdHCUKpTvOTzPqLHeR7lm+APERaC+1IpcDPTKv2n0=; b=eZ+vmkTHj5pWl/IITvFYK3Xs8VOyH/orQYyEp5V500AGcHLv9qAeklm/7Orv8AboxPPFF+9nJCgKxlsbm7cQ6ncMc+clQqdVa8jC5VKVvAmldYXEBBeQk+zpn/MZwaUPYbUDzYKzEkC1AP7e9bntL6eM3X+AeyKA736WdK6p4nA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677307099228640.4788756629415; Fri, 24 Feb 2023 22:38:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVoBU-0000f6-DZ; Sat, 25 Feb 2023 01:37:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoBL-0000bx-6x for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoBJ-0002qp-Q6 for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:18 -0500 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-308-plO1_PT5OJ66sNP3GWc2YQ-1; Sat, 25 Feb 2023 01:37:12 -0500 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 3F7FF1C05EBE; Sat, 25 Feb 2023 06:37:11 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-20.bne.redhat.com [10.64.54.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BE1740C945A; Sat, 25 Feb 2023 06:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677307037; 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: in-reply-to:in-reply-to:references:references; bh=QfrdHCUKpTvOTzPqLHeR7lm+APERaC+1IpcDPTKv2n0=; b=RVaOEE1qowjItZOyWV8jgBT8YS7U0uRgRjheddp/X1qdo/JZdQNARnoaTLpr/z5QCS8KtQ 1KgP+7wsgIKPMP4NuYsz8hk+R4ILh+0LFUNISFKZ7LNLKQ0ySkjMrZbKFuAROVT3kRHO50 7qZNhxWlKfs9JixvRi6LFEvlknVViH0= X-MC-Unique: plO1_PT5OJ66sNP3GWc2YQ-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, rad@semihalf.com, peter.maydell@linaro.org, quic_llindhol@quicinc.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, yihyu@redhat.com, ajones@ventanamicro.com, berrange@redhat.com, dbarboza@ventanamicro.com, shan.gavin@gmail.com Subject: [PATCH v3 2/3] hw/arm: Validate cluster and NUMA node boundary Date: Sat, 25 Feb 2023 14:35:26 +0800 Message-Id: <20230225063527.281479-3-gshan@redhat.com> In-Reply-To: <20230225063527.281479-1-gshan@redhat.com> References: <20230225063527.281479-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677307099847100001 Content-Type: text/plain; charset="utf-8" There are two ARM machines where NUMA is aware: 'virt' and 'sbsa-ref'. Both of them are required to follow cluster-NUMA-node boundary. To enable the validation to warn about the irregular configuration where multiple CPUs in one cluster have been associated with different NUMA nodes. Signed-off-by: Gavin Shan --- hw/arm/sbsa-ref.c | 2 ++ hw/arm/virt.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index f778cb6d09..91d38af94c 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -864,6 +864,8 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *= data) mc->possible_cpu_arch_ids =3D sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id =3D sbsa_ref_get_default_cpu_node_id; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary =3D true; } =20 static const TypeInfo sbsa_ref_info =3D { diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ac626b3bef..b73ac6eabb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3030,6 +3030,8 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) mc->smp_props.clusters_supported =3D true; mc->auto_enable_numa_with_memhp =3D true; mc->auto_enable_numa_with_memdev =3D true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary =3D true; mc->default_ram_id =3D "mach-virt.ram"; =20 object_class_property_add(oc, "acpi", "OnOffAuto", --=20 2.23.0 From nobody Fri May 10 19:48:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677307156; cv=none; d=zohomail.com; s=zohoarc; b=iiVgi55UbEJHGEUZQWeSh7JFx9LWUYRFmKopS3C38vMCm1t5KFFE2eFaYMqM42Q6Ut8seuVu+qxl/2xkFSny0XJe2PPmGtkANnUiTD5LI4Hpirz2HIorxLkR/KfbKQMqhDnNVfV45ERME2CqVuIFlVki+7wN0g7JCpWlMjhCkz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677307156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OcGg8UwD1oAse3CxtUrhYuooopXoY1Ay8EyEOaaEFCY=; b=QMJzFuGh7UgrdVMwBucv8+ykGtKA6hEMTwX5rMLdhOaNnFE04kaizSf8QdARa+RuL7Yn44v3inkrzhVXRGtLYFQTi9ieEzrih5hgIggijBKHZpCyiKXnIKIk9/qWuq1VY9kmHNIC055PNjHLIp8+P00k0HgOYXc8fo7DJVihNdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677307156607455.21461414034684; Fri, 24 Feb 2023 22:39:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVoBW-0000hW-6J; Sat, 25 Feb 2023 01:37:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoBU-0000g9-K7 for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVoBS-0002re-7R for qemu-devel@nongnu.org; Sat, 25 Feb 2023 01:37:27 -0500 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-35-bctDuSKxOZ-5Pk91YuTzuw-1; Sat, 25 Feb 2023 01:37:21 -0500 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 92B96811E6E; Sat, 25 Feb 2023 06:37:20 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-20.bne.redhat.com [10.64.54.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 073CC40C945A; Sat, 25 Feb 2023 06:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677307045; 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: in-reply-to:in-reply-to:references:references; bh=OcGg8UwD1oAse3CxtUrhYuooopXoY1Ay8EyEOaaEFCY=; b=U2QMTCcjXxNQLlcWYPu1lhvQTQXHeXmvG/L6eF6RaUTUO77sHaWdu58CmmKLOF27O4Oz0w j4ieqXravmsQiWxtppLspAmN/4dg7A6/5EBoP4IcuNJxvwoxkOxlvisENll57Fjp1Ke4F+ Wcg0GXgRTbZXwRujU4wbygnQPzOOAC4= X-MC-Unique: bctDuSKxOZ-5Pk91YuTzuw-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, rad@semihalf.com, peter.maydell@linaro.org, quic_llindhol@quicinc.com, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, yihyu@redhat.com, ajones@ventanamicro.com, berrange@redhat.com, dbarboza@ventanamicro.com, shan.gavin@gmail.com Subject: [PATCH v3 3/3] hw/riscv: Validate cluster and NUMA node boundary Date: Sat, 25 Feb 2023 14:35:27 +0800 Message-Id: <20230225063527.281479-4-gshan@redhat.com> In-Reply-To: <20230225063527.281479-1-gshan@redhat.com> References: <20230225063527.281479-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677307158076100001 Content-Type: text/plain; charset="utf-8" There are two RISCV machines where NUMA is aware: 'virt' and 'spike'. Both of them are required to follow cluster-NUMA-node boundary. To enable the validation to warn about the irregular configuration where multiple CPUs in one cluster has been associated with multiple NUMA nodes. Signed-off-by: Gavin Shan Reviewed-by: Daniel Henrique Barboza --- hw/riscv/spike.c | 2 ++ hw/riscv/virt.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index cc3f6dac17..b09b993634 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -357,6 +357,8 @@ static void spike_machine_class_init(ObjectClass *oc, v= oid *data) mc->cpu_index_to_instance_props =3D riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id =3D riscv_numa_get_default_cpu_node_id; mc->numa_mem_supported =3D true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary =3D true; mc->default_ram_id =3D "riscv.spike.ram"; } =20 diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b81081c70b..e5bb168169 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1636,6 +1636,8 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) mc->cpu_index_to_instance_props =3D riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id =3D riscv_numa_get_default_cpu_node_id; mc->numa_mem_supported =3D true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary =3D true; mc->default_ram_id =3D "riscv_virt_board.ram"; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler =3D virt_machine_get_hotplug_handler; --=20 2.23.0