Skip to contentSkip to conversation

perf test: Fix basic bpf filtering test

PATCH Applied Sumanth Korikkar 2 participants 3 messages Aug 17, 2020 – Sep 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf test: Fix basic bpf filtering test

BPF basic filtering test fails on s390x (when vmlinux debuginfo is utilized instead of /proc/kallsyms)

Info:
- bpf_probe_load installs the bpf code at do_epoll_wait.
- For s390x, do_epoll_wait resolves to 3 functions including inlines. found inline addr: 0x43769e
Probe point found: __s390_sys_epoll_wait+6
found inline addr: 0x437290
Probe point found: do_epoll_wait+0
found inline addr: 0x4375d6
Probe point found: __se_sys_epoll_wait+6
- add_bpf_event creates evsel for every probe in a BPF object. This results in 3 evsels.

Solution:
- Expected result = 50% of the samples to be collected from epoll_wait * number of entries present in the evlist.

---
 tools/perf/tests/bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/bpf.c +1 -1
index 5d20bf8397f0..cd77e334e577 100644
@@ -197,7 +197,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
 		perf_mmap__read_done(&md->core);
 	}
 
-	if (count != expect) {
+	if (count != expect * evlist->core.nr_entries) {
 		pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
 		goto out_delete_evlist;
 	}
Signature · 1 line
2.17.1
#1 lore raw

Kind Ping. Thank you.

Quoted 38 lines · Sumanth Korikkar

BPF basic filtering test fails on s390x (when vmlinux debuginfo is utilized instead of /proc/kallsyms)

Info:
- bpf_probe_load installs the bpf code at do_epoll_wait.
- For s390x, do_epoll_wait resolves to 3 functions including inlines. found inline addr: 0x43769e
Probe point found: __s390_sys_epoll_wait+6
found inline addr: 0x437290
Probe point found: do_epoll_wait+0
found inline addr: 0x4375d6
Probe point found: __se_sys_epoll_wait+6
- add_bpf_event creates evsel for every probe in a BPF object. This results in 3 evsels.

Solution:
- Expected result = 50% of the samples to be collected from epoll_wait * number of entries present in the evlist.

---
  tools/perf/tests/bpf.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/bpf.c +1 -1
index 5d20bf8397f0..cd77e334e577 100644
@@ -197,7 +197,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
  		perf_mmap__read_done(&md->core);
  	}
 
-	if (count != expect) {
+	if (count != expect * evlist->core.nr_entries) {
  		pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
  		goto out_delete_evlist;
  	}
Signature · 1 line
Sumanth Korikkar
maintainer Applied
#2 lore raw

Em Tue, Aug 25, 2020 at 10:32:45AM +0200, Sumanth Korikkar escreveu:

Quoted 1 line

Kind Ping. Thank you.

I've applied it already, will go to Linus today.

- Arnaldo

Quoted 42 lines · Sumanth Korikkar
Quoted 37 lines

BPF basic filtering test fails on s390x (when vmlinux debuginfo is utilized instead of /proc/kallsyms)

Info:
- bpf_probe_load installs the bpf code at do_epoll_wait.
- For s390x, do_epoll_wait resolves to 3 functions including inlines. found inline addr: 0x43769e
Probe point found: __s390_sys_epoll_wait+6
found inline addr: 0x437290
Probe point found: do_epoll_wait+0
found inline addr: 0x4375d6
Probe point found: __se_sys_epoll_wait+6
- add_bpf_event creates evsel for every probe in a BPF object. This results in 3 evsels.

Solution:
- Expected result = 50% of the samples to be collected from epoll_wait * number of entries present in the evlist.

---
  tools/perf/tests/bpf.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/bpf.c +1 -1
index 5d20bf8397f0..cd77e334e577 100644
@@ -197,7 +197,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
  		perf_mmap__read_done(&md->core);
  	}
-	if (count != expect) {
+	if (count != expect * evlist->core.nr_entries) {
  		pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
  		goto out_delete_evlist;
  	}
Signature · 1 line
Sumanth Korikkar
Signature · 1 line
- Arnaldo