lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 479/800] selftests/bpf: Fix ringbuf test fetching map FD
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ Upstream commit 0c38740c08962ab109267cb23f4a40df2ccf2bbf ]

    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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/prog_tests/ringbuf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/bpf/prog_tests/ringbuf.c b/tools/testing/selftests/bpf/prog_tests/ringbuf.c
    index f9a8ae331963..2a0549ae13f3 100644
    --- a/tools/testing/selftests/bpf/prog_tests/ringbuf.c
    +++ b/tools/testing/selftests/bpf/prog_tests/ringbuf.c
    @@ -102,7 +102,7 @@ void test_ringbuf(void)
    if (CHECK(err != 0, "skel_load", "skeleton load failed\n"))
    goto cleanup;

    - rb_fd = bpf_map__fd(skel->maps.ringbuf);
    + rb_fd = skel->maps.ringbuf.map_fd;
    /* good read/write cons_pos */
    mmap_ptr = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, rb_fd, 0);
    ASSERT_OK_PTR(mmap_ptr, "rw_cons_pos");
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:10    [W:2.779 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site