diff mbox series

[2/2] tests: use -numa memdev option in tests instead of legacy 'mem' option

Message ID 20190702140745.27767-3-imammedo@redhat.com (mailing list archive)
State New, archived
Headers show
Series fix memory-less numa configuration and switch to memdev syntax in tests | expand

Commit Message

Igor Mammedov July 2, 2019, 2:07 p.m. UTC 
it will test preferred memdev option more extensively and remove
undesired deprecation warnings during 'make check'

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/bios-tables-test.c | 40 ++++++++++++++++++++++++++-----------
 tests/numa-test.c        | 43 +++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 24 deletions(-)

Comments

Eduardo Habkost July 2, 2019, 5:19 p.m. UTC | #1 
On Tue, Jul 02, 2019 at 10:07:45AM -0400, Igor Mammedov wrote:
> it will test preferred memdev option more extensively and remove
> undesired deprecation warnings during 'make check'
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
[...]
> diff --git a/tests/numa-test.c b/tests/numa-test.c
> index 8de8581231..902e8de4d1 100644
> --- a/tests/numa-test.c
> +++ b/tests/numa-test.c
> @@ -26,8 +26,10 @@ static void test_mon_explicit(const void *data)
>      QTestState *qts;
>  
>      cli = make_cli(data, "-smp 8 "
> -                   "-numa node,nodeid=0,cpus=0-3 "
> -                   "-numa node,nodeid=1,cpus=4-7 ");
> +                   "-object memory-backend-ram,id=ram0,size=64M "
> +                   "-object memory-backend-ram,id=ram1,size=64M "
> +                   "-numa node,nodeid=0,cpus=0-3,memdev=ram0 "
> +                   "-numa node,nodeid=1,cpus=4-7,memdev=ram1 ");

These changes break on ppc64, where default RAM size is 512 MiB
and it has to be a multiple of 256 MiB.

Can't we just make the warnings be conditional on
!qtest_enabled(), like we already do elsewhere?

>      qts = qtest_init(cli);
>  
>      s = qtest_hmp(qts, "info numa");
> @@ -45,7 +47,10 @@ static void test_mon_default(const void *data)
>      char *cli;
>      QTestState *qts;
>  
> -    cli = make_cli(data, "-smp 8 -numa node -numa node");
> +    cli = make_cli(data, "-smp 8 "
> +                   "-object memory-backend-ram,id=ram0,size=64M "
> +                   "-object memory-backend-ram,id=ram1,size=64M "
> +                   "-numa node,memdev=ram0 -numa node,memdev=ram1");
>      qts = qtest_init(cli);
>  
>      s = qtest_hmp(qts, "info numa");
> @@ -64,8 +69,10 @@ static void test_mon_partial(const void *data)
>      QTestState *qts;
>  
>      cli = make_cli(data, "-smp 8 "
> -                   "-numa node,nodeid=0,cpus=0-1 "
> -                   "-numa node,nodeid=1,cpus=4-5 ");
> +                   "-object memory-backend-ram,id=ram0,size=64M "
> +                   "-object memory-backend-ram,id=ram1,size=64M "
> +                   "-numa node,nodeid=0,cpus=0-1,memdev=ram0 "
> +                   "-numa node,nodeid=1,cpus=4-5,memdev=ram1");
>      qts = qtest_init(cli);
>  
>      s = qtest_hmp(qts, "info numa");
> @@ -93,7 +100,11 @@ static void test_query_cpus(const void *data)
>      QObject *e;
>      QTestState *qts;
>  
> -    cli = make_cli(data, "-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7");
> +    cli = make_cli(data, "-smp 8 "
> +                   "-object memory-backend-ram,id=ram0,size=64M "
> +                   "-object memory-backend-ram,id=ram1,size=64M "
> +                   "-numa node,cpus=0-3,memdev=ram0 "
> +                   "-numa node,cpus=4-7,memdev=ram1");
>      qts = qtest_init(cli);
>      cpus = get_cpus(qts, &resp);
>      g_assert(cpus);
> @@ -132,7 +143,9 @@ static void pc_numa_cpu(const void *data)
>      QTestState *qts;
>  
>      cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
> -        "-numa node,nodeid=0 -numa node,nodeid=1 "
> +        "-object memory-backend-ram,id=ram0,size=64M "
> +        "-object memory-backend-ram,id=ram1,size=64M "
> +        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
>          "-numa cpu,node-id=1,socket-id=0 "
>          "-numa cpu,node-id=0,socket-id=1,core-id=0 "
>          "-numa cpu,node-id=0,socket-id=1,core-id=1,thread-id=0 "
> @@ -186,7 +199,9 @@ static void spapr_numa_cpu(const void *data)
>      QTestState *qts;
>  
>      cli = make_cli(data, "-smp 4,cores=4 "
> -        "-numa node,nodeid=0 -numa node,nodeid=1 "
> +        "-object memory-backend-ram,id=ram0,size=64M "
> +        "-object memory-backend-ram,id=ram1,size=64M "
> +        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
>          "-numa cpu,node-id=0,core-id=0 "
>          "-numa cpu,node-id=0,core-id=1 "
>          "-numa cpu,node-id=0,core-id=2 "
> @@ -232,7 +247,9 @@ static void aarch64_numa_cpu(const void *data)
>      QTestState *qts;
>  
>      cli = make_cli(data, "-smp 2 "
> -        "-numa node,nodeid=0 -numa node,nodeid=1 "
> +        "-object memory-backend-ram,id=ram0,size=64M "
> +        "-object memory-backend-ram,id=ram1,size=64M "
> +        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
>          "-numa cpu,node-id=1,thread-id=0 "
>          "-numa cpu,node-id=0,thread-id=1");
>      qts = qtest_init(cli);
> @@ -274,14 +291,16 @@ static void pc_dynamic_cpu_cfg(const void *data)
>      QList *cpus;
>      QTestState *qs;
>  
> -    qs = qtest_initf("%s -nodefaults --preconfig -smp 2",
> +    qs = qtest_initf("%s -nodefaults --preconfig -smp 2 "
> +                     "-object memory-backend-ram,id=ram0,size=64M "
> +                     "-object memory-backend-ram,id=ram1,size=64M",
>                       data ? (char *)data : "");
>  
>      /* 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': 'ram0' } }")));
>      g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
> -        " 'arguments': { 'type': 'node', 'nodeid': 1 } }")));
> +        " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'ram1' } }")));
>  
>      /* map 2 cpus in non default reverse order
>       * i.e socket1->node0, socket0->node1
> -- 
> 2.18.1
>
Eduardo Habkost July 2, 2019, 10:03 p.m. UTC | #2 
On Tue, Jul 02, 2019 at 02:19:01PM -0300, Eduardo Habkost wrote:
> On Tue, Jul 02, 2019 at 10:07:45AM -0400, Igor Mammedov wrote:
> > it will test preferred memdev option more extensively and remove
> > undesired deprecation warnings during 'make check'
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> [...]
> > diff --git a/tests/numa-test.c b/tests/numa-test.c
> > index 8de8581231..902e8de4d1 100644
> > --- a/tests/numa-test.c
> > +++ b/tests/numa-test.c
> > @@ -26,8 +26,10 @@ static void test_mon_explicit(const void *data)
> >      QTestState *qts;
> >  
> >      cli = make_cli(data, "-smp 8 "
> > -                   "-numa node,nodeid=0,cpus=0-3 "
> > -                   "-numa node,nodeid=1,cpus=4-7 ");
> > +                   "-object memory-backend-ram,id=ram0,size=64M "
> > +                   "-object memory-backend-ram,id=ram1,size=64M "
> > +                   "-numa node,nodeid=0,cpus=0-3,memdev=ram0 "
> > +                   "-numa node,nodeid=1,cpus=4-7,memdev=ram1 ");
> 
> These changes break on ppc64, where default RAM size is 512 MiB
> and it has to be a multiple of 256 MiB.
> 
> Can't we just make the warnings be conditional on
> !qtest_enabled(), like we already do elsewhere?

The answer is: we can, but this is not enough for
bios-tables-test.c because it doesn't use accel=qtest.  I've
removed the numa-test.c changes from this patch, and added the
fix I have submitted at:

  Subject: numa: Make deprecation warnings conditional on !qtest_enabled()
  Message-Id: <20190702215726.23661-1-ehabkost@redhat.com>
Igor Mammedov July 3, 2019, 12:13 p.m. UTC | #3 
On Tue, 2 Jul 2019 19:03:10 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:

> On Tue, Jul 02, 2019 at 02:19:01PM -0300, Eduardo Habkost wrote:
> > On Tue, Jul 02, 2019 at 10:07:45AM -0400, Igor Mammedov wrote:  
> > > it will test preferred memdev option more extensively and remove
> > > undesired deprecation warnings during 'make check'
> > > 
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > ---  
> > [...]  
> > > diff --git a/tests/numa-test.c b/tests/numa-test.c
> > > index 8de8581231..902e8de4d1 100644
> > > --- a/tests/numa-test.c
> > > +++ b/tests/numa-test.c
> > > @@ -26,8 +26,10 @@ static void test_mon_explicit(const void *data)
> > >      QTestState *qts;
> > >  
> > >      cli = make_cli(data, "-smp 8 "
> > > -                   "-numa node,nodeid=0,cpus=0-3 "
> > > -                   "-numa node,nodeid=1,cpus=4-7 ");
> > > +                   "-object memory-backend-ram,id=ram0,size=64M "
> > > +                   "-object memory-backend-ram,id=ram1,size=64M "
> > > +                   "-numa node,nodeid=0,cpus=0-3,memdev=ram0 "
> > > +                   "-numa node,nodeid=1,cpus=4-7,memdev=ram1 ");  
> > 
> > These changes break on ppc64, where default RAM size is 512 MiB
> > and it has to be a multiple of 256 MiB.
> > 
> > Can't we just make the warnings be conditional on
> > !qtest_enabled(), like we already do elsewhere?  
> 
> The answer is: we can, but this is not enough for
> bios-tables-test.c because it doesn't use accel=qtest.  I've
> removed the numa-test.c changes from this patch, and added the
> fix I have submitted at:
> 
>   Subject: numa: Make deprecation warnings conditional on !qtest_enabled()
>   Message-Id: <20190702215726.23661-1-ehabkost@redhat.com>

acked as it fixes immediate issue with warnings.
I'll work on numa-test.c some more, since simple replacing of
mem with memdev is not enough
diff mbox series

Patch

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 0ce55182f2..d863233fe9 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -688,6 +688,8 @@  static void test_acpi_q35_tcg_mmio64(void)
     };
 
     test_acpi_one("-m 128M,slots=1,maxmem=2G "
+                  "-object memory-backend-ram,id=ram0,size=128M "
+                  "-numa node,memdev=ram0 "
                   "-device pci-testdev,membar=2G",
                   &data);
     free_test_data(&data);
@@ -701,7 +703,9 @@  static void test_acpi_piix4_tcg_cphp(void)
     data.machine = MACHINE_PC;
     data.variant = ".cphp";
     test_acpi_one("-smp 2,cores=3,sockets=2,maxcpus=6"
-                  " -numa node -numa node"
+                  " -object memory-backend-ram,id=ram0,size=64M"
+                  " -object memory-backend-ram,id=ram1,size=64M"
+                  " -numa node,memdev=ram0 -numa node,memdev=ram1"
                   " -numa dist,src=0,dst=1,val=21",
                   &data);
     free_test_data(&data);
@@ -715,7 +719,9 @@  static void test_acpi_q35_tcg_cphp(void)
     data.machine = MACHINE_Q35;
     data.variant = ".cphp";
     test_acpi_one(" -smp 2,cores=3,sockets=2,maxcpus=6"
-                  " -numa node -numa node"
+                  " -object memory-backend-ram,id=ram0,size=64M"
+                  " -object memory-backend-ram,id=ram1,size=64M"
+                  " -numa node,memdev=ram0 -numa node,memdev=ram1"
                   " -numa dist,src=0,dst=1,val=21",
                   &data);
     free_test_data(&data);
@@ -766,7 +772,9 @@  static void test_acpi_q35_tcg_memhp(void)
     data.machine = MACHINE_Q35;
     data.variant = ".memhp";
     test_acpi_one(" -m 128,slots=3,maxmem=1G"
-                  " -numa node -numa node"
+                  " -object memory-backend-ram,id=ram0,size=64M"
+                  " -object memory-backend-ram,id=ram1,size=64M"
+                  " -numa node,memdev=ram0 -numa node,memdev=ram1"
                   " -numa dist,src=0,dst=1,val=21",
                   &data);
     free_test_data(&data);
@@ -780,7 +788,9 @@  static void test_acpi_piix4_tcg_memhp(void)
     data.machine = MACHINE_PC;
     data.variant = ".memhp";
     test_acpi_one(" -m 128,slots=3,maxmem=1G"
-                  " -numa node -numa node"
+                  " -object memory-backend-ram,id=ram0,size=64M"
+                  " -object memory-backend-ram,id=ram1,size=64M"
+                  " -numa node,memdev=ram0 -numa node,memdev=ram1"
                   " -numa dist,src=0,dst=1,val=21",
                   &data);
     free_test_data(&data);
@@ -793,7 +803,8 @@  static void test_acpi_q35_tcg_numamem(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_Q35;
     data.variant = ".numamem";
-    test_acpi_one(" -numa node -numa node,mem=128", &data);
+    test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M"
+                  " -numa node -numa node,memdev=ram0", &data);
     free_test_data(&data);
 }
 
@@ -804,7 +815,8 @@  static void test_acpi_piix4_tcg_numamem(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_PC;
     data.variant = ".numamem";
-    test_acpi_one(" -numa node -numa node,mem=128", &data);
+    test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M"
+                  " -numa node -numa node,memdev=ram0", &data);
     free_test_data(&data);
 }
 
@@ -818,17 +830,21 @@  static void test_acpi_tcg_dimm_pxm(const char *machine)
     test_acpi_one(" -machine nvdimm=on,nvdimm-persistence=cpu"
                   " -smp 4,sockets=4"
                   " -m 128M,slots=3,maxmem=1G"
-                  " -numa node,mem=32M,nodeid=0"
-                  " -numa node,mem=32M,nodeid=1"
-                  " -numa node,mem=32M,nodeid=2"
-                  " -numa node,mem=32M,nodeid=3"
+                  " -object memory-backend-ram,id=ram0,size=32M"
+                  " -object memory-backend-ram,id=ram1,size=32M"
+                  " -object memory-backend-ram,id=ram2,size=32M"
+                  " -object memory-backend-ram,id=ram3,size=32M"
+                  " -numa node,memdev=ram0,nodeid=0"
+                  " -numa node,memdev=ram1,nodeid=1"
+                  " -numa node,memdev=ram2,nodeid=2"
+                  " -numa node,memdev=ram3,nodeid=3"
                   " -numa cpu,node-id=0,socket-id=0"
                   " -numa cpu,node-id=1,socket-id=1"
                   " -numa cpu,node-id=2,socket-id=2"
                   " -numa cpu,node-id=3,socket-id=3"
-                  " -object memory-backend-ram,id=ram0,size=128M"
+                  " -object memory-backend-ram,id=ram4,size=128M"
                   " -object memory-backend-ram,id=nvm0,size=128M"
-                  " -device pc-dimm,id=dimm0,memdev=ram0,node=1"
+                  " -device pc-dimm,id=dimm0,memdev=ram4,node=1"
                   " -device nvdimm,id=dimm1,memdev=nvm0,node=2",
                   &data);
     free_test_data(&data);
diff --git a/tests/numa-test.c b/tests/numa-test.c
index 8de8581231..902e8de4d1 100644
--- a/tests/numa-test.c
+++ b/tests/numa-test.c
@@ -26,8 +26,10 @@  static void test_mon_explicit(const void *data)
     QTestState *qts;
 
     cli = make_cli(data, "-smp 8 "
-                   "-numa node,nodeid=0,cpus=0-3 "
-                   "-numa node,nodeid=1,cpus=4-7 ");
+                   "-object memory-backend-ram,id=ram0,size=64M "
+                   "-object memory-backend-ram,id=ram1,size=64M "
+                   "-numa node,nodeid=0,cpus=0-3,memdev=ram0 "
+                   "-numa node,nodeid=1,cpus=4-7,memdev=ram1 ");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -45,7 +47,10 @@  static void test_mon_default(const void *data)
     char *cli;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 -numa node -numa node");
+    cli = make_cli(data, "-smp 8 "
+                   "-object memory-backend-ram,id=ram0,size=64M "
+                   "-object memory-backend-ram,id=ram1,size=64M "
+                   "-numa node,memdev=ram0 -numa node,memdev=ram1");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -64,8 +69,10 @@  static void test_mon_partial(const void *data)
     QTestState *qts;
 
     cli = make_cli(data, "-smp 8 "
-                   "-numa node,nodeid=0,cpus=0-1 "
-                   "-numa node,nodeid=1,cpus=4-5 ");
+                   "-object memory-backend-ram,id=ram0,size=64M "
+                   "-object memory-backend-ram,id=ram1,size=64M "
+                   "-numa node,nodeid=0,cpus=0-1,memdev=ram0 "
+                   "-numa node,nodeid=1,cpus=4-5,memdev=ram1");
     qts = qtest_init(cli);
 
     s = qtest_hmp(qts, "info numa");
@@ -93,7 +100,11 @@  static void test_query_cpus(const void *data)
     QObject *e;
     QTestState *qts;
 
-    cli = make_cli(data, "-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7");
+    cli = make_cli(data, "-smp 8 "
+                   "-object memory-backend-ram,id=ram0,size=64M "
+                   "-object memory-backend-ram,id=ram1,size=64M "
+                   "-numa node,cpus=0-3,memdev=ram0 "
+                   "-numa node,cpus=4-7,memdev=ram1");
     qts = qtest_init(cli);
     cpus = get_cpus(qts, &resp);
     g_assert(cpus);
@@ -132,7 +143,9 @@  static void pc_numa_cpu(const void *data)
     QTestState *qts;
 
     cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+        "-object memory-backend-ram,id=ram0,size=64M "
+        "-object memory-backend-ram,id=ram1,size=64M "
+        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
         "-numa cpu,node-id=1,socket-id=0 "
         "-numa cpu,node-id=0,socket-id=1,core-id=0 "
         "-numa cpu,node-id=0,socket-id=1,core-id=1,thread-id=0 "
@@ -186,7 +199,9 @@  static void spapr_numa_cpu(const void *data)
     QTestState *qts;
 
     cli = make_cli(data, "-smp 4,cores=4 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+        "-object memory-backend-ram,id=ram0,size=64M "
+        "-object memory-backend-ram,id=ram1,size=64M "
+        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
         "-numa cpu,node-id=0,core-id=0 "
         "-numa cpu,node-id=0,core-id=1 "
         "-numa cpu,node-id=0,core-id=2 "
@@ -232,7 +247,9 @@  static void aarch64_numa_cpu(const void *data)
     QTestState *qts;
 
     cli = make_cli(data, "-smp 2 "
-        "-numa node,nodeid=0 -numa node,nodeid=1 "
+        "-object memory-backend-ram,id=ram0,size=64M "
+        "-object memory-backend-ram,id=ram1,size=64M "
+        "-numa node,nodeid=0,memdev=ram0 -numa node,nodeid=1,memdev=ram1 "
         "-numa cpu,node-id=1,thread-id=0 "
         "-numa cpu,node-id=0,thread-id=1");
     qts = qtest_init(cli);
@@ -274,14 +291,16 @@  static void pc_dynamic_cpu_cfg(const void *data)
     QList *cpus;
     QTestState *qs;
 
-    qs = qtest_initf("%s -nodefaults --preconfig -smp 2",
+    qs = qtest_initf("%s -nodefaults --preconfig -smp 2 "
+                     "-object memory-backend-ram,id=ram0,size=64M "
+                     "-object memory-backend-ram,id=ram1,size=64M",
                      data ? (char *)data : "");
 
     /* 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': 'ram0' } }")));
     g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node',"
-        " 'arguments': { 'type': 'node', 'nodeid': 1 } }")));
+        " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'ram1' } }")));
 
     /* map 2 cpus in non default reverse order
      * i.e socket1->node0, socket0->node1