lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0698/1126] bpftool: Fix print error when show bpf map
    Date
    From: Yafang Shao <laoar.shao@gmail.com>

    [ Upstream commit 1824d8ea75f275a5e69e5f6bc0ffe122ea9b938c ]

    If there is no btf_id or frozen, it will not show the pids, but the pids don't
    depend on any one of them.

    Below is the result after this change:

    $ ./bpftool map show
    2: lpm_trie flags 0x1
    key 8B value 8B max_entries 1 memlock 4096B
    pids systemd(1)
    3: lpm_trie flags 0x1
    key 20B value 8B max_entries 1 memlock 4096B
    pids systemd(1)

    While before this change, the 'pids systemd(1)' can't be displayed.

    Fixes: 9330986c0300 ("bpf: Add bloom filter map implementation")
    Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20220320060815.7716-1-laoar.shao@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/bpftool/map.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
    index e746642de292..0bba33729c7f 100644
    --- a/tools/bpf/bpftool/map.c
    +++ b/tools/bpf/bpftool/map.c
    @@ -620,17 +620,14 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info)
    u32_as_hash_field(info->id))
    printf("\n\tpinned %s", (char *)entry->value);
    }
    - printf("\n");

    if (frozen_str) {
    frozen = atoi(frozen_str);
    free(frozen_str);
    }

    - if (!info->btf_id && !frozen)
    - return 0;
    -
    - printf("\t");
    + if (info->btf_id || frozen)
    + printf("\n\t");

    if (info->btf_id)
    printf("btf_id %d", info->btf_id);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 14:41    [W:4.780 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site