leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tests: Switch from open to openat

Browse Source 
Multiple perf tests fail on arm64 due to missing open syscall:

 2: detect open syscall event                              : FAILED!

open(2) is a legacy syscall, replaced with openat(2) since 2.6.16.  Thus
new architectures in kernel, such as arm64, don't implement these legacy
syscalls.

The patch replaces all sys_enter_open events with sys_enter_openat,
renames the related tests and test output to avoid confusion.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1429192375-13706-2-git-send-email-riku.voipio@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Riku Voipio
2015-04-16 16:52:53 +03:00
committed by Arnaldo Carvalho de Melo
parent 3237f28188
commit 43f322b4ab
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/tests/builtin-test.c
View File

@@ -23,12 +23,12 @@ static struct test {
.func = test__vmlinux_matches_kallsyms, .func = test__vmlinux_matches_kallsyms,
}, },
{ {
.desc = "detect open syscall event", .desc = "detect openat syscall event",
.func = test__open_syscall_event, .func = test__openat_syscall_event,
}, },
{ {
.desc = "detect open syscall event on all cpus", .desc = "detect openat syscall event on all cpus",
.func = test__open_syscall_event_on_all_cpus, .func = test__openat_syscall_event_on_all_cpus,
}, },
{ {
.desc = "read samples using the mmap interface", .desc = "read samples using the mmap interface",
@@ -73,8 +73,8 @@ static struct test {
.func = test__perf_evsel__tp_sched_test, .func = test__perf_evsel__tp_sched_test,
}, },
{ {
.desc = "Generate and check syscalls:sys_enter_open event fields", .desc = "Generate and check syscalls:sys_enter_openat event fields",
.func = test__syscall_open_tp_fields, .func = test__syscall_openat_tp_fields,
}, },
{ {
.desc = "struct perf_event_attr setup", .desc = "struct perf_event_attr setup",

12
tools/perf/tests/open-syscall-all-cpus.c
View File

@@ -4,12 +4,12 @@
#include "cpumap.h" #include "cpumap.h"
#include "debug.h" #include "debug.h"
int test__open_syscall_event_on_all_cpus(void) int test__openat_syscall_event_on_all_cpus(void)
{ {
int err = -1, fd, cpu; int err = -1, fd, cpu;
struct cpu_map *cpus; struct cpu_map *cpus;
struct perf_evsel *evsel; struct perf_evsel *evsel;
unsigned int nr_open_calls = 111, i; unsigned int nr_openat_calls = 111, i;
cpu_set_t cpu_set; cpu_set_t cpu_set;
struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX);
char sbuf[STRERR_BUFSIZE]; char sbuf[STRERR_BUFSIZE];
@@ -27,7 +27,7 @@ int test__open_syscall_event_on_all_cpus(void)
CPU_ZERO(&cpu_set); CPU_ZERO(&cpu_set);
evsel = perf_evsel__newtp("syscalls", "sys_enter_open"); evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
if (evsel == NULL) { if (evsel == NULL) {
if (tracefs_configured()) if (tracefs_configured())
pr_debug("is tracefs mounted on /sys/kernel/tracing?\n"); pr_debug("is tracefs mounted on /sys/kernel/tracing?\n");
@@ -46,7 +46,7 @@ int test__open_syscall_event_on_all_cpus(void)
} }
for (cpu = 0; cpu < cpus->nr; ++cpu) { for (cpu = 0; cpu < cpus->nr; ++cpu) {
unsigned int ncalls = nr_open_calls + cpu; unsigned int ncalls = nr_openat_calls + cpu;
/* /*
* XXX eventually lift this restriction in a way that * XXX eventually lift this restriction in a way that
* keeps perf building on older glibc installations * keeps perf building on older glibc installations
@@ -66,7 +66,7 @@ int test__open_syscall_event_on_all_cpus(void)
goto out_close_fd; goto out_close_fd;
} }
for (i = 0; i < ncalls; ++i) { for (i = 0; i < ncalls; ++i) {
fd = open("/etc/passwd", O_RDONLY); fd = openat(0, "/etc/passwd", O_RDONLY);
close(fd); close(fd);
} }
CPU_CLR(cpus->map[cpu], &cpu_set); CPU_CLR(cpus->map[cpu], &cpu_set);
@@ -96,7 +96,7 @@ int test__open_syscall_event_on_all_cpus(void)
break; break;
} }
expected = nr_open_calls + cpu; expected = nr_openat_calls + cpu;
if (evsel->counts->cpu[cpu].val != expected) { if (evsel->counts->cpu[cpu].val != expected) {
pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n", pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n",
expected, cpus->map[cpu], evsel->counts->cpu[cpu].val); expected, cpus->map[cpu], evsel->counts->cpu[cpu].val);

6
tools/perf/tests/open-syscall-tp-fields.c
View File

@@ -5,7 +5,7 @@
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
int test__syscall_open_tp_fields(void) int test__syscall_openat_tp_fields(void)
{ {
struct record_opts opts = { struct record_opts opts = {
.target = { .target = {
@@ -29,7 +29,7 @@ int test__syscall_open_tp_fields(void)
goto out; goto out;
} }
evsel = perf_evsel__newtp("syscalls", "sys_enter_open"); evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
if (evsel == NULL) { if (evsel == NULL) {
pr_debug("%s: perf_evsel__newtp\n", __func__); pr_debug("%s: perf_evsel__newtp\n", __func__);
goto out_delete_evlist; goto out_delete_evlist;
@@ -66,7 +66,7 @@ int test__syscall_open_tp_fields(void)
/* /*
* Generate the event: * Generate the event:
*/ */
open(filename, flags); openat(AT_FDCWD, filename, flags);
while (1) { while (1) {
int before = nr_events; int before = nr_events;

14
tools/perf/tests/open-syscall.c
View File

@@ -3,11 +3,11 @@
#include "debug.h" #include "debug.h"
#include "tests.h" #include "tests.h"
int test__open_syscall_event(void) int test__openat_syscall_event(void)
{ {
int err = -1, fd; int err = -1, fd;
struct perf_evsel *evsel; struct perf_evsel *evsel;
unsigned int nr_open_calls = 111, i; unsigned int nr_openat_calls = 111, i;
struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX);
char sbuf[STRERR_BUFSIZE]; char sbuf[STRERR_BUFSIZE];
@@ -16,7 +16,7 @@ int test__open_syscall_event(void)
return -1; return -1;
} }
evsel = perf_evsel__newtp("syscalls", "sys_enter_open"); evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
if (evsel == NULL) { if (evsel == NULL) {
if (tracefs_configured()) if (tracefs_configured())
pr_debug("is tracefs mounted on /sys/kernel/tracing?\n"); pr_debug("is tracefs mounted on /sys/kernel/tracing?\n");
@@ -34,8 +34,8 @@ int test__open_syscall_event(void)
goto out_evsel_delete; goto out_evsel_delete;
} }
for (i = 0; i < nr_open_calls; ++i) { for (i = 0; i < nr_openat_calls; ++i) {
fd = open("/etc/passwd", O_RDONLY); fd = openat(0, "/etc/passwd", O_RDONLY);
close(fd); close(fd);
} }
@@ -44,9 +44,9 @@ int test__open_syscall_event(void)
goto out_close_fd; goto out_close_fd;
} }
if (evsel->counts->cpu[0].val != nr_open_calls) { if (evsel->counts->cpu[0].val != nr_openat_calls) {
pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n", pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n",
nr_open_calls, evsel->counts->cpu[0].val); nr_openat_calls, evsel->counts->cpu[0].val);
goto out_close_fd; goto out_close_fd;
} }

12
tools/perf/tests/parse-events.c
View File

@@ -427,7 +427,7 @@ static int test__checkevent_list(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv); TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
/* syscalls:sys_enter_open:k */ /* syscalls:sys_enter_openat:k */
evsel = perf_evsel__next(evsel); evsel = perf_evsel__next(evsel);
TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type); TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
TEST_ASSERT_VAL("wrong sample_type", TEST_ASSERT_VAL("wrong sample_type",
@@ -665,7 +665,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->nr_entries); TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups); TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups);
/* group1 syscalls:sys_enter_open:H */ /* group1 syscalls:sys_enter_openat:H */
evsel = leader = perf_evlist__first(evlist); evsel = leader = perf_evlist__first(evlist);
TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type); TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
TEST_ASSERT_VAL("wrong sample_type", TEST_ASSERT_VAL("wrong sample_type",
@@ -1293,7 +1293,7 @@ struct evlist_test {
static struct evlist_test test__events[] = { static struct evlist_test test__events[] = {
{ {
.name = "syscalls:sys_enter_open", .name = "syscalls:sys_enter_openat",
.check = test__checkevent_tracepoint, .check = test__checkevent_tracepoint,
.id = 0, .id = 0,
}, },
@@ -1353,7 +1353,7 @@ static struct evlist_test test__events[] = {
.id = 11, .id = 11,
}, },
{ {
.name = "syscalls:sys_enter_open:k", .name = "syscalls:sys_enter_openat:k",
.check = test__checkevent_tracepoint_modifier, .check = test__checkevent_tracepoint_modifier,
.id = 12, .id = 12,
}, },
@@ -1408,7 +1408,7 @@ static struct evlist_test test__events[] = {
.id = 22, .id = 22,
}, },
{ {
.name = "r1,syscalls:sys_enter_open:k,1:1:hp", .name = "r1,syscalls:sys_enter_openat:k,1:1:hp",
.check = test__checkevent_list, .check = test__checkevent_list,
.id = 23, .id = 23,
}, },
@@ -1443,7 +1443,7 @@ static struct evlist_test test__events[] = {
.id = 29, .id = 29,
}, },
{ {
.name = "group1{syscalls:sys_enter_open:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u", .name = "group1{syscalls:sys_enter_openat:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u",
.check = test__group3, .check = test__group3,
.id = 30, .id = 30,
}, },

6
tools/perf/tests/tests.h
View File

@@ -26,14 +26,14 @@ enum {
/* Tests */ /* Tests */
int test__vmlinux_matches_kallsyms(void); int test__vmlinux_matches_kallsyms(void);
int test__open_syscall_event(void); int test__openat_syscall_event(void);
int test__open_syscall_event_on_all_cpus(void); int test__openat_syscall_event_on_all_cpus(void);
int test__basic_mmap(void); int test__basic_mmap(void);
int test__PERF_RECORD(void); int test__PERF_RECORD(void);
int test__rdpmc(void); int test__rdpmc(void);
int test__perf_evsel__roundtrip_name_test(void); int test__perf_evsel__roundtrip_name_test(void);
int test__perf_evsel__tp_sched_test(void); int test__perf_evsel__tp_sched_test(void);
int test__syscall_open_tp_fields(void); int test__syscall_openat_tp_fields(void);
int test__pmu(void); int test__pmu(void);
int test__attr(void); int test__attr(void);
int test__dso_data(void); int test__dso_data(void);