linux-raspberrypi: Remove unused patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@ -1,35 +0,0 @@
|
||||
From 754e3030788702c1f013a88a4fc8546742d84e27 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 18 Jun 2020 13:45:04 -0700
|
||||
Subject: [PATCH] Revert "selftests/bpf: Skip perf hw events test if the setup
|
||||
disabled it"
|
||||
|
||||
This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
.../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
|
||||
index 437cb93e72ac..f62aa0eb959b 100644
|
||||
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
|
||||
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
|
||||
@@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void)
|
||||
pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
|
||||
0 /* cpu 0 */, -1 /* group id */,
|
||||
0 /* flags */);
|
||||
- if (pmu_fd < 0 && errno == ENOENT) {
|
||||
- printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__);
|
||||
- test__skip();
|
||||
- goto close_prog;
|
||||
- }
|
||||
- if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n",
|
||||
+ if (CHECK(pmu_fd < 0, "perf_event_open",
|
||||
+ "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n",
|
||||
pmu_fd, errno))
|
||||
goto close_prog;
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
@ -1,94 +0,0 @@
|
||||
From 366487b86a8c87954fb4ab7bd88ab49a929a32f6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 13 Apr 2020 11:25:58 -0700
|
||||
Subject: [PATCH 2/2] Revert "selftests/bpf: Fix perf_buffer test on systems w/
|
||||
offline CPUs"
|
||||
|
||||
This reverts commit 77bb53cb094828a31cd3c5b402899810f63073c1.
|
||||
---
|
||||
.../selftests/bpf/prog_tests/perf_buffer.c | 29 ++++---------------
|
||||
1 file changed, 5 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
|
||||
index cf6c87936c69..3003fddc0613 100644
|
||||
--- a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
|
||||
+++ b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <sched.h>
|
||||
#include <sys/socket.h>
|
||||
#include <test_progs.h>
|
||||
-#include "libbpf_internal.h"
|
||||
|
||||
static void on_sample(void *ctx, int cpu, void *data, __u32 size)
|
||||
{
|
||||
@@ -20,7 +19,7 @@ static void on_sample(void *ctx, int cpu, void *data, __u32 size)
|
||||
|
||||
void test_perf_buffer(void)
|
||||
{
|
||||
- int err, prog_fd, on_len, nr_on_cpus = 0, nr_cpus, i, duration = 0;
|
||||
+ int err, prog_fd, nr_cpus, i, duration = 0;
|
||||
const char *prog_name = "kprobe/sys_nanosleep";
|
||||
const char *file = "./test_perf_buffer.o";
|
||||
struct perf_buffer_opts pb_opts = {};
|
||||
@@ -30,27 +29,15 @@ void test_perf_buffer(void)
|
||||
struct bpf_object *obj;
|
||||
struct perf_buffer *pb;
|
||||
struct bpf_link *link;
|
||||
- bool *online;
|
||||
|
||||
nr_cpus = libbpf_num_possible_cpus();
|
||||
if (CHECK(nr_cpus < 0, "nr_cpus", "err %d\n", nr_cpus))
|
||||
return;
|
||||
|
||||
- err = parse_cpu_mask_file("/sys/devices/system/cpu/online",
|
||||
- &online, &on_len);
|
||||
- if (CHECK(err, "nr_on_cpus", "err %d\n", err))
|
||||
- return;
|
||||
-
|
||||
- for (i = 0; i < on_len; i++)
|
||||
- if (online[i])
|
||||
- nr_on_cpus++;
|
||||
-
|
||||
/* load program */
|
||||
err = bpf_prog_load(file, BPF_PROG_TYPE_KPROBE, &obj, &prog_fd);
|
||||
- if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) {
|
||||
- obj = NULL;
|
||||
- goto out_close;
|
||||
- }
|
||||
+ if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno))
|
||||
+ return;
|
||||
|
||||
prog = bpf_object__find_program_by_title(obj, prog_name);
|
||||
if (CHECK(!prog, "find_probe", "prog '%s' not found\n", prog_name))
|
||||
@@ -77,11 +64,6 @@ void test_perf_buffer(void)
|
||||
/* trigger kprobe on every CPU */
|
||||
CPU_ZERO(&cpu_seen);
|
||||
for (i = 0; i < nr_cpus; i++) {
|
||||
- if (i >= on_len || !online[i]) {
|
||||
- printf("skipping offline CPU #%d\n", i);
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
CPU_ZERO(&cpu_set);
|
||||
CPU_SET(i, &cpu_set);
|
||||
|
||||
@@ -99,8 +81,8 @@ void test_perf_buffer(void)
|
||||
if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err))
|
||||
goto out_free_pb;
|
||||
|
||||
- if (CHECK(CPU_COUNT(&cpu_seen) != nr_on_cpus, "seen_cpu_cnt",
|
||||
- "expect %d, seen %d\n", nr_on_cpus, CPU_COUNT(&cpu_seen)))
|
||||
+ if (CHECK(CPU_COUNT(&cpu_seen) != nr_cpus, "seen_cpu_cnt",
|
||||
+ "expect %d, seen %d\n", nr_cpus, CPU_COUNT(&cpu_seen)))
|
||||
goto out_free_pb;
|
||||
|
||||
out_free_pb:
|
||||
@@ -109,5 +91,4 @@ void test_perf_buffer(void)
|
||||
bpf_link__destroy(link);
|
||||
out_close:
|
||||
bpf_object__close(obj);
|
||||
- free(online);
|
||||
}
|
||||
--
|
||||
2.26.0
|
||||
|
Reference in New Issue
Block a user