]> git.baikalelectronics.ru Git - kernel.git/commit
selftests/bpf: Fix ringbuf test fetching map FD
authorAndrii Nakryiko <andrii@kernel.org>
Fri, 18 Jun 2021 00:28:24 +0000 (17:28 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 18 Jun 2021 01:23:55 +0000 (18:23 -0700)
commit8b8ca537dcf5299cc24025265ce2b0f854c3a2da
treebb3252a57e3dedf3c0255ce2bd9a680684953e48
parentf83450fb87664841cb2d79643c7937094ac8ce9d
selftests/bpf: Fix ringbuf test fetching map FD

Seems like 22d0375184cb ("selftests/bpf: Convert few tests to light skeleton.")
and 1236c2fe6d65 ("selftests/bpf: Test ringbuf mmap read-only and read-write
restrictions") were done independently on bpf and bpf-next trees and are in
conflict with each other, despite a clean merge. Fix fetching of ringbuf's
map_fd to use light skeleton properly.

Fixes: 1236c2fe6d65 ("selftests/bpf: Test ringbuf mmap read-only and read-write restrictions")
Fixes: 22d0375184cb ("selftests/bpf: Convert few tests to light skeleton.")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210618002824.2081922-1-andrii@kernel.org
tools/testing/selftests/bpf/prog_tests/ringbuf.c