lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 747/849] libbpf: Fix lookup_and_delete_elem_flags error reporting
    Date
    From: Mehrdad Arshad Rad <arshad.rad@gmail.com>

    [ Upstream commit 64165ddf8ea184631c65e3bbc8d59f6d940590ca ]

    Fix bpf_map_lookup_and_delete_elem_flags() to pass the return code through
    libbpf_err_errno() as we do similarly in bpf_map_lookup_and_delete_elem().

    Fixes: f12b65432728 ("libbpf: Streamline error reporting for low-level APIs")
    Signed-off-by: Mehrdad Arshad Rad <arshad.rad@gmail.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Yonghong Song <yhs@fb.com>
    Link: https://lore.kernel.org/bpf/20211104171354.11072-1-arshad.rad@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/bpf/bpf.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
    index 86dcac44f32f6..2c3ac0edf6ad3 100644
    --- a/tools/lib/bpf/bpf.c
    +++ b/tools/lib/bpf/bpf.c
    @@ -480,6 +480,7 @@ int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value)
    int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, __u64 flags)
    {
    union bpf_attr attr;
    + int ret;

    memset(&attr, 0, sizeof(attr));
    attr.map_fd = fd;
    @@ -487,7 +488,8 @@ int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, _
    attr.value = ptr_to_u64(value);
    attr.flags = flags;

    - return sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
    + ret = sys_bpf(BPF_MAP_LOOKUP_AND_DELETE_ELEM, &attr, sizeof(attr));
    + return libbpf_err_errno(ret);
    }

    int bpf_map_delete_elem(int fd, const void *key)
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:39    [W:2.273 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site