[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/4] qtest/numa-test: Follow socket-NUMA-node boundary for aar
From: |
Gavin Shan |
Subject: |
[PATCH v2 1/4] qtest/numa-test: Follow socket-NUMA-node boundary for aarch64 |
Date: |
Thu, 23 Feb 2023 16:13:58 +0800 |
After socket-to-NUMA-node boundary is applied to aarch64 in the subsequent
patches, we need to explicitly specify 'smp.sockets=2' for 'test_mon_explicit'
and 'test_query_cpus' test cases. Besides, 'test_mon_partial' isn't applied
to aarch64 any more.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
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 = NULL;
g_autofree char *cli = NULL;
- cli = make_cli(data, "-machine smp.cpus=8 -numa
node,nodeid=0,memdev=ram,cpus=0-3 "
+ cli = make_cli(data, "-machine smp.cpus=8,smp.sockets=2 "
+ "-numa node,nodeid=0,memdev=ram,cpus=0-3 "
"-numa node,nodeid=1,cpus=4-7");
qts = qtest_init(cli);
@@ -87,7 +88,8 @@ static void test_query_cpus(const void *data)
QTestState *qts;
g_autofree char *cli = NULL;
- cli = make_cli(data, "-machine smp.cpus=8 -numa node,memdev=ram,cpus=0-3 "
+ cli = make_cli(data, "-machine smp.cpus=8,smp.sockets=2 "
+ "-numa node,memdev=ram,cpus=0-3 "
"-numa node,cpus=4-7");
qts = qtest_init(cli);
cpus = get_cpus(qts, &resp);
@@ -565,7 +567,12 @@ int main(int argc, char **argv)
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_partial);
+ }
+
qtest_add_data_func("/numa/qmp/cpus/query-cpus", args, test_query_cpus);
if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
--
2.23.0
- [PATCH v2 0/4] NUMA: Apply socket-NUMA-node boundary for aarch64 and RiscV machines, Gavin Shan, 2023/02/23
- [PATCH v2 1/4] qtest/numa-test: Follow socket-NUMA-node boundary for aarch64,
Gavin Shan <=
- [PATCH v2 2/4] numa: Validate socket and NUMA node boundary if required, Gavin Shan, 2023/02/23
- [PATCH v2 3/4] hw/arm: Validate socket and NUMA node boundary, Gavin Shan, 2023/02/23
- [PATCH v2 4/4] hw/riscv: Validate socket and NUMA node boundary, Gavin Shan, 2023/02/23
- Re: [PATCH v2 0/4] NUMA: Apply socket-NUMA-node boundary for aarch64 and RiscV machines, Andrew Jones, 2023/02/23
- Re: [PATCH v2 0/4] NUMA: Apply socket-NUMA-node boundary for aarch64 and RiscV machines, Daniel P . Berrangé, 2023/02/23
- Re: [PATCH v2 0/4] NUMA: Apply socket-NUMA-node boundary for aarch64 and RiscV machines, Daniel Henrique Barboza, 2023/02/23