From 3c7700c4573279465ea96b0b6549edca2f1d48da Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Mon, 24 Jan 2022 17:29:42 +0000 Subject: sync: Pull latest bpftool changes from kernel Syncing latest bpftool commits from kernel repository. Baseline bpf-next commit: e80f2a0d194605553315de68284fc41969f81f62 Checkpoint bpf-next commit: 820e6e227c4053b6b631ae65ef1f65d560cb392b Baseline bpf commit: 343e53754b21ae45530623222aa079fecd3cf942 Checkpoint bpf commit: baa59504c1cd0cca7d41954a45ee0b3dc78e41a0 Latest bpftool version: 5.16.0-820e6e227c40 Andrii Nakryiko (2): libbpf: deprecate legacy BPF map definitions bpftool: use new API for attaching XDP program Raman Shukhau (1): bpftool: Adding support for BTF program names Usama Arif (1): uapi/bpf: Add missing description and returns for helper documentation YiFei Zhu (1): bpf: Add cgroup helpers bpf_{get,set}_retval to get/set syscall return value include/uapi/linux/bpf.h | 33 ++++++++++++++++++++++++++++++ src/cgroup.c | 6 ++++-- src/common.c | 44 ++++++++++++++++++++++++++++++++++++++++ src/main.c | 9 +++++++- src/main.h | 4 ++++ src/net.c | 2 +- src/prog.c | 28 ++++++++++++++++--------- 7 files changed, 112 insertions(+), 14 deletions(-) -- 2.32.0 --- BPF-CHECKPOINT-COMMIT | 2 +- CHECKPOINT-COMMIT | 2 +- src/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BPF-CHECKPOINT-COMMIT b/BPF-CHECKPOINT-COMMIT index 2faf619..af72d6d 100644 --- a/BPF-CHECKPOINT-COMMIT +++ b/BPF-CHECKPOINT-COMMIT @@ -1 +1 @@ -343e53754b21ae45530623222aa079fecd3cf942 +baa59504c1cd0cca7d41954a45ee0b3dc78e41a0 diff --git a/CHECKPOINT-COMMIT b/CHECKPOINT-COMMIT index 3a3cc35..16a932e 100644 --- a/CHECKPOINT-COMMIT +++ b/CHECKPOINT-COMMIT @@ -1 +1 @@ -e80f2a0d194605553315de68284fc41969f81f62 +820e6e227c4053b6b631ae65ef1f65d560cb392b diff --git a/src/Makefile b/src/Makefile index 542d23e..fde1f4c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,7 +38,7 @@ LIBBPF_INTERNAL_HDRS := $(addprefix $(LIBBPF_HDRS_DIR)/,hashmap.h nlattr.h) LIBBPF_BOOTSTRAP_INTERNAL_HDRS := $(addprefix $(LIBBPF_BOOTSTRAP_HDRS_DIR)/,hashmap.h) ifeq ($(BPFTOOL_VERSION),) -BPFTOOL_VERSION := 5.16.0-e80f2a0d1946 +BPFTOOL_VERSION := 5.16.0-820e6e227c40 endif $(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT) $(LIBBPF_HDRS_DIR) $(LIBBPF_BOOTSTRAP_HDRS_DIR): -- cgit v1.2.3