Re: [Qemu-devel] [PATCH for-2.10 01/23] tests: add CPUs to numa node mapping test

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 5647 bytes --]

On Wed, Mar 22, 2017 at 02:32:26PM +0100, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  tests/Makefile.include |   5 +++
>  tests/numa-test.c      | 106 +++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 111 insertions(+)
>  create mode 100644 tests/numa-test.c
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 402e71c..4547b01 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -260,6 +260,7 @@ check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
>  check-qtest-i386-y += tests/test-filter-redirector$(EXESUF)
>  check-qtest-i386-y += tests/postcopy-test$(EXESUF)
>  check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
> +check-qtest-i386-y += tests/numa-test$(EXESUF)
>  check-qtest-x86_64-y += $(check-qtest-i386-y)
>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
>  gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
> @@ -300,6 +301,7 @@ check-qtest-ppc64-y += tests/test-netfilter$(EXESUF)
>  check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)
>  check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF)
>  check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
> +check-qtest-ppc64-y += tests/numa-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_EVENTFD) += tests/ivshmem-test$(EXESUF)
>  
>  check-qtest-sh4-y = tests/endianness-test$(EXESUF)
> @@ -324,6 +326,8 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
>  check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
>  gcov-files-arm-y += hw/timer/arm_mptimer.c
>  
> +check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> +
>  check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
>  
>  check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
> @@ -747,6 +751,7 @@ tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o contrib/libvhost-use
>  tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
>  tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
>  tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
> +tests/numa-test$(EXESUF): tests/numa-test.o
>  
>  tests/migration/stress$(EXESUF): tests/migration/stress.o
>  	$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"LINK","$(TARGET_DIR)$@")
> diff --git a/tests/numa-test.c b/tests/numa-test.c
> new file mode 100644
> index 0000000..f5da0c8
> --- /dev/null
> +++ b/tests/numa-test.c
> @@ -0,0 +1,106 @@
> +/*
> + * NUMA configuration test cases
> + *
> + * Copyright (c) 2017 Red Hat Inc.
> + * Authors:
> + *  Igor Mammedov <imammedo@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "libqtest.h"
> +
> +static char *make_cli(const char *generic_cli, const char *test_cli)
> +{
> +    return g_strdup_printf("%s %s", generic_cli ? generic_cli : "", test_cli);
> +}
> +
> +static char *hmp_info_numa(void)
> +{
> +    QDict *resp;
> +    char *s;
> +
> +    resp = qmp("{ 'execute': 'human-monitor-command', 'arguments': "
> +                      "{ 'command-line': 'info numa '} }");
> +    g_assert(resp);
> +    g_assert(qdict_haskey(resp, "return"));
> +    s = g_strdup(qdict_get_str(resp, "return"));
> +    g_assert(s);
> +    QDECREF(resp);
> +    return s;
> +}
> +
> +static void test_mon_explicit(const void *data)
> +{
> +    char *s;
> +    char *cli;
> +
> +    cli = make_cli(data, "-smp 8 "
> +                   "-numa node,nodeid=0,cpus=0-3 "
> +                   "-numa node,nodeid=1,cpus=4-7 ");
> +    qtest_start(cli);
> +
> +    s = hmp_info_numa();
> +    g_assert(strstr(s, "node 0 cpus: 0 1 2 3"));
> +    g_assert(strstr(s, "node 1 cpus: 4 5 6 7"));
> +    g_free(s);
> +
> +    qtest_end();
> +    g_free(cli);
> +}
> +
> +static void test_mon_default(const void *data)
> +{
> +    char *s;
> +    char *cli;
> +
> +    cli = make_cli(data, "-smp 8 -numa node -numa node");
> +    qtest_start(cli);
> +
> +    s = hmp_info_numa();
> +    g_assert(strstr(s, "node 0 cpus: 0 2 4 6"));
> +    g_assert(strstr(s, "node 1 cpus: 1 3 5 7"));
> +    g_free(s);
> +
> +    qtest_end();
> +    g_free(cli);
> +}
> +
> +static void test_mon_partial(const void *data)
> +{
> +    char *s;
> +    char *cli;
> +
> +    cli = make_cli(data, "-smp 8 "
> +                   "-numa node,nodeid=0,cpus=0-1 "
> +                   "-numa node,nodeid=1,cpus=4-5 ");
> +    qtest_start(cli);
> +
> +    s = hmp_info_numa();
> +    g_assert(strstr(s, "node 0 cpus: 0 1 2 3 6 7"));
> +    g_assert(strstr(s, "node 1 cpus: 4 5"));
> +    g_free(s);
> +
> +    qtest_end();
> +    g_free(cli);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +    const char *args = NULL;
> +    const char *arch = qtest_get_arch();
> +
> +    if (strcmp(arch, "aarch64") == 0) {
> +        args = "-machine virt";
> +    }
> +
> +    g_test_init(&argc, &argv, NULL);
> +
> +    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);
> +
> +    return g_test_run();
> +}

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]