selftests/bpf: Fix bpf_cookie and find_vma in nested VM
Subsystems (3)
Song Liu
reviewerPATCH 1/1 selftests/bpf: Fix bpf_cookie and find_vma in nested VM
bpf_cookie and find_vma are flaky in nested VMs, which is used by some CI systems. It turns out these failures are caused by unreliable perf event in nested VM. Fix these by:
1. Use PERF_COUNT_SW_CPU_CLOCK in find_vma;
2. Increase sample_freq in bpf_cookie.
--- tools/testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- tools/testing/selftests/bpf/prog_tests/find_vma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_cookie.c +1 -1
@@ -451,7 +451,7 @@ static void pe_subtest(struct test_bpf_cookie *skel) attr.type =PERF_TYPE_SOFTWARE ; attr.config =PERF_COUNT_SW_CPU_CLOCK ; attr.freq =1 ; - attr.sample_freq =1000 ; + attr.sample_freq =10000 ; pfd =syscall (__NR_perf_event_open, &attr,-1 ,0 ,-1 ,PERF_FLAG_FD_CLOEXEC );if (!ASSERT_GE (pfd,0 ,"perf_fd" )) goto cleanup;
tools/testing/selftests/bpf/prog_tests/find_vma.c +2 -2
@@ -29,8 +29,8 @@ static int open_pe(void)/* create perf event */ attr.size =sizeof (attr); - attr.type =PERF_TYPE_HARDWARE ; - attr.config =PERF_COUNT_HW_CPU_CYCLES ; + attr.type =PERF_TYPE_SOFTWARE ; + attr.config =PERF_COUNT_SW_CPU_CLOCK ; attr.freq =1 ; attr.sample_freq =1000 ; pfd =syscall (__NR_perf_event_open, &attr,0 ,-1 ,-1 ,PERF_FLAG_FD_CLOEXEC );
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 8 lines · On Tue, 4 Jun 2024 00:07:00 -0700 you wrote:
bpf_cookieandfind_vmaare flaky in nested VMs, which is used by some CI systems. It turns out these failures are caused by unreliable perf event in nested VM. Fix these by:1. Use
PERF_COUNT_SW_CPU_CLOCKinfind_vma;
2. Increasesample_freqinbpf_cookie.[...]
Here is the summary with links:
- [bpf-next] selftests/bpf: Fix bpf_cookie and find_vma in nested VM
https://git.kernel.org/bpf/bpf-next/c/61ce0ea7591f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html