OSDN Git Service

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)
commit0c38740c08962ab109267cb23f4a40df2ccf2bbf
treebb3252a57e3dedf3c0255ce2bd9a680684953e48
parent8fe088bd4fd12f4c8899b51d5bc3daad98767d49
selftests/bpf: Fix ringbuf test fetching map FD

Seems like 4d1b62986125 ("selftests/bpf: Convert few tests to light skeleton.")
and 704e2beba23c ("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: 704e2beba23c ("selftests/bpf: Test ringbuf mmap read-only and read-write restrictions")
Fixes: 4d1b62986125 ("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