From nobody Sun May 19 12:00:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562169145; cv=none; d=zoho.com; s=zohoarc; b=YKb7rLr9bqd0cvr0eDsv/rTPcpoVvQSxLfRU+6ptbXpAFCQe4mBCrIO1JeBSsYwpo7jBkMITVdAiALJU+AyFwM4AVoWyRgLdKUQHt6yAQPy9Q1p5J5Tr07fw8QD+w/VANUEZGmXTXot+LPxADqwzwmtOgWe1xd1eE6miWS56XQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562169145; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=etgK1EMM2IlSTxXtD/6xsl/UZWPbwoeeK7DNn8tzK5g=; b=K96Esh1NrvRqYeDVP+qzxb57+PTM+B/brEunP/iTSx56eS3yAPTyeczht0pckLPiHyIMUEuftCrGe8BhX43dFqpc3jNfeQQjfHBTQ0tg/6ifZf117lHvxHnj9QvROepheUkOQpbQm63Jmku64qArYaR6aYV/ZBvE/4OE30A7ZLQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562169145911474.7250472783476; Wed, 3 Jul 2019 08:52:25 -0700 (PDT) Received: from localhost ([::1]:37040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihYT-0001WH-R0 for importer@patchew.org; Wed, 03 Jul 2019 11:52:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51705) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihTt-0006Uy-KY for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hihTp-0003rP-Pl for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:47:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hihTp-0003r6-Fl for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:47:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C02F53087931 for ; Wed, 3 Jul 2019 15:47:27 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FA528CBBF; Wed, 3 Jul 2019 15:47:26 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 11:47:23 -0400 Message-Id: <20190703154723.7327-1-imammedo@redhat.com> In-Reply-To: <20190702215726.23661-1-ehabkost@redhat.com> References: <20190702215726.23661-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 03 Jul 2019 15:47:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] tests: numa-test: use -numa memdev option instead of legacy 'mem' option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" it drops testing of deprecated 'mem' option and will test preferred memdev option instead. Signed-off-by: Igor Mammedov --- v2: - make backend size depend on initial RAM size and a number of backends fixes test faulure with spapr machine (Eduardo Habkost ) tests/numa-test.c | 85 +++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/tests/numa-test.c b/tests/numa-test.c index 8de8581231..e102b3b70f 100644 --- a/tests/numa-test.c +++ b/tests/numa-test.c @@ -14,9 +14,28 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 -static char *make_cli(const char *generic_cli, const char *test_cli) +typedef struct { + const char *args; + int ram_size; /* size in MB */ +} TestData; + +static char *make_cli(const TestData *data, int memdev_count, + const char *test_cli) { - return g_strdup_printf("%s %s", generic_cli ? generic_cli : "", test_c= li); + int i; + char *tmp =3D NULL; + char *cli =3D g_strdup_printf("%s -m %d", data->args ? : "", data->ram= _size); + + for (i =3D 0; memdev_count && (i < memdev_count); i++) { + tmp =3D g_strdup_printf("%s -object memory-backend-ram,id=3Dr%d,si= ze=3D%dM", + cli, i, data->ram_size / memdev_count); + g_free(cli); + cli =3D tmp; + } + tmp =3D g_strdup_printf("%s %s", cli, test_cli); + g_free(cli); + cli =3D tmp; + return cli; } =20 static void test_mon_explicit(const void *data) @@ -25,9 +44,8 @@ static void test_mon_explicit(const void *data) char *cli; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 " - "-numa node,nodeid=3D0,cpus=3D0-3 " - "-numa node,nodeid=3D1,cpus=3D4-7 "); + cli =3D make_cli(data, 2, "-smp 8 -numa node,nodeid=3D0,cpus=3D0-3,mem= dev=3Dr0 " + "-numa node,nodeid=3D1,cpus=3D4-7,memdev=3Dr1 "); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -45,7 +63,7 @@ static void test_mon_default(const void *data) char *cli; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 -numa node -numa node"); + cli =3D make_cli(data, 2, "-smp 8 -numa node,memdev=3Dr0 -numa node,me= mdev=3Dr1"); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -63,9 +81,8 @@ static void test_mon_partial(const void *data) char *cli; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 " - "-numa node,nodeid=3D0,cpus=3D0-1 " - "-numa node,nodeid=3D1,cpus=3D4-5 "); + cli =3D make_cli(data, 2, "-smp 8 -numa node,nodeid=3D0,cpus=3D0-1,mem= dev=3Dr0 " + "-numa node,nodeid=3D1,cpus=3D4-5,memdev=3Dr1"); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -93,7 +110,8 @@ static void test_query_cpus(const void *data) QObject *e; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 -numa node,cpus=3D0-3 -numa node,cpus= =3D4-7"); + cli =3D make_cli(data, 2, "-smp 8 -numa node,cpus=3D0-3,memdev=3Dr0 " + "-numa node,cpus=3D4-7,memdev=3Dr1"); qts =3D qtest_init(cli); cpus =3D get_cpus(qts, &resp); g_assert(cpus); @@ -131,8 +149,8 @@ static void pc_numa_cpu(const void *data) QObject *e; QTestState *qts; =20 - cli =3D make_cli(data, "-cpu pentium -smp 8,sockets=3D2,cores=3D2,thre= ads=3D2 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + cli =3D make_cli(data, 2, "-cpu pentium -smp 8,sockets=3D2,cores=3D2,t= hreads=3D2 " + "-numa node,nodeid=3D0,memdev=3Dr0 -numa node,nodeid=3D1,memdev=3D= r1 " "-numa cpu,node-id=3D1,socket-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D1,thread-id=3D0 " @@ -185,8 +203,8 @@ static void spapr_numa_cpu(const void *data) QObject *e; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 4,cores=3D4 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + cli =3D make_cli(data, 2, "-smp 4,cores=3D4 " + "-numa node,nodeid=3D0,memdev=3Dr0 -numa node,nodeid=3D1,memdev=3D= r1 " "-numa cpu,node-id=3D0,core-id=3D0 " "-numa cpu,node-id=3D0,core-id=3D1 " "-numa cpu,node-id=3D0,core-id=3D2 " @@ -231,8 +249,8 @@ static void aarch64_numa_cpu(const void *data) QObject *e; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 2 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + cli =3D make_cli(data, 2, "-smp 2 " + "-numa node,nodeid=3D0,memdev=3Dr0 -numa node,nodeid=3D1,memdev=3D= r1 " "-numa cpu,node-id=3D1,thread-id=3D0 " "-numa cpu,node-id=3D0,thread-id=3D1"); qts =3D qtest_init(cli); @@ -272,16 +290,14 @@ static void pc_dynamic_cpu_cfg(const void *data) QObject *e; QDict *resp; QList *cpus; - QTestState *qs; - - qs =3D qtest_initf("%s -nodefaults --preconfig -smp 2", - data ? (char *)data : ""); + char *cli =3D make_cli(data, 2, "-nodefaults --preconfig -smp 2"); + QTestState *qs =3D qtest_init(cli); =20 /* create 2 numa nodes */ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node'," - " 'arguments': { 'type': 'node', 'nodeid': 0 } }"))); + " 'arguments': { 'type': 'node', 'nodeid': 0, 'memdev': 'r0' } }")= )); g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node'," - " 'arguments': { 'type': 'node', 'nodeid': 1 } }"))); + " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'r1' } }")= )); =20 /* map 2 cpus in non default reverse order * i.e socket1->node0, socket0->node1 @@ -325,35 +341,38 @@ static void pc_dynamic_cpu_cfg(const void *data) qobject_unref(resp); =20 qtest_quit(qs); + g_free(cli); } =20 int main(int argc, char **argv) { - const char *args =3D NULL; const char *arch =3D qtest_get_arch(); + TestData data =3D { .ram_size =3D 128 }; =20 - if (strcmp(arch, "aarch64") =3D=3D 0) { - args =3D "-machine virt"; + if (!strcmp(arch, "aarch64")) { + data.args =3D "-machine virt"; + } else if (!strcmp(arch, "ppc64")) { + data.ram_size =3D 512; } =20 g_test_init(&argc, &argv, NULL); =20 - qtest_add_data_func("/numa/mon/default", args, test_mon_default); - qtest_add_data_func("/numa/mon/cpus/explicit", args, test_mon_explicit= ); - 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= ); + qtest_add_data_func("/numa/mon/default", &data, test_mon_default); + qtest_add_data_func("/numa/mon/cpus/explicit", &data, test_mon_explici= t); + qtest_add_data_func("/numa/mon/cpus/partial", &data, test_mon_partial); + qtest_add_data_func("/numa/qmp/cpus/query-cpus", &data, test_query_cpu= s); =20 if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) { - qtest_add_data_func("/numa/pc/cpu/explicit", args, pc_numa_cpu); - qtest_add_data_func("/numa/pc/dynamic/cpu", args, pc_dynamic_cpu_c= fg); + qtest_add_data_func("/numa/pc/cpu/explicit", &data, pc_numa_cpu); + qtest_add_data_func("/numa/pc/dynamic/cpu", &data, pc_dynamic_cpu_= cfg); } =20 if (!strcmp(arch, "ppc64")) { - qtest_add_data_func("/numa/spapr/cpu/explicit", args, spapr_numa_c= pu); + qtest_add_data_func("/numa/spapr/cpu/explicit", &data, spapr_numa_= cpu); } =20 if (!strcmp(arch, "aarch64")) { - qtest_add_data_func("/numa/aarch64/cpu/explicit", args, + qtest_add_data_func("/numa/aarch64/cpu/explicit", &data, aarch64_numa_cpu); } =20 --=20 2.18.1