19 files changed, 66 insertions, 62 deletions

diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
index 0e1367f90af5..97f64ad7fa08 100644
--- a/tools/perf/tests/attr.c
+++ b/tools/perf/tests/attr.c
@@ -124,6 +124,12 @@ static int store_event(struct perf_event_attr *attr, pid_t pid, int cpu,
         WRITE_ASS(exclude_guest,  "d");
         WRITE_ASS(exclude_callchain_kernel, "d");
         WRITE_ASS(exclude_callchain_user, "d");
+        WRITE_ASS(mmap2,          "d");
+        WRITE_ASS(comm_exec,      "d");
+        WRITE_ASS(context_switch, "d");
+        WRITE_ASS(write_backward, "d");
+        WRITE_ASS(namespaces,     "d");
+        WRITE_ASS(use_clockid,    "d");
         WRITE_ASS(wakeup_events, PRIu32);
         WRITE_ASS(bp_type, PRIu32);
         WRITE_ASS(config1, "llu");
diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
index 71b9a0b613d2..4035d43523c3 100644
--- a/tools/perf/tests/backward-ring-buffer.c
+++ b/tools/perf/tests/backward-ring-buffer.c
@@ -33,8 +33,8 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count,
         for (i = 0; i < evlist->nr_mmaps; i++) {
                 union perf_event *event;
 
-                perf_mmap__read_catchup(&evlist->backward_mmap[i]);
-                while ((event = perf_mmap__read_backward(&evlist->backward_mmap[i])) != NULL) {
+                perf_mmap__read_catchup(&evlist->overwrite_mmap[i]);
+                while ((event = perf_mmap__read_backward(&evlist->overwrite_mmap[i])) != NULL) {
                         const u32 type = event->header.type;
 
                         switch (type) {
@@ -59,7 +59,7 @@ static int do_test(struct perf_evlist *evlist, int mmap_pages,
         int err;
         char sbuf[STRERR_BUFSIZE];
 
-        err = perf_evlist__mmap(evlist, mmap_pages, true);
+        err = perf_evlist__mmap(evlist, mmap_pages);
         if (err < 0) {
                 pr_debug("perf_evlist__mmap: %s\n",
                          str_error_r(errno, sbuf, sizeof(sbuf)));
diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c
index 335b695f4970..a467615c5a0e 100644
--- a/tools/perf/tests/bp_signal.c
+++ b/tools/perf/tests/bp_signal.c
@@ -296,7 +296,7 @@ bool test__bp_signal_is_supported(void)
  * instruction breakpoint using the perf event interface.
  * Once it's there we can release this.
  */
-#ifdef __powerpc__
+#if defined(__powerpc__) || defined(__s390x__)
         return false;
 #else
         return true;
diff --git a/tools/perf/tests/bpf-script-example.c b/tools/perf/tests/bpf-script-example.c
index 268e5f8e4aa2..e4123c1b0e88 100644
--- a/tools/perf/tests/bpf-script-example.c
+++ b/tools/perf/tests/bpf-script-example.c
@@ -31,8 +31,8 @@ struct bpf_map_def SEC("maps") flip_table = {
         .max_entries = 1,
 };
 
-SEC("func=SyS_epoll_wait")
-int bpf_func__SyS_epoll_wait(void *ctx)
+SEC("func=SyS_epoll_pwait")
+int bpf_func__SyS_epoll_pwait(void *ctx)
 {
         int ind =0;
         int *flag = bpf_map_lookup_elem(&flip_table, &ind);
diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 34c22cdf4d5d..e8399beca62b 100644
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -3,6 +3,7 @@
 #include <sys/epoll.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <util/util.h>
 #include <util/bpf-loader.h>
 #include <util/evlist.h>
@@ -19,13 +20,13 @@
 
 #ifdef HAVE_LIBBPF_SUPPORT
 
-static int epoll_wait_loop(void)
+static int epoll_pwait_loop(void)
 {
         int i;
 
         /* Should fail NR_ITERS times */
         for (i = 0; i < NR_ITERS; i++)
-                epoll_wait(-(i + 1), NULL, 0, 0);
+                epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
         return 0;
 }
 
@@ -63,46 +64,41 @@ static struct {
         bool    pin;
 } bpf_testcase_table[] = {
         {
-                LLVM_TESTCASE_BASE,
-                "Basic BPF filtering",
-                "[basic_bpf_test]",
-                "fix 'perf test LLVM' first",
-                "load bpf object failed",
-                &epoll_wait_loop,
-                (NR_ITERS + 1) / 2,
-                false,
+                .prog_id          = LLVM_TESTCASE_BASE,
+                .desc             = "Basic BPF filtering",
+                .name             = "[basic_bpf_test]",
+                .msg_compile_fail = "fix 'perf test LLVM' first",
+                .msg_load_fail    = "load bpf object failed",
+                .target_func      = &epoll_pwait_loop,
+                .expect_result    = (NR_ITERS + 1) / 2,
         },
         {
-                LLVM_TESTCASE_BASE,
-                "BPF pinning",
-                "[bpf_pinning]",
-                "fix kbuild first",
-                "check your vmlinux setting?",
-                &epoll_wait_loop,
-                (NR_ITERS + 1) / 2,
-                true,
+                .prog_id          = LLVM_TESTCASE_BASE,
+                .desc             = "BPF pinning",
+                .name             = "[bpf_pinning]",
+                .msg_compile_fail = "fix kbuild first",
+                .msg_load_fail    = "check your vmlinux setting?",
+                .target_func      = &epoll_pwait_loop,
+                .expect_result    = (NR_ITERS + 1) / 2,
+                .pin              = true,
         },
 #ifdef HAVE_BPF_PROLOGUE
         {
-                LLVM_TESTCASE_BPF_PROLOGUE,
-                "BPF prologue generation",
-                "[bpf_prologue_test]",
-                "fix kbuild first",
-                "check your vmlinux setting?",
-                &llseek_loop,
-                (NR_ITERS + 1) / 4,
-                false,
+                .prog_id          = LLVM_TESTCASE_BPF_PROLOGUE,
+                .desc             = "BPF prologue generation",
+                .name             = "[bpf_prologue_test]",
+                .msg_compile_fail = "fix kbuild first",
+                .msg_load_fail    = "check your vmlinux setting?",
+                .target_func      = &llseek_loop,
+                .expect_result    = (NR_ITERS + 1) / 4,
         },
 #endif
         {
-                LLVM_TESTCASE_BPF_RELOCATION,
-                "BPF relocation checker",
-                "[bpf_relocation_test]",
-                "fix 'perf test LLVM' first",
-                "libbpf error when dealing with relocation",
-                NULL,
-                0,
-                false,
+                .prog_id          = LLVM_TESTCASE_BPF_RELOCATION,
+                .desc             = "BPF relocation checker",
+                .name             = "[bpf_relocation_test]",
+                .msg_compile_fail = "fix 'perf test LLVM' first",
+                .msg_load_fail    = "libbpf error when dealing with relocation",
         },
 };
 
@@ -167,7 +163,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
                 goto out_delete_evlist;
         }
 
-        err = perf_evlist__mmap(evlist, opts.mmap_pages, false);
+        err = perf_evlist__mmap(evlist, opts.mmap_pages);
         if (err < 0) {
                 pr_debug("perf_evlist__mmap: %s\n",
                          str_error_r(errno, sbuf, sizeof(sbuf)));
@@ -190,7 +186,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
         }
 
         if (count != expect) {
-                pr_debug("BPF filter result incorrect\n");
+                pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
                 goto out_delete_evlist;
         }
 
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 766573e236e4..fafa014240cd 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -411,9 +411,9 @@ static const char *shell_test__description(char *description, size_t size,
         return description ? trim(description + 1) : NULL;
 }
 
-#define for_each_shell_test(dir, ent)           \
+#define for_each_shell_test(dir, base, ent)     \
         while ((ent = readdir(dir)) != NULL)    \
-                if (ent->d_type == DT_REG && ent->d_name[0] != '.')
+                if (!is_directory(base, ent))
 
 static const char *shell_tests__dir(char *path, size_t size)
 {
@@ -452,7 +452,7 @@ static int shell_tests__max_desc_width(void)
         if (!dir)
                 return -1;
 
-        for_each_shell_test(dir, ent) {
+        for_each_shell_test(dir, path, ent) {
                 char bf[256];
                 const char *desc = shell_test__description(bf, sizeof(bf), path, ent->d_name);
 
@@ -504,7 +504,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width)
         if (!dir)
                 return -1;
 
-        for_each_shell_test(dir, ent) {
+        for_each_shell_test(dir, st.dir, ent) {
                 int curr = i++;
                 char desc[256];
                 struct test test = {
@@ -614,7 +614,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
         if (!dir)
                 return -1;
 
-        for_each_shell_test(dir, ent) {
+        for_each_shell_test(dir, path, ent) {
                 int curr = i++;
                 char bf[256];
                 struct test t = {
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index fcc8984bc329..3bf7b145b826 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -639,7 +639,7 @@ static int do_test_code_reading(bool try_kcore)
                 break;
         }
 
-        ret = perf_evlist__mmap(evlist, UINT_MAX, false);
+        ret = perf_evlist__mmap(evlist, UINT_MAX);
         if (ret < 0) {
                 pr_debug("perf_evlist__mmap failed\n");
                 goto out_put;
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
index ac40e05bcab4..260418969120 100644
--- a/tools/perf/tests/dwarf-unwind.c
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -173,6 +173,7 @@ int test__dwarf_unwind(struct test *test __maybe_unused, int subtest __maybe_unu
         }
 
         callchain_param.record_mode = CALLCHAIN_DWARF;
+        dwarf_callchain_users = true;
 
         if (init_live_machine(machine)) {
                 pr_err("Could not init machine\n");
diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
index 842d33637a18..c46530918938 100644
--- a/tools/perf/tests/keep-tracking.c
+++ b/tools/perf/tests/keep-tracking.c
@@ -95,7 +95,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
                 goto out_err;
         }
 
-        CHECK__(perf_evlist__mmap(evlist, UINT_MAX, false));
+        CHECK__(perf_evlist__mmap(evlist, UINT_MAX));
 
         /*
          * First, test that a 'comm' event can be found when the event is
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 5a8bf318f8a7..c0e971da965c 100644
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -94,7 +94,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                 expected_nr_events[i] = 1 + rand() % 127;
         }
 
-        if (perf_evlist__mmap(evlist, 128, true) < 0) {
+        if (perf_evlist__mmap(evlist, 128) < 0) {
                 pr_debug("failed to mmap events: %d (%s)\n", errno,
                          str_error_r(errno, sbuf, sizeof(sbuf)));
                 goto out_delete_evlist;
diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index d9619d265314..43519267b93b 100644
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "perf.h"
 #include "evlist.h"
 #include "evsel.h"
@@ -64,7 +67,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
                 goto out_delete_evlist;
         }
 
-        err = perf_evlist__mmap(evlist, UINT_MAX, false);
+        err = perf_evlist__mmap(evlist, UINT_MAX);
         if (err < 0) {
                 pr_debug("perf_evlist__mmap: %s\n",
                          str_error_r(errno, sbuf, sizeof(sbuf)));
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index f0679613bd18..18b06444f230 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -13,7 +13,6 @@
 #include <unistd.h>
 #include <linux/kernel.h>
 #include <linux/hw_breakpoint.h>
-#include <api/fs/fs.h>
 #include <api/fs/tracing_path.h>
 
 #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index c34904d37705..0afafab85238 100644
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -141,7 +141,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
          * fds in the same CPU to be injected in the same mmap ring buffer
          * (using ioctl(PERF_EVENT_IOC_SET_OUTPUT)).
          */
-        err = perf_evlist__mmap(evlist, opts.mmap_pages, false);
+        err = perf_evlist__mmap(evlist, opts.mmap_pages);
         if (err < 0) {
                 pr_debug("perf_evlist__mmap: %s\n",
                          str_error_r(errno, sbuf, sizeof(sbuf)));
diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
index 3ec6302b6498..0e2d00d69e6e 100644
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -248,7 +248,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
         event->header.size = sz;
 
         err = perf_event__synthesize_sample(event, sample_type, read_format,
-                                            &sample, false);
+                                            &sample);
         if (err) {
                 pr_debug("%s failed for sample_type %#"PRIx64", error %d\n",
                          "perf_event__synthesize_sample", sample_type, err);
diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
index 2a9ef080efd0..55ad9793d544 100755
--- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
@@ -17,10 +17,9 @@ skip_if_no_perf_probe || exit 2
 file=$(mktemp /tmp/temporary_file.XXXXX)
 
 trace_open_vfs_getname() {
-        test "$(uname -m)" = s390x && { svc="openat"; txt="dfd: +CWD, +"; }
-
-        perf trace -e ${svc:-open} touch $file 2>&1 | \
-        egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ ${svc:-open}\(${txt}filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$"
+        evts=$(echo $(perf list syscalls:sys_enter_open* |& egrep 'open(at)? ' | sed -r 's/.*sys_enter_([a-z]+) +\[.*$/\1/') | sed 's/ /,/')
+        perf trace -e $evts touch $file 2>&1 | \
+        egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ open(at)?\((dfd: +CWD, +)?filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$"
 }
 
 
diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index 725a196991a8..f6c72f915d48 100644
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -78,7 +78,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                 goto out_delete_evlist;
         }
 
-        err = perf_evlist__mmap(evlist, 128, true);
+        err = perf_evlist__mmap(evlist, 128);
         if (err < 0) {
                 pr_debug("failed to mmap event: %d (%s)\n", errno,
                          str_error_r(errno, sbuf, sizeof(sbuf)));
diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index 7d3f4bf9534f..33e00295a972 100644
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -449,7 +449,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                 goto out;
         }
 
-        err = perf_evlist__mmap(evlist, UINT_MAX, false);
+        err = perf_evlist__mmap(evlist, UINT_MAX);
         if (err) {
                 pr_debug("perf_evlist__mmap failed!\n");
                 goto out_err;
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
index 89c8e1604ca7..01b62b81751b 100644
--- a/tools/perf/tests/task-exit.c
+++ b/tools/perf/tests/task-exit.c
@@ -101,7 +101,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
                 goto out_delete_evlist;
         }
 
-        if (perf_evlist__mmap(evlist, 128, true) < 0) {
+        if (perf_evlist__mmap(evlist, 128) < 0) {
                 pr_debug("failed to mmap events: %d (%s)\n", errno,
                          str_error_r(errno, sbuf, sizeof(sbuf)));
                 goto out_delete_evlist;
diff --git a/tools/perf/tests/thread-map.c b/tools/perf/tests/thread-map.c
index dbcb6a19b375..4de1939b58ba 100644
--- a/tools/perf/tests/thread-map.c
+++ b/tools/perf/tests/thread-map.c
@@ -105,7 +105,7 @@ int test__thread_map_remove(struct test *test __maybe_unused, int subtest __mayb
         TEST_ASSERT_VAL("failed to allocate map string",
                         asprintf(&str, "%d,%d", getpid(), getppid()) >= 0);
 
-        threads = thread_map__new_str(str, NULL, 0);
+        threads = thread_map__new_str(str, NULL, 0, false);
 
         TEST_ASSERT_VAL("failed to allocate thread_map",
                         threads);