Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bpftool sync 2023-09-26 #114

Merged
merged 6 commits into from
Sep 26, 2023

Commits on Aug 27, 2023

  1. bpf: Mark BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE deprecated

    Now 'BPF_MAP_TYPE_CGRP_STORAGE + local percpu ptr'
    can cover all BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE functionality
    and more. So mark BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE deprecated.
    Also make changes in selftests/bpf/test_bpftool_synctypes.py
    and selftest libbpf_str to fix otherwise test errors.
    
    Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
    Link: https://lore.kernel.org/r/20230827152837.2003563-1-yonghong.song@linux.dev
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Yonghong Song authored and qmonnet committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    a173be0 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. bpftool: Fix build warnings with -Wtype-limits

    Quentin reported build warnings when building bpftool :
    
        link.c: In function ‘perf_config_hw_cache_str’:
        link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
           86 |         if ((id) >= 0 && (id) < ARRAY_SIZE(array))      \
              |                  ^~
        link.c:320:20: note: in expansion of macro ‘perf_event_name’
          320 |         hw_cache = perf_event_name(evsel__hw_cache, config & 0xff);
              |                    ^~~~~~~~~~~~~~~
        [... more of the same for the other calls to perf_event_name ...]
    
    He also pointed out the reason and the solution:
    
      We're always passing unsigned, so it should be safe to drop the check on
      (id) >= 0.
    
    Fixes: 62b57e3ddd64 ("bpftool: Add perf event names")
    Reported-by: Quentin Monnet <quentin@isovalent.com>
    Suggested-by: Quentin Monnet <quentin@isovalent.com>
    Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Quentin Monnet <quentin@isovalent.com>
    Closes: https://lore.kernel.org/bpf/a35d9a2d-54a0-49ec-9ed1-8fcf1369d3cc@isovalent.com
    Link: https://lore.kernel.org/bpf/20230830030325.3786-1-laoar.shao@gmail.com
    laoar authored and qmonnet committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    b2b90cb View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. bpftool: Fix -Wcast-qual warning

    This cast was made by purpose for older libbpf where the
    bpf_object_skeleton field is void * instead of const void *
    to eliminate a warning (as i understand
    -Wincompatible-pointer-types-discards-qualifiers) but this
    cast introduces another warning (-Wcast-qual) for libbpf
    where data field is const void *
    
    It makes sense for bpftool to be in sync with libbpf from
    kernel sources
    
    Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Acked-by: Quentin Monnet <quentin@isovalent.com>
    Link: https://lore.kernel.org/bpf/20230907090210.968612-1-dzagorui@cisco.com
    dzagorui authored and qmonnet committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    3338490 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. bpf: Clarify error expectations from bpf_clone_redirect

    Commit 151e887d8ff9 ("veth: Fixing transmit return status for dropped
    packets") exposed the fact that bpf_clone_redirect is capable of
    returning raw NET_XMIT_XXX return codes.
    
    This is in the conflict with its UAPI doc which says the following:
    "0 on success, or a negative error in case of failure."
    
    Update the UAPI to reflect the fact that bpf_clone_redirect can
    return positive error numbers, but don't explicitly define
    their meaning.
    
    Reported-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Stanislav Fomichev <sdf@google.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20230911194731.286342-1-sdf@google.com
    fomichev authored and qmonnet committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    99b26e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. sync: Update libbpf submodule

    Pull latest libbpf from mirror.
    Libbpf version: 1.3.0
    Libbpf commit:  56069cda7897afdd0ae2478825845c7a7308c878
    
    Signed-off-by: Quentin Monnet <quentin@isovalent.com>
    qmonnet committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    8086397 View commit details
    Browse the repository at this point in the history
  2. sync: Pull latest bpftool changes from kernel

    Syncing latest bpftool commits from kernel repository.
    Baseline bpf-next commit:   9e3b47abeb8f76c39c570ffc924ac0b35f132274
    Checkpoint bpf-next commit: 45ee73a0722b9e1d0b7a524d06756291b13b5912
    Baseline bpf commit:        23d775f12dcd23d052a4927195f15e970e27ab26
    Checkpoint bpf commit:      57eb5e1c5c57972c95e8efab6bc81b87161b0b07
    
    Denys Zagorui (1):
      bpftool: Fix -Wcast-qual warning
    
    Stanislav Fomichev (1):
      bpf: Clarify error expectations from bpf_clone_redirect
    
    Yafang Shao (1):
      bpftool: Fix build warnings with -Wtype-limits
    
    Yonghong Song (1):
      bpf: Mark BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE deprecated
    
     include/uapi/linux/bpf.h | 13 +++++++++++--
     src/gen.c                |  2 +-
     src/link.c               |  2 +-
     3 files changed, 13 insertions(+), 4 deletions(-)
    
    Signed-off-by: Quentin Monnet <quentin@isovalent.com>
    qmonnet committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    f75bd53 View commit details
    Browse the repository at this point in the history