Re: [RFC PATCH 02/10] perf tests: add test for workqueue

From: Arnaldo Carvalho de Melo
Date: Wed Jul 14 2021 - 11:11:05 EST


Em Tue, Jul 13, 2021 at 02:11:13PM +0200, Riccardo Mancini escreveu:
> It will have subtests testing threadpool and workqueue separately.
> This patch only introduces the first subtest, checking that the
> threadpool is correctly created and destructed.
> This test will be expanded when new functions are added in next
> patches.
>
> Signed-off-by: Riccardo Mancini <rickyman7@xxxxxxxxx>
> ---
> tools/perf/tests/Build | 1 +
> tools/perf/tests/builtin-test.c | 9 +++
> tools/perf/tests/tests.h | 3 +
> tools/perf/tests/workqueue.c | 113 ++++++++++++++++++++++++++++++++
> 4 files changed, 126 insertions(+)
> create mode 100644 tools/perf/tests/workqueue.c
>
> diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
> index 650aec19d49052ca..eda6c78a37cfbc13 100644
> --- a/tools/perf/tests/Build
> +++ b/tools/perf/tests/Build
> @@ -64,6 +64,7 @@ perf-y += parse-metric.o
> perf-y += pe-file-parsing.o
> perf-y += expand-cgroup.o
> perf-y += perf-time-to-tsc.o
> +perf-y += workqueue.o
>
> $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
> $(call rule_mkdir)
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index 5e6242576236325c..2ff5d38ed83a723d 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -360,6 +360,15 @@ static struct test generic_tests[] = {
> .func = test__perf_time_to_tsc,
> .is_supported = test__tsc_is_supported,
> },
> + {
> + .desc = "Test workqueue lib",
> + .func = test__workqueue,
> + .subtest = {
> + .skip_if_fail = false,
> + .get_nr = test__workqueue_subtest_get_nr,
> + .get_desc = test__workqueue_subtest_get_desc,
> + }
> + },
> {
> .func = NULL,
> },
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index 1100dd55b657b779..9ca67113a7402463 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -127,6 +127,9 @@ int test__parse_metric(struct test *test, int subtest);
> int test__pe_file_parsing(struct test *test, int subtest);
> int test__expand_cgroup_events(struct test *test, int subtest);
> int test__perf_time_to_tsc(struct test *test, int subtest);
> +int test__workqueue(struct test *test, int subtest);
> +const char *test__workqueue_subtest_get_desc(int subtest);
> +int test__workqueue_subtest_get_nr(void);
>
> bool test__bp_signal_is_supported(void);
> bool test__bp_account_is_supported(void);
> diff --git a/tools/perf/tests/workqueue.c b/tools/perf/tests/workqueue.c
> new file mode 100644
> index 0000000000000000..1bd4d78c13eb3b14
> --- /dev/null
> +++ b/tools/perf/tests/workqueue.c
> @@ -0,0 +1,113 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <linux/kernel.h>
> +#include "tests.h"
> +#include "util/debug.h"
> +#include "util/workqueue/threadpool.h"
> +
> +struct threadpool_test_args_t {
> + int pool_size;
> +};
> +
> +static int __threadpool__prepare(struct threadpool_struct **pool, int pool_size)
> +{
> + *pool = create_threadpool(pool_size);
> + TEST_ASSERT_VAL("threadpool creation failure", *pool != NULL);
> + TEST_ASSERT_VAL("threadpool size is wrong",
> + threadpool_size(*pool) == pool_size);
> +
> + return 0;
> +}
> +
> +static int __threadpool__teardown(struct threadpool_struct *pool)
> +{
> + destroy_threadpool(pool);
> +
> + return 0;
> +}
> +
> +
> +static int __test__threadpool(void *_args)
> +{
> + struct threadpool_test_args_t *args = _args;
> + struct threadpool_struct *pool;
> + int ret;
> +
> + ret = __threadpool__prepare(&pool, args->pool_size);

Turn the last three lines into one;

int ret = __threadpool__prepare(&pool, args->pool_size);

> + if (ret)
> + return ret;
> +
> + ret = __threadpool__teardown(pool);
> + if (ret)
> + return ret;
> +
> + return 0;

Humm, will you add something here in the following csets? Otherwise turn
these 5 lines into one:

return __threadpool__teardown(pool);

> +}
> +
> +static const struct threadpool_test_args_t threadpool_test_args[] = {
> + {
> + .pool_size = 1
> + },
> + {
> + .pool_size = 2
> + },
> + {
> + .pool_size = 4
> + },
> + {
> + .pool_size = 8
> + },
> + {
> + .pool_size = 16
> + }
> +};
> +
> +struct test_case {
> + const char *desc;
> + int (*func)(void *args);
> + void *args;
> + int n_args;
> + int arg_size;
> +};
> +
> +static struct test_case workqueue_testcase_table[] = {
> + {
> + .desc = "Threadpool",
> + .func = __test__threadpool,
> + .args = (void *) threadpool_test_args,
> + .n_args = (int)ARRAY_SIZE(threadpool_test_args),
> + .arg_size = sizeof(struct threadpool_test_args_t)
> + }
> +};
> +
> +
> +int test__workqueue(struct test *test __maybe_unused, int i)
> +{
> + int j, ret = 0;
> + struct test_case *tc;
> +
> + if (i < 0 || i >= (int)ARRAY_SIZE(workqueue_testcase_table))
> + return -1;
> +
> + tc = &workqueue_testcase_table[i];
> +
> + for (j = 0; j < tc->n_args; j++) {
> + ret = tc->func(tc->args + (j*tc->arg_size));
> + if (ret)
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +
> +int test__workqueue_subtest_get_nr(void)
> +{
> + return (int)ARRAY_SIZE(workqueue_testcase_table);
> +}
> +
> +const char *test__workqueue_subtest_get_desc(int i)
> +{
> + if (i < 0 || i >= (int)ARRAY_SIZE(workqueue_testcase_table))
> + return NULL;
> + return workqueue_testcase_table[i].desc;
> +}
> --
> 2.31.1
>

--

- Arnaldo