From nobody Mon Feb 9 02:42:31 2026 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=1677140172; cv=none; d=zohomail.com; s=zohoarc; b=a0dNusc+FTmhhfmJpKQrXvBnD52FufY4YBJ4X+Gs0ed8DhKAq3lrTSFEluihJjt3Snq4tceXTs0ojS5V/yc6Zdg+2SoBz/+pLUq0yTJgVPI+JNmroMnsbQjCPbdS1GJrXKEFNgQp52fP/HUxPMHu7PDCFSvCoh9klCkzcHjWsao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677140172; 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=N93heQF4SVVlaYuxobhHpAFpD9Mv4hw0bmrbFiLSBLo=; b=m/9l8XXpmZoWGIZLs10BlAC/dMT4W+E+4nP9fZIuXUgS8+stjFNn4hqYkTN5vNLgQoJbLVPJAW1j+Iak1A1Kh/tMUKxcD190RxBo84CXpqLPEAuZ050PLK4qq/qkoWQ62E/o8GFQnF58ZKybhebngtatwC1FiOMH4iD96HETdTA= 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 1677140172044928.2013123136987; Thu, 23 Feb 2023 00:16:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV6kS-0003Xu-5V; Thu, 23 Feb 2023 03:14:40 -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 1pV6kO-0003Wo-KV for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:36 -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 1pV6kN-0001EV-7H for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:36 -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-570-Br5-GpZlNDG1AeyYhnmSMg-1; Thu, 23 Feb 2023 03:14:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08A23101A55E; Thu, 23 Feb 2023 08:14:28 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-168.bne.redhat.com [10.64.54.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40CDC440DC; Thu, 23 Feb 2023 08:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140074; 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=N93heQF4SVVlaYuxobhHpAFpD9Mv4hw0bmrbFiLSBLo=; b=BEiXGKQ0Aj7ZImlPAnhQtqp8puvAXWRHXDPzyT6Y1iyEVv8BBaqoWSnFciu92k6VTubgiQ 86NuDgbW3dBKTZgCb1TePRnawmLtTTwUwdBDC35yn2UG6GLCf7Yktl6eVQoOB8MqYgGBMj vZubgUTnK7krxG69quZ8Q3V01witvmQ= X-MC-Unique: Br5-GpZlNDG1AeyYhnmSMg-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, qemu-riscv@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, shan.gavin@gmail.com Subject: [PATCH v2 1/4] qtest/numa-test: Follow socket-NUMA-node boundary for aarch64 Date: Thu, 23 Feb 2023 16:13:58 +0800 Message-Id: <20230223081401.248835-2-gshan@redhat.com> In-Reply-To: <20230223081401.248835-1-gshan@redhat.com> References: <20230223081401.248835-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1677140174629100001 Content-Type: text/plain; charset="utf-8" After socket-to-NUMA-node boundary is applied to aarch64 in the subsequent patches, we need to explicitly specify 'smp.sockets=3D2' for 'test_mon_expl= icit' and 'test_query_cpus' test cases. Besides, 'test_mon_partial' isn't applied to aarch64 any more. Signed-off-by: Gavin Shan --- tests/qtest/numa-test.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index c5eb13f349..ebfd522af3 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -25,7 +25,8 @@ static void test_mon_explicit(const void *data) g_autofree char *s =3D NULL; g_autofree char *cli =3D NULL; =20 - cli =3D make_cli(data, "-machine smp.cpus=3D8 -numa node,nodeid=3D0,me= mdev=3Dram,cpus=3D0-3 " + cli =3D make_cli(data, "-machine smp.cpus=3D8,smp.sockets=3D2 " + "-numa node,nodeid=3D0,memdev=3Dram,cpus=3D0-3 " "-numa node,nodeid=3D1,cpus=3D4-7"); qts =3D qtest_init(cli); =20 @@ -87,7 +88,8 @@ static void test_query_cpus(const void *data) QTestState *qts; g_autofree char *cli =3D NULL; =20 - cli =3D make_cli(data, "-machine smp.cpus=3D8 -numa node,memdev=3Dram,= cpus=3D0-3 " + cli =3D make_cli(data, "-machine smp.cpus=3D8,smp.sockets=3D2 " + "-numa node,memdev=3Dram,cpus=3D0-3 " "-numa node,cpus=3D4-7"); qts =3D qtest_init(cli); cpus =3D get_cpus(qts, &resp); @@ -565,7 +567,12 @@ int main(int argc, char **argv) =20 qtest_add_data_func("/numa/mon/cpus/default", args, test_def_cpu_split= ); qtest_add_data_func("/numa/mon/cpus/explicit", args, test_mon_explicit= ); - qtest_add_data_func("/numa/mon/cpus/partial", args, test_mon_partial); + + if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64") || + !strcmp(arch, "ppc64")) { + qtest_add_data_func("/numa/mon/cpus/partial", args, test_mon_parti= al); + } + qtest_add_data_func("/numa/qmp/cpus/query-cpus", args, test_query_cpus= ); =20 if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) { --=20 2.23.0 From nobody Mon Feb 9 02:42:31 2026 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=1677140121; cv=none; d=zohomail.com; s=zohoarc; b=WrqBCRX2Nnwdf27IrBiWni8wS153zGUMlN93e1FWKRubTa/es2ftjW+1n82BeQt7L6MEcUFnsy/K8c9eC2qioT6xsrXOw1jFmB0ESZWRw1qwcd23XLc6v5DJkZFVJgkLT4YcKd89QPv3w8K+MgkR3j4H7FGasBChFjNTIYmr7YQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677140121; 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=g92Td8QRvrVk+sq1KWvUB3XXi6JuTsKzLd866Am/PBk=; b=bj885+bhaglIy87UQUxguZJZ6urgbz9IaiuG/YMGiFdPcOXrHUE1FrEYkq121l+JkDQ6saOwfVVJ2ivkM/VIfBIth4/LSyODtolf0Vsz/8YKEp7XW2Azj+VPPiVO3WQYWh2lRORDgTm1Nn5A/m04UyBJYJELxPMUgZW1MfyBiHc= 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 16771401214751003.5402973869786; Thu, 23 Feb 2023 00:15:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV6kW-0003ZM-UO; Thu, 23 Feb 2023 03:14:44 -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 1pV6kV-0003Yq-Ot for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:43 -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 1pV6kU-0001Fc-0w for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:43 -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-571-11eOUpCuMGidHF106ejm6g-1; Thu, 23 Feb 2023 03:14:37 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1298101A521; Thu, 23 Feb 2023 08:14:35 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-168.bne.redhat.com [10.64.54.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96CF118EC1; Thu, 23 Feb 2023 08:14:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140081; 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=g92Td8QRvrVk+sq1KWvUB3XXi6JuTsKzLd866Am/PBk=; b=Qsuc8gjVoezNiwwpPQcZEv0WEl/fOZRPNFBUf0mnplykjTCaxTaKDPpjN+NHHvh9YK0qMu tpVNibvpqkJ7TZsBrkEVXomXqBBAwYi1uPXwDCREZQXZWUCGVIZTt43I2Q0P1x6RqeksNl OoIvcAk60oUxuEOSsi/HAtExyYYFrKg= X-MC-Unique: 11eOUpCuMGidHF106ejm6g-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, qemu-riscv@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, shan.gavin@gmail.com Subject: [PATCH v2 2/4] numa: Validate socket and NUMA node boundary if required Date: Thu, 23 Feb 2023 16:13:59 +0800 Message-Id: <20230223081401.248835-3-gshan@redhat.com> In-Reply-To: <20230223081401.248835-1-gshan@redhat.com> References: <20230223081401.248835-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1677140123864100003 Content-Type: text/plain; charset="utf-8" For some architectures like ARM64, multiple CPUs in one socket can't be associated with different NUMA nodes. Otherwise, the guest kernel is confus= ed about the CPU topology. For example, the following warning message is obser= ved from linux guest with the below command lines. -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 sitation to reject the configuration where multiple CPUs in one socket have been associated with different NUMA nodes. The newly introduced helper set_numa_socket_boundary() is expected to called by specific machines (boards) where the boundary is required. Signed-off-by: Gavin Shan --- hw/core/machine.c | 34 ++++++++++++++++++++++++++++++++++ hw/core/numa.c | 7 +++++++ include/sysemu/numa.h | 4 ++++ 3 files changed, 45 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index f73fc4c45c..875a3fe6c4 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1174,6 +1174,36 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) return g_string_free(s, false); } =20 +static void numa_validate_socket_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; + } + + 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_node_id && + cpus[j].props.has_socket_id && + cpus[j].props.has_node_id && + cpus[i].props.socket_id =3D=3D cpus[j].props.socket_id && + cpus[i].props.node_id !=3D cpus[j].props.node_id) { + error_report("CPU-%d and CPU-%d in socket-%ld have been " + "associated with node-%ld and node-%ld " + "respectively", i, j, cpus[i].props.socket_id, + cpus[i].props.node_id, cpus[j].props.node_id); + exit(1); + } + } + } +} + static void numa_validate_initiator(NumaState *numa_state) { int i; @@ -1239,6 +1269,10 @@ static void machine_numa_finish_cpu_init(MachineStat= e *machine) } } =20 + if (machine->numa_state->have_socket_boundary) { + numa_validate_socket_boundary(machine); + } + if (machine->numa_state->hmat_enabled) { numa_validate_initiator(machine->numa_state); } diff --git a/hw/core/numa.c b/hw/core/numa.c index d8d36b16d8..ebdd964ec8 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -460,6 +460,13 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmatC= acheOptions *node, ms->numa_state->hmat_cache[node->node_id][node->level] =3D hmat_cache; } =20 +void set_numa_socket_boundary(MachineState *ms) +{ + if (ms->numa_state) { + ms->numa_state->have_socket_boundary =3D true; + } +} + void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) { if (!ms->numa_state) { diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 4173ef2afa..160008fff4 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -86,6 +86,9 @@ struct NumaState { /* Detect if HMAT support is enabled. */ bool hmat_enabled; =20 + /* CPUs in one socket can't break socket boundary */ + bool have_socket_boundary; + /* NUMA nodes information */ NodeInfo nodes[MAX_NODES]; =20 @@ -97,6 +100,7 @@ struct NumaState { }; typedef struct NumaState NumaState; =20 +void set_numa_socket_boundary(MachineState *ms); void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp); void parse_numa_opts(MachineState *ms); void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node, --=20 2.23.0 From nobody Mon Feb 9 02:42:31 2026 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=1677140163; cv=none; d=zohomail.com; s=zohoarc; b=QnYrl6Cy7bJh43dyIR7qPWQGAkz5rg7lvLPD4t7XAZSuD6fKcslbE9ZZBZ/6r8D3WFuhkvp7RWmsjTdylWUYxR9N9ufdPKUbypMbij1lBIqxKFFLOqKmpOehOp/Kxxy3eMEwkpbuYP6QksgtqgBELO8CeWbm2L5iUY4C2Gf3wxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677140163; 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=/wLL9544MFJuZn5ro6CESRAgbVJwuWFdQYsfjmY4xL8=; b=md9s3USL7Gj8K6WNJcw/FJOnmA11eOr23g5UHmCyFy2cbpYvQNTsr5YcxSlZ0q0ubON8HsYr5ZTdyGnjoQpPDYkKWTx/XB1SlxMF3HzrcZuaopcPDgx9GvMb8Q2G2Ldsksud8TJpEfxY9hroFCNe6murO4pYYbfo1xAUkpXECeQ= 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 1677140163330499.9798162513541; Thu, 23 Feb 2023 00:16:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV6kf-0003d7-Ug; Thu, 23 Feb 2023 03:14:53 -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 1pV6ke-0003cS-8A for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:52 -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 1pV6kc-0001H3-Of for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:14:51 -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-619-1eFz_WD9PGO_6RMfiLhVEQ-1; Thu, 23 Feb 2023 03:14:44 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D02A85A5A3; Thu, 23 Feb 2023 08:14:44 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-168.bne.redhat.com [10.64.54.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id A15B218EC1; Thu, 23 Feb 2023 08:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140090; 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=/wLL9544MFJuZn5ro6CESRAgbVJwuWFdQYsfjmY4xL8=; b=H5fTxbelp8s875eyelaJb0PraEFHgLiMngVswBrPZZU0FxoHn1BSX1AvvgndH5W4gm1LTO v/gXSsTUOHmIJ+F5Vle0kn+T1IOpwlnVXJ6IuqLroQS/VklEq5DLVsNthb/cqiq74kSskq 3CAS7j98yS5zDhnTUOChYQTfUw3nJ2I= X-MC-Unique: 1eFz_WD9PGO_6RMfiLhVEQ-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, qemu-riscv@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, shan.gavin@gmail.com Subject: [PATCH v2 3/4] hw/arm: Validate socket and NUMA node boundary Date: Thu, 23 Feb 2023 16:14:00 +0800 Message-Id: <20230223081401.248835-4-gshan@redhat.com> In-Reply-To: <20230223081401.248835-1-gshan@redhat.com> References: <20230223081401.248835-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1677140163849100003 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 socket-NUMA-node boundary. To enable the validation to reject incorrect configuration. 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..1a87437017 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -844,6 +844,8 @@ static void sbsa_ref_instance_init(Object *obj) SBSAMachineState *sms =3D SBSA_MACHINE(obj); =20 sbsa_flash_create(sms); + + set_numa_socket_boundary(MACHINE(obj)); } =20 static void sbsa_ref_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ac626b3bef..9d9f26626c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3210,6 +3210,8 @@ static void virt_instance_init(Object *obj) =20 vms->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); vms->oem_table_id =3D g_strndup(ACPI_BUILD_APPNAME8, 8); + + set_numa_socket_boundary(MACHINE(obj)); } =20 static const TypeInfo virt_machine_info =3D { --=20 2.23.0 From nobody Mon Feb 9 02:42:31 2026 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=1677140196; cv=none; d=zohomail.com; s=zohoarc; b=EPUx8uKErEwss+DvQdqdbZlZJNjjTDUpPGtyRV7jLSo5iSQ9wMkqkzdylEkz6guaIPt1ayTh6vzycvuSNASkQmWzc8RAqF0cCX/zVM4gC9WRzADF7G36AEB4dXL0/Zsh0xcFVf2hLrC15WdGwSt6342Cb2fIAhpPgXrd0p/1qoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677140196; 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=oNyUfcVHvjIdcGuv0SDWxC/qdUhNx/+4Mut0H2LduDQ=; b=Hq5zRfSiV6VqIwS3BAEI3IY2wpBhEEBWLJkuYtxYW4q74T5AdaaparoBK3S8qqk82Q65IsSochHabhCYWdmoKUrp5wSPoCL9XJ1vnWfPLJN1syxiCYFKZqFjhYLWdN+f3j/xXvLUbYr47WFZgFZYOUqqWi8+0U7BJ/OJT0kwheg= 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 1677140196627351.7665914750221; Thu, 23 Feb 2023 00:16:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV6kq-0003lC-BI; Thu, 23 Feb 2023 03:15:04 -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 1pV6ko-0003iG-2y for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:15:02 -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 1pV6km-0001LJ-8Q for qemu-devel@nongnu.org; Thu, 23 Feb 2023 03:15:01 -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-209-qCV7yt1kP0qz9Kpqr53kjQ-1; Thu, 23 Feb 2023 03:14:53 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 636CA857A88; Thu, 23 Feb 2023 08:14:52 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-168.bne.redhat.com [10.64.54.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFDBC440DE; Thu, 23 Feb 2023 08:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140099; 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=oNyUfcVHvjIdcGuv0SDWxC/qdUhNx/+4Mut0H2LduDQ=; b=gOX5Zz5AXTA2uyHGidF3/MiJKQ9+xvOXFZHVoHXOGcI99sHYL0BJAqzSDj/rv2XNF7mo/G 4qsT1W2D0XE/Oz8J7mxCP+lLrZXwcTApprUSYej9qPkqspo+J3tTnloacInP9FK/1zo0UY BYVoyP/vdaoxF+6LkNoBfTXJcQ6rimI= X-MC-Unique: qCV7yt1kP0qz9Kpqr53kjQ-1 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, qemu-riscv@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, shan.gavin@gmail.com Subject: [PATCH v2 4/4] hw/riscv: Validate socket and NUMA node boundary Date: Thu, 23 Feb 2023 16:14:01 +0800 Message-Id: <20230223081401.248835-5-gshan@redhat.com> In-Reply-To: <20230223081401.248835-1-gshan@redhat.com> References: <20230223081401.248835-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1677140198035100002 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 socket-NUMA-node boundary. To enable the validation to reject incorrect configuration. Signed-off-by: Gavin Shan --- hw/riscv/spike.c | 1 + hw/riscv/virt.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index cc3f6dac17..fba0cbec29 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -342,6 +342,7 @@ static void spike_board_init(MachineState *machine) =20 static void spike_machine_instance_init(Object *obj) { + set_numa_socket_boundary(MACHINE(obj)); } =20 static void spike_machine_class_init(ObjectClass *oc, void *data) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b81081c70b..ed79becb96 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1521,6 +1521,7 @@ static void virt_machine_init(MachineState *machine) =20 static void virt_machine_instance_init(Object *obj) { + set_numa_socket_boundary(MACHINE(obj)); } =20 static char *virt_get_aia_guests(Object *obj, Error **errp) --=20 2.23.0