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 2023-09-26 #114

Merged
merged 6 commits into from
Sep 26, 2023
Merged

Bpftool sync 2023-09-26 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a173be0
bpf: Mark BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE deprecated
Aug 27, 2023
3338490
bpftool: Fix -Wcast-qual warning
dzagorui Sep 7, 2023
99b26e3
bpf: Clarify error expectations from bpf_clone_redirect
fomichev Sep 11, 2023
8086397
sync: Update libbpf submodule
qmonnet Sep 26, 2023
b2b90cb
bpftool: Fix build warnings with -Wtype-limits
laoar Aug 30, 2023
f75bd53
sync: Pull latest bpftool changes from kernel
qmonnet Sep 26, 2023
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 @@
23d775f12dcd23d052a4927195f15e970e27ab26
57eb5e1c5c57972c95e8efab6bc81b87161b0b07
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 @@
9e3b47abeb8f76c39c570ffc924ac0b35f132274
45ee73a0722b9e1d0b7a524d06756291b13b5912
13 changes: 11 additions & 2 deletions include/uapi/linux/bpf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,14 @@ enum bpf_map_type {
*/
BPF_MAP_TYPE_CGROUP_STORAGE = BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED,
BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE,
BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED,
/* BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE is available to bpf programs
* attaching to a cgroup. The new mechanism (BPF_MAP_TYPE_CGRP_STORAGE +
* local percpu kptr) supports all BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE
* functionality and more. So mark * BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE
* deprecated.
*/
BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED,
BPF_MAP_TYPE_QUEUE,
BPF_MAP_TYPE_STACK,
BPF_MAP_TYPE_SK_STORAGE,
Expand Down Expand Up @@ -1962,7 +1969,9 @@ union bpf_attr {
* performed again, if the helper is used in combination with
* direct packet access.
* Return
* 0 on success, or a negative error in case of failure.
* 0 on success, or a negative error in case of failure. Positive
* error indicates a potential drop or congestion in the target
* device. The particular positive error codes are not defined.
*
* u64 bpf_get_current_pid_tgid(void)
* Description
Expand Down
2 changes: 1 addition & 1 deletion libbpf
Open in desktop
Submodule libbpf updated 17 files
+3 −0 .github/PULL_REQUEST_TEMPLATE.md
+1 −1 BPF-CHECKPOINT-COMMIT
+1 −1 CHECKPOINT-COMMIT
+0 −70 ci/diffs/0001-s390-define-RUNTIME_DISCARD_EXIT-to-fix-link-error-w.patch
+0 −37 ci/diffs/0001-selftests-bpf-Check-whether-to-run-selftest.patch
+0 −46 ci/diffs/0001-selftests-bpf-Select-CONFIG_FUNCTION_ERROR_INJECTION.patch
+0 −68 ci/diffs/0001-tracing-fprobe-Initialize-ret-valiable-to-fix-smatch.patch
+0 −83 ci/diffs/0001-veth-take-into-account-peer-device-for-NETDEV_XDP_AC.patch
+0 −1 ci/vmtest/configs/ALLOWLIST-5.5.0
+2 −0 ci/vmtest/configs/DENYLIST-5.5.0
+1 −0 ci/vmtest/configs/DENYLIST-latest
+11 −2 include/uapi/linux/bpf.h
+16 −0 include/uapi/linux/netdev.h
+2 −1 include/uapi/linux/perf_event.h
+3 −1 src/bpf_helper_defs.h
+1 −0 src/bpf_helpers.h
+160 −0 src/btf.c
2 changes: 1 addition & 1 deletion src/gen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ static int do_skeleton(int argc, char **argv)
codegen("\
\n\
\n\
s->data = (void *)%2$s__elf_bytes(&s->data_sz); \n\
s->data = %2$s__elf_bytes(&s->data_sz); \n\
\n\
obj->skeleton = s; \n\
return 0; \n\
Expand Down
2 changes: 1 addition & 1 deletion src/link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] = {
#define perf_event_name(array, id) ({ \
const char *event_str = NULL; \
\
if ((id) >= 0 && (id) < ARRAY_SIZE(array)) \
if ((id) < ARRAY_SIZE(array)) \
event_str = array[id]; \
event_str; \
})
Expand Down
Loading