perf tests: Switch from open to openat

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>

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index b5b87a24a9e7993537acda257551acaf8a0c98bb..87b9961646e4a5f08728e694549195d9eeb2ad86 100644 (file)
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -23,12 +23,12 @@ static struct test {
                .func = test__vmlinux_matches_kallsyms,
        },
        {
-               .desc = "detect open syscall event",
-               .func = test__open_syscall_event,
+               .desc = "detect openat syscall event",
+               .func = test__openat_syscall_event,
        },
        {
-               .desc = "detect open syscall event on all cpus",
-               .func = test__open_syscall_event_on_all_cpus,
+               .desc = "detect openat syscall event on all cpus",
+               .func = test__openat_syscall_event_on_all_cpus,
        },
        {
                .desc = "read samples using the mmap interface",
@@ -73,8 +73,8 @@ static struct test {
                .func = test__perf_evsel__tp_sched_test,
        },
        {
-               .desc = "Generate and check syscalls:sys_enter_open event fields",
-               .func = test__syscall_open_tp_fields,
+               .desc = "Generate and check syscalls:sys_enter_openat event fields",
+               .func = test__syscall_openat_tp_fields,
        },
        {
                .desc = "struct perf_event_attr setup",

diff --git a/tools/perf/tests/open-syscall-all-cpus.c b/tools/perf/tests/open-syscall-all-cpus.c
index 3ec885c48f8fbcc77bdeaf0891fa54a2aa3935bc..e34dfdf96b5acc601ea50e7616c165647f6291ca 100644 (file)
--- a/tools/perf/tests/open-syscall-all-cpus.c
+++ b/tools/perf/tests/open-syscall-all-cpus.c
@@ -4,12 +4,12 @@
 #include "cpumap.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;
        struct cpu_map *cpus;
        struct perf_evsel *evsel;
-       unsigned int nr_open_calls = 111, i;
+       unsigned int nr_openat_calls = 111, i;
        cpu_set_t cpu_set;
        struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX);
        char sbuf[STRERR_BUFSIZE];
@@ -27,7 +27,7 @@ int test__open_syscall_event_on_all_cpus(void)
 
        CPU_ZERO(&cpu_set);
 
-       evsel = perf_evsel__newtp("syscalls", "sys_enter_open");
+       evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
        if (evsel == NULL) {
                if (tracefs_configured())
                        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) {
-               unsigned int ncalls = nr_open_calls + cpu;
+               unsigned int ncalls = nr_openat_calls + cpu;
                /*
                 * XXX eventually lift this restriction in a way that
                 * keeps perf building on older glibc installations
@@ -66,7 +66,7 @@ int test__open_syscall_event_on_all_cpus(void)
                        goto out_close_fd;
                }
                for (i = 0; i < ncalls; ++i) {
-                       fd = open("/etc/passwd", O_RDONLY);
+                       fd = openat(0, "/etc/passwd", O_RDONLY);
                        close(fd);
                }
                CPU_CLR(cpus->map[cpu], &cpu_set);
@@ -96,7 +96,7 @@ int test__open_syscall_event_on_all_cpus(void)
                        break;
                }
 
-               expected = nr_open_calls + cpu;
+               expected = nr_openat_calls + cpu;
                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",
                                 expected, cpus->map[cpu], evsel->counts->cpu[cpu].val);

diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c
index 127dcae0b76033cf457a4a4ff572da6771594e6f..6245221479d766fb9e227064bcdc42742cae65d3 100644 (file)
--- a/tools/perf/tests/open-syscall-tp-fields.c
+++ b/tools/perf/tests/open-syscall-tp-fields.c
@@ -5,7 +5,7 @@
 #include "tests.h"
 #include "debug.h"
 
-int test__syscall_open_tp_fields(void)
+int test__syscall_openat_tp_fields(void)
 {
        struct record_opts opts = {
                .target = {
@@ -29,7 +29,7 @@ int test__syscall_open_tp_fields(void)
                goto out;
        }
 
-       evsel = perf_evsel__newtp("syscalls", "sys_enter_open");
+       evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
        if (evsel == NULL) {
                pr_debug("%s: perf_evsel__newtp\n", __func__);
                goto out_delete_evlist;
@@ -66,7 +66,7 @@ int test__syscall_open_tp_fields(void)
        /*
         * Generate the event:
         */
-       open(filename, flags);
+       openat(AT_FDCWD, filename, flags);
 
        while (1) {
                int before = nr_events;

diff --git a/tools/perf/tests/open-syscall.c b/tools/perf/tests/open-syscall.c
index 07aa319bf334f37cc63d5c17efacce2faca54676..9f9491bb8e4897faddcffed824b3d094f73b7d3d 100644 (file)
--- a/tools/perf/tests/open-syscall.c
+++ b/tools/perf/tests/open-syscall.c
@@ -3,11 +3,11 @@
 #include "debug.h"
 #include "tests.h"
 
-int test__open_syscall_event(void)
+int test__openat_syscall_event(void)
 {
        int err = -1, fd;
        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);
        char sbuf[STRERR_BUFSIZE];
 
@@ -16,7 +16,7 @@ int test__open_syscall_event(void)
                return -1;
        }
 
-       evsel = perf_evsel__newtp("syscalls", "sys_enter_open");
+       evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
        if (evsel == NULL) {
                if (tracefs_configured())
                        pr_debug("is tracefs mounted on /sys/kernel/tracing?\n");
@@ -34,8 +34,8 @@ int test__open_syscall_event(void)
                goto out_evsel_delete;
        }
 
-       for (i = 0; i < nr_open_calls; ++i) {
-               fd = open("/etc/passwd", O_RDONLY);
+       for (i = 0; i < nr_openat_calls; ++i) {
+               fd = openat(0, "/etc/passwd", O_RDONLY);
                close(fd);
        }
 
@@ -44,9 +44,9 @@ int test__open_syscall_event(void)
                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",
-                        nr_open_calls, evsel->counts->cpu[0].val);
+                        nr_openat_calls, evsel->counts->cpu[0].val);
                goto out_close_fd;
        }
 

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 82d2a1636f7f1f3d18a0901298a1a51e0b14777d..d76963f7ad3d4a0a117af25f69bcc364d475fa11 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -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 precise_ip", !evsel->attr.precise_ip);
 
-       /* syscalls:sys_enter_open:k */
+       /* syscalls:sys_enter_openat:k */
        evsel = perf_evsel__next(evsel);
        TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.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 groups", 2 == evlist->nr_groups);
 
-       /* group1 syscalls:sys_enter_open:H */
+       /* group1 syscalls:sys_enter_openat:H */
        evsel = leader = perf_evlist__first(evlist);
        TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
        TEST_ASSERT_VAL("wrong sample_type",
@@ -1293,7 +1293,7 @@ struct evlist_test {
 
 static struct evlist_test test__events[] = {
        {
-               .name  = "syscalls:sys_enter_open",
+               .name  = "syscalls:sys_enter_openat",
                .check = test__checkevent_tracepoint,
                .id    = 0,
        },
@@ -1353,7 +1353,7 @@ static struct evlist_test test__events[] = {
                .id    = 11,
        },
        {
-               .name  = "syscalls:sys_enter_open:k",
+               .name  = "syscalls:sys_enter_openat:k",
                .check = test__checkevent_tracepoint_modifier,
                .id    = 12,
        },
@@ -1408,7 +1408,7 @@ static struct evlist_test test__events[] = {
                .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,
                .id    = 23,
        },
@@ -1443,7 +1443,7 @@ static struct evlist_test test__events[] = {
                .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,
                .id    = 30,
        },

diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 87bcaf16ae990bf339861638ff2e1011afa1b25b..8e5038b48ba8dfe3313d9c508156ae9b4ecb8c5a 100644 (file)
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -26,14 +26,14 @@ enum {
 
 /* Tests */
 int test__vmlinux_matches_kallsyms(void);
-int test__open_syscall_event(void);
-int test__open_syscall_event_on_all_cpus(void);
+int test__openat_syscall_event(void);
+int test__openat_syscall_event_on_all_cpus(void);
 int test__basic_mmap(void);
 int test__PERF_RECORD(void);
 int test__rdpmc(void);
 int test__perf_evsel__roundtrip_name_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__attr(void);
 int test__dso_data(void);