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.

Sign up for GitHub

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

Jump to bottom

Bpftool sync 2024-05-13 #144

Merged
merged 5 commits into from
May 13, 2024
Merged

Bpftool sync 2024-05-13 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc6d278
bpf: Add support for kprobe session attach
olsajiri Apr 30, 2024
3ce2aba
bpftool, selftests/hid/bpf: Fix 29 clang warnings
johnhubbard May 5, 2024
9cac9d7
sync: Update libbpf submodule
qmonnet May 13, 2024
9d427bf
bpf: add mrtt and srtt as BPF_SOCK_OPS_RTT_CB args
Apr 25, 2024
d2b9bf0
sync: Pull latest bpftool changes from kernel
qmonnet May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BPF-CHECKPOINT-COMMIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5bcf0dcbf9066348058b88a510c57f70f384c92c
3e9bc0472b910d4115e16e9c2d684c7757cb6c60
2 changes: 1 addition & 1 deletion CHECKPOINT-COMMIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
82e38a505c9868e784ec31e743fd8a9fa5ca1084
009367099eb61a4fc2af44d4eb06b6b4de7de6db
3 changes: 3 additions & 0 deletions include/uapi/linux/bpf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,7 @@ enum bpf_attach_type {
BPF_CGROUP_UNIX_GETSOCKNAME,
BPF_NETKIT_PRIMARY,
BPF_NETKIT_PEER,
BPF_TRACE_KPROBE_SESSION,
__MAX_BPF_ATTACH_TYPE
};

Expand Down Expand Up @@ -6947,6 +6948,8 @@ enum {
* socket transition to LISTEN state.
*/
BPF_SOCK_OPS_RTT_CB, /* Called on every RTT.
* Arg1: measured RTT input (mrtt)
* Arg2: updated srtt
*/
BPF_SOCK_OPS_PARSE_HDR_OPT_CB, /* Parse the header option.
* It will be called to handle
Expand Down
2 changes: 1 addition & 1 deletion libbpf
Open in desktop
Submodule libbpf updated 17 files
+80,366 −80,090 .github/actions/build-selftests/vmlinux.h
+17 −0 .mailmap
+1 −1 BPF-CHECKPOINT-COMMIT
+1 −1 CHECKPOINT-COMMIT
+0 −1 ci/vmtest/configs/ALLOWLIST-5.5.0
+3 −0 include/uapi/linux/bpf.h
+37 −0 scripts/mailmap-update.sh
+16 −0 scripts/sync-kernel.sh
+1 −0 src/bpf.c
+1 −0 src/bpf_core_read.h
+17 −4 src/bpf_helpers.h
+35 −35 src/bpf_tracing.h
+106 −23 src/libbpf.c
+3 −1 src/libbpf.h
+2 −2 src/ringbuf.c
+14 −2 src/str_error.c
+12 −12 src/usdt.bpf.h
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ ifeq ($(feature-llvm),1)
# If LLVM is available, use it for JIT disassembly
CFLAGS += -DHAVE_LLVM_SUPPORT
LLVM_CONFIG_LIB_COMPONENTS := mcdisassembler all-targets
CFLAGS += $(shell $(LLVM_CONFIG) --cflags --libs $(LLVM_CONFIG_LIB_COMPONENTS))
CFLAGS += $(shell $(LLVM_CONFIG) --cflags)
LIBS += $(shell $(LLVM_CONFIG) --libs $(LLVM_CONFIG_LIB_COMPONENTS))
ifeq ($(shell $(LLVM_CONFIG) --shared-mode),static)
LIBS += $(shell $(LLVM_CONFIG) --system-libs $(LLVM_CONFIG_LIB_COMPONENTS))
Expand Down
Loading