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 2024-02-06 #131

Merged
merged 4 commits into from
Feb 6, 2024

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Feb 6, 2024

Pull latest libbpf from mirror and sync bpftool repo with kernel, up to the commits used for libbpf sync. This is an automatic update performed by calling the sync script from this repo:

$ ./scripts/sync-kernel.sh . <path/to/>linux

acmel and others added 4 commits January 29, 2024 11:33
musl libc had the basename() prototype in string.h, but this is a
glibc-ism, now they removed the _GNU_SOURCE bits in their devel distro,
Alpine Linux edge:

  https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7

So lets use the POSIX version, the whole rationale is spelled out at:

  https://gitlab.alpinelinux.org/alpine/aports/-/issues/15643

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jiri Olsa <olsajiri@gmail.com>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/lkml/ZZhsPs00TI75RdAr@kernel.org
Link: https://lore.kernel.org/bpf/Zbe3NuOgaupvUcpF@kernel.org
Pull latest libbpf from mirror.
Libbpf version: 1.4.0
Libbpf commit:  f11758a7807893330cc87481a7a16cf956326ab3

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
…the kernel

Sync the new sample type for the branch counters feature.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tinghao Zhang <tinghao.zhang@intel.com>
Link: https://lore.kernel.org/r/20231025201626.3000228-6-kan.liang@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Syncing latest bpftool commits from kernel repository.
Baseline bpf-next commit:   c8632acf193beac64bbdaebef013368c480bf74f
Checkpoint bpf-next commit: 943b043aeecce9accb6d367af47791c633e95e4d
Baseline bpf commit:        0a5bd0ffe790511d802e7f40898429a89e2487df
Checkpoint bpf commit:      577e4432f3ac810049cb7e6b71f4d96ec7c6e894

Arnaldo Carvalho de Melo (1):
  bpftool: Be more portable by using POSIX's basename()

Kan Liang (1):
  tools headers UAPI: Sync include/uapi/linux/perf_event.h header with
    the kernel

 include/uapi/linux/perf_event.h | 13 +++++++++++++
 src/gen.c                       |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet
Copy link
Member Author

qmonnet commented Feb 6, 2024

DCO check fails with:

Commit sha: [8fb612d](https://github.com/libbpf/bpftool/pull/131/commits/8fb612d87246cc1b872e2a0bd44424eb2200658d), Author: Arnaldo Carvalho de Melo, Committer: Quentin Monnet; Can not find "Arnaldo Carvalho de Melo [acme@kernel.org](mailto:acme@kernel.org)", in ["Arnaldo Carvalho de Melo [acme@redhat.com](mailto:acme@redhat.com)", "Daniel Borkmann [daniel@iogearbox.net](mailto:daniel@iogearbox.net)"].

This is simply a mismatch on Arnaldo's address (kernel.org vs. redhat.com), nothing to worry about.

@qmonnet qmonnet merged commit 22621e3 into libbpf:main Feb 6, 2024
6 checks passed
@qmonnet qmonnet deleted the bpftool-sync-2024-02-06T15-04-21.718Z branch February 6, 2024 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants