selftests/bpf: remove perf buffer helpers

libbpf's perf_buffer API supersedes trace_helper.h's helpers.
Remove those helpers after all existing users were already moved to
perf_buffer API.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c
index b47f205f0310340cc9048888c12b5a009502a198..7f989b3e4e2279dd89c3a73c43ce283fe645920d 100644 (file)
--- a/tools/testing/selftests/bpf/trace_helpers.c
+++ b/tools/testing/selftests/bpf/trace_helpers.c
@@ -86,128 +86,3 @@ long ksym_get_addr(const char *name)
 
        return 0;
 }
-
-static int page_size;
-static int page_cnt = 8;
-static struct perf_event_mmap_page *header;
-
-int perf_event_mmap_header(int fd, struct perf_event_mmap_page **header)
-{
-       void *base;
-       int mmap_size;
-
-       page_size = getpagesize();
-       mmap_size = page_size * (page_cnt + 1);
-
-       base = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-       if (base == MAP_FAILED) {
-               printf("mmap err\n");
-               return -1;
-       }
-
-       *header = base;
-       return 0;
-}
-
-int perf_event_mmap(int fd)
-{
-       return perf_event_mmap_header(fd, &header);
-}
-
-static int perf_event_poll(int fd)
-{
-       struct pollfd pfd = { .fd = fd, .events = POLLIN };
-
-       return poll(&pfd, 1, 1000);
-}
-
-struct perf_event_sample {
-       struct perf_event_header header;
-       __u32 size;
-       char data[];
-};
-
-static enum bpf_perf_event_ret
-bpf_perf_event_print(struct perf_event_header *hdr, void *private_data)
-{
-       struct perf_event_sample *e = (struct perf_event_sample *)hdr;
-       perf_event_print_fn fn = private_data;
-       int ret;
-
-       if (e->header.type == PERF_RECORD_SAMPLE) {
-               ret = fn(e->data, e->size);
-               if (ret != LIBBPF_PERF_EVENT_CONT)
-                       return ret;
-       } else if (e->header.type == PERF_RECORD_LOST) {
-               struct {
-                       struct perf_event_header header;
-                       __u64 id;
-                       __u64 lost;
-               } *lost = (void *) e;
-               printf("lost %lld events\n", lost->lost);
-       } else {
-               printf("unknown event type=%d size=%d\n",
-                      e->header.type, e->header.size);
-       }
-
-       return LIBBPF_PERF_EVENT_CONT;
-}
-
-int perf_event_poller(int fd, perf_event_print_fn output_fn)
-{
-       enum bpf_perf_event_ret ret;
-       void *buf = NULL;
-       size_t len = 0;
-
-       for (;;) {
-               perf_event_poll(fd);
-               ret = bpf_perf_event_read_simple(header, page_cnt * page_size,
-                                                page_size, &buf, &len,
-                                                bpf_perf_event_print,
-                                                output_fn);
-               if (ret != LIBBPF_PERF_EVENT_CONT)
-                       break;
-       }
-       free(buf);
-
-       return ret;
-}
-
-int perf_event_poller_multi(int *fds, struct perf_event_mmap_page **headers,
-                           int num_fds, perf_event_print_fn output_fn)
-{
-       enum bpf_perf_event_ret ret;
-       struct pollfd *pfds;
-       void *buf = NULL;
-       size_t len = 0;
-       int i;
-
-       pfds = calloc(num_fds, sizeof(*pfds));
-       if (!pfds)
-               return LIBBPF_PERF_EVENT_ERROR;
-
-       for (i = 0; i < num_fds; i++) {
-               pfds[i].fd = fds[i];
-               pfds[i].events = POLLIN;
-       }
-
-       for (;;) {
-               poll(pfds, num_fds, 1000);
-               for (i = 0; i < num_fds; i++) {
-                       if (!pfds[i].revents)
-                               continue;
-
-                       ret = bpf_perf_event_read_simple(headers[i],
-                                                        page_cnt * page_size,
-                                                        page_size, &buf, &len,
-                                                        bpf_perf_event_print,
-                                                        output_fn);
-                       if (ret != LIBBPF_PERF_EVENT_CONT)
-                               break;
-               }
-       }
-       free(buf);
-       free(pfds);
-
-       return ret;
-}

diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h
index 18924f23db1b99f30fbf198830868d98d7eb42b4..aa4dcfe180508dd3b2fef12cf9d7cf32ccc5d13a 100644 (file)
--- a/tools/testing/selftests/bpf/trace_helpers.h
+++ b/tools/testing/selftests/bpf/trace_helpers.h
@@ -3,7 +3,6 @@
 #define __TRACE_HELPER_H
 
 #include <libbpf.h>
-#include <linux/perf_event.h>
 
 struct ksym {
        long addr;
@@ -14,12 +13,4 @@ int load_kallsyms(void);
 struct ksym *ksym_search(long key);
 long ksym_get_addr(const char *name);
 
-typedef enum bpf_perf_event_ret (*perf_event_print_fn)(void *data, int size);
-
-int perf_event_mmap(int fd);
-int perf_event_mmap_header(int fd, struct perf_event_mmap_page **header);
-/* return LIBBPF_PERF_EVENT_DONE or LIBBPF_PERF_EVENT_ERROR */
-int perf_event_poller(int fd, perf_event_print_fn output_fn);
-int perf_event_poller_multi(int *fds, struct perf_event_mmap_page **headers,
-                           int num_fds, perf_event_print_fn output_fn);
 #endif