| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20111220173805.GC22107@infradead.org>
Date: Tue, 20 Dec 2011 15:38:06 -0200
From: Arnaldo Carvalho de Melo <acme@...hat.com>
To: Jiri Olsa <jolsa@...hat.com>
Cc: a.p.zijlstra@...llo.nl, mingo@...e.hu, paulus@...ba.org,
cjashfor@...ux.vnet.ibm.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 3/3] perf, tool: Add more automated tests for event
parsing
Em Thu, Dec 15, 2011 at 04:30:39PM +0100, Jiri Olsa escreveu:
> Adding automated tests for event parsing to include testing
> for modifier, ',' operator and group_leader.
Aha! Brownie points hereby granted, good stuff,
- Arnaldo
> Signed-off-by: Jiri Olsa <jolsa@...hat.com>
> ---
> tools/perf/builtin-test.c | 245 ++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 244 insertions(+), 1 deletions(-)
>
> diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
> index 6173f78..0cdb4c9 100644
> --- a/tools/perf/builtin-test.c
> +++ b/tools/perf/builtin-test.c
> @@ -603,7 +603,7 @@ out_free_threads:
>
> #define TEST_ASSERT_VAL(text, cond) \
> do { \
> - if (!cond) { \
> + if (!(cond)) { \
> pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
> return -1; \
> } \
> @@ -759,6 +759,201 @@ static int test__checkevent_breakpoint_w(struct perf_evlist *evlist)
> return 0;
> }
>
> +static int test__checkevent_tracepoint_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> +
> + return test__checkevent_tracepoint(evlist);
> +}
> +
> +static int
> +test__checkevent_tracepoint_multi_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel;
> +
> + TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
> +
> + list_for_each_entry(evsel, &evlist->entries, node) {
> + TEST_ASSERT_VAL("wrong exclude_user",
> + !evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel",
> + evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> + }
> +
> + return test__checkevent_tracepoint_multi(evlist);
> +}
> +
> +static int test__checkevent_raw_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> +
> + return test__checkevent_raw(evlist);
> +}
> +
> +static int test__checkevent_numeric_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> +
> + return test__checkevent_numeric(evlist);
> +}
> +
> +static int test__checkevent_symbolic_name_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> +
> + return test__checkevent_symbolic_name(evlist);
> +}
> +
> +static int test__checkevent_symbolic_alias_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> +
> + return test__checkevent_symbolic_alias(evlist);
> +}
> +
> +static int test__checkevent_genhw_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> +
> + return test__checkevent_genhw(evlist);
> +}
> +
> +static int test__checkevent_breakpoint_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> +
> + return test__checkevent_breakpoint(evlist);
> +}
> +
> +static int test__checkevent_breakpoint_x_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> +
> + return test__checkevent_breakpoint_x(evlist);
> +}
> +
> +static int test__checkevent_breakpoint_r_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> +
> + return test__checkevent_breakpoint_r(evlist);
> +}
> +
> +static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel = list_entry(evlist->entries.next,
> + struct perf_evsel, node);
> +
> + TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> +
> + return test__checkevent_breakpoint_w(evlist);
> +}
> +
> +static int test__checkevent_list(struct perf_evlist *evlist)
> +{
> + struct perf_evsel *evsel;
> + struct perf_evsel *group_leader;
> +
> + TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->nr_entries);
> +
> + /* r1 */
> + evsel = list_entry(evlist->entries.next, struct perf_evsel, node);
> + group_leader = evsel;
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
> + TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
> + TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> + TEST_ASSERT_VAL("wrong group_leader", !evsel->group_leader);
> +
> + /* syscalls:sys_enter_open:k */
> + evsel = list_entry(evsel->node.next, struct perf_evsel, node);
> + TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
> + TEST_ASSERT_VAL("wrong sample_type",
> + (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==
> + evsel->attr.sample_type);
> + TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
> + TEST_ASSERT_VAL("wrong group_leader",
> + evsel->group_leader == group_leader);
> +
> + /* 1:1:hp */
> + evsel = list_entry(evsel->node.next, struct perf_evsel, node);
> + TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
> + TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
> + TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
> + TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
> + TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
> + TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
> + TEST_ASSERT_VAL("wrong group_leader",
> + evsel->group_leader == group_leader);
> +
> + return 0;
> +}
> +
> static struct test__event_st {
> const char *name;
> __u32 type;
> @@ -808,6 +1003,54 @@ static struct test__event_st {
> .name = "mem:0:w",
> .check = test__checkevent_breakpoint_w,
> },
> + {
> + .name = "syscalls:sys_enter_open:k",
> + .check = test__checkevent_tracepoint_modifier,
> + },
> + {
> + .name = "syscalls:*:u",
> + .check = test__checkevent_tracepoint_multi_modifier,
> + },
> + {
> + .name = "r1:kp",
> + .check = test__checkevent_raw_modifier,
> + },
> + {
> + .name = "1:1:hp",
> + .check = test__checkevent_numeric_modifier,
> + },
> + {
> + .name = "instructions:h",
> + .check = test__checkevent_symbolic_name_modifier,
> + },
> + {
> + .name = "faults:u",
> + .check = test__checkevent_symbolic_alias_modifier,
> + },
> + {
> + .name = "L1-dcache-load-miss:kp",
> + .check = test__checkevent_genhw_modifier,
> + },
> + {
> + .name = "mem:0:u",
> + .check = test__checkevent_breakpoint_modifier,
> + },
> + {
> + .name = "mem:0:x:k",
> + .check = test__checkevent_breakpoint_x_modifier,
> + },
> + {
> + .name = "mem:0:r:hp",
> + .check = test__checkevent_breakpoint_r_modifier,
> + },
> + {
> + .name = "mem:0:w:up",
> + .check = test__checkevent_breakpoint_w_modifier,
> + },
> + {
> + .name = "r1,syscalls:sys_enter_open:k,1:1:hp",
> + .check = test__checkevent_list,
> + },
> };
>
> #define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))
> --
> 1.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists