Fix test leaks introduced in commit 2941020a476. (and small extra space removed) Spotted by ASAN. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20170526110456.32004-1-marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
		
			
				
	
	
		
			307 lines
		
	
	
		
			7.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			307 lines
		
	
	
		
			7.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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);
 | 
						|
}
 | 
						|
 | 
						|
static QList *get_cpus(QDict **resp)
 | 
						|
{
 | 
						|
    *resp = qmp("{ 'execute': 'query-cpus' }");
 | 
						|
    g_assert(*resp);
 | 
						|
    g_assert(qdict_haskey(*resp, "return"));
 | 
						|
    return qdict_get_qlist(*resp, "return");
 | 
						|
}
 | 
						|
 | 
						|
static void test_query_cpus(const void *data)
 | 
						|
{
 | 
						|
    char *cli;
 | 
						|
    QDict *resp;
 | 
						|
    QList *cpus;
 | 
						|
    QObject *e;
 | 
						|
 | 
						|
    cli = make_cli(data, "-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7");
 | 
						|
    qtest_start(cli);
 | 
						|
    cpus = get_cpus(&resp);
 | 
						|
    g_assert(cpus);
 | 
						|
 | 
						|
    while ((e = qlist_pop(cpus))) {
 | 
						|
        QDict *cpu, *props;
 | 
						|
        int64_t cpu_idx, node;
 | 
						|
 | 
						|
        cpu = qobject_to_qdict(e);
 | 
						|
        g_assert(qdict_haskey(cpu, "CPU"));
 | 
						|
        g_assert(qdict_haskey(cpu, "props"));
 | 
						|
 | 
						|
        cpu_idx = qdict_get_int(cpu, "CPU");
 | 
						|
        props = qdict_get_qdict(cpu, "props");
 | 
						|
        g_assert(qdict_haskey(props, "node-id"));
 | 
						|
        node = qdict_get_int(props, "node-id");
 | 
						|
        if (cpu_idx >= 0 && cpu_idx < 4) {
 | 
						|
            g_assert_cmpint(node, ==, 0);
 | 
						|
        } else {
 | 
						|
            g_assert_cmpint(node, ==, 1);
 | 
						|
        }
 | 
						|
        qobject_decref(e);
 | 
						|
    }
 | 
						|
 | 
						|
    QDECREF(resp);
 | 
						|
    qtest_end();
 | 
						|
    g_free(cli);
 | 
						|
}
 | 
						|
 | 
						|
static void pc_numa_cpu(const void *data)
 | 
						|
{
 | 
						|
    char *cli;
 | 
						|
    QDict *resp;
 | 
						|
    QList *cpus;
 | 
						|
    QObject *e;
 | 
						|
 | 
						|
    cli = make_cli(data, "-cpu pentium -smp 8,sockets=2,cores=2,threads=2 "
 | 
						|
        "-numa node,nodeid=0 -numa node,nodeid=1 "
 | 
						|
        "-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 "
 | 
						|
        "-numa cpu,node-id=1,socket-id=1,core-id=1,thread-id=1");
 | 
						|
    qtest_start(cli);
 | 
						|
    cpus = get_cpus(&resp);
 | 
						|
    g_assert(cpus);
 | 
						|
 | 
						|
    while ((e = qlist_pop(cpus))) {
 | 
						|
        QDict *cpu, *props;
 | 
						|
        int64_t socket, core, thread, node;
 | 
						|
 | 
						|
        cpu = qobject_to_qdict(e);
 | 
						|
        g_assert(qdict_haskey(cpu, "props"));
 | 
						|
        props = qdict_get_qdict(cpu, "props");
 | 
						|
 | 
						|
        g_assert(qdict_haskey(props, "node-id"));
 | 
						|
        node = qdict_get_int(props, "node-id");
 | 
						|
        g_assert(qdict_haskey(props, "socket-id"));
 | 
						|
        socket = qdict_get_int(props, "socket-id");
 | 
						|
        g_assert(qdict_haskey(props, "core-id"));
 | 
						|
        core = qdict_get_int(props, "core-id");
 | 
						|
        g_assert(qdict_haskey(props, "thread-id"));
 | 
						|
        thread = qdict_get_int(props, "thread-id");
 | 
						|
 | 
						|
        if (socket == 0) {
 | 
						|
            g_assert_cmpint(node, ==, 1);
 | 
						|
        } else if (socket == 1 && core == 0) {
 | 
						|
            g_assert_cmpint(node, ==, 0);
 | 
						|
        } else if (socket == 1 && core == 1 && thread == 0) {
 | 
						|
            g_assert_cmpint(node, ==, 0);
 | 
						|
        } else if (socket == 1 && core == 1 && thread == 1) {
 | 
						|
            g_assert_cmpint(node, ==, 1);
 | 
						|
        } else {
 | 
						|
            g_assert(false);
 | 
						|
        }
 | 
						|
        qobject_decref(e);
 | 
						|
    }
 | 
						|
 | 
						|
    QDECREF(resp);
 | 
						|
    qtest_end();
 | 
						|
    g_free(cli);
 | 
						|
}
 | 
						|
 | 
						|
static void spapr_numa_cpu(const void *data)
 | 
						|
{
 | 
						|
    char *cli;
 | 
						|
    QDict *resp;
 | 
						|
    QList *cpus;
 | 
						|
    QObject *e;
 | 
						|
 | 
						|
    cli = make_cli(data, "-smp 4,cores=4 "
 | 
						|
        "-numa node,nodeid=0 -numa node,nodeid=1 "
 | 
						|
        "-numa cpu,node-id=0,core-id=0 "
 | 
						|
        "-numa cpu,node-id=0,core-id=1 "
 | 
						|
        "-numa cpu,node-id=0,core-id=2 "
 | 
						|
        "-numa cpu,node-id=1,core-id=3");
 | 
						|
    qtest_start(cli);
 | 
						|
    cpus = get_cpus(&resp);
 | 
						|
    g_assert(cpus);
 | 
						|
 | 
						|
    while ((e = qlist_pop(cpus))) {
 | 
						|
        QDict *cpu, *props;
 | 
						|
        int64_t core, node;
 | 
						|
 | 
						|
        cpu = qobject_to_qdict(e);
 | 
						|
        g_assert(qdict_haskey(cpu, "props"));
 | 
						|
        props = qdict_get_qdict(cpu, "props");
 | 
						|
 | 
						|
        g_assert(qdict_haskey(props, "node-id"));
 | 
						|
        node = qdict_get_int(props, "node-id");
 | 
						|
        g_assert(qdict_haskey(props, "core-id"));
 | 
						|
        core = qdict_get_int(props, "core-id");
 | 
						|
 | 
						|
        if (core >= 0 && core < 3) {
 | 
						|
            g_assert_cmpint(node, ==, 0);
 | 
						|
        } else if (core == 3) {
 | 
						|
            g_assert_cmpint(node, ==, 1);
 | 
						|
        } else {
 | 
						|
            g_assert(false);
 | 
						|
        }
 | 
						|
        qobject_decref(e);
 | 
						|
    }
 | 
						|
 | 
						|
    QDECREF(resp);
 | 
						|
    qtest_end();
 | 
						|
    g_free(cli);
 | 
						|
}
 | 
						|
 | 
						|
static void aarch64_numa_cpu(const void *data)
 | 
						|
{
 | 
						|
    char *cli;
 | 
						|
    QDict *resp;
 | 
						|
    QList *cpus;
 | 
						|
    QObject *e;
 | 
						|
 | 
						|
    cli = make_cli(data, "-smp 2 "
 | 
						|
        "-numa node,nodeid=0 -numa node,nodeid=1 "
 | 
						|
        "-numa cpu,node-id=1,thread-id=0 "
 | 
						|
        "-numa cpu,node-id=0,thread-id=1");
 | 
						|
    qtest_start(cli);
 | 
						|
    cpus = get_cpus(&resp);
 | 
						|
    g_assert(cpus);
 | 
						|
 | 
						|
    while ((e = qlist_pop(cpus))) {
 | 
						|
        QDict *cpu, *props;
 | 
						|
        int64_t thread, node;
 | 
						|
 | 
						|
        cpu = qobject_to_qdict(e);
 | 
						|
        g_assert(qdict_haskey(cpu, "props"));
 | 
						|
        props = qdict_get_qdict(cpu, "props");
 | 
						|
 | 
						|
        g_assert(qdict_haskey(props, "node-id"));
 | 
						|
        node = qdict_get_int(props, "node-id");
 | 
						|
        g_assert(qdict_haskey(props, "thread-id"));
 | 
						|
        thread = qdict_get_int(props, "thread-id");
 | 
						|
 | 
						|
        if (thread == 0) {
 | 
						|
            g_assert_cmpint(node, ==, 1);
 | 
						|
        } else if (thread == 1) {
 | 
						|
            g_assert_cmpint(node, ==, 0);
 | 
						|
        } else {
 | 
						|
            g_assert(false);
 | 
						|
        }
 | 
						|
        qobject_decref(e);
 | 
						|
    }
 | 
						|
 | 
						|
    QDECREF(resp);
 | 
						|
    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);
 | 
						|
    qtest_add_data_func("/numa/qmp/cpus/query-cpus", args, test_query_cpus);
 | 
						|
 | 
						|
    if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) {
 | 
						|
        qtest_add_data_func("/numa/pc/cpu/explicit", args, pc_numa_cpu);
 | 
						|
    }
 | 
						|
 | 
						|
    if (!strcmp(arch, "ppc64")) {
 | 
						|
        qtest_add_data_func("/numa/spapr/cpu/explicit", args, spapr_numa_cpu);
 | 
						|
    }
 | 
						|
 | 
						|
    if (!strcmp(arch, "aarch64")) {
 | 
						|
        qtest_add_data_func("/numa/aarch64/cpu/explicit", args,
 | 
						|
                            aarch64_numa_cpu);
 | 
						|
    }
 | 
						|
 | 
						|
    return g_test_run();
 | 
						|
}
 |