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.
Showing the changes to include/uapi (1 of 4 files). Show all
Unified · Split
| @@ -932,7 +932,14 @@ enum bpf_map_type { · 931 unmodified lines | ||
| 932 | 932 | */ |
| 933 | 933 | BPF_MAP_TYPE_CGROUP_STORAGE = BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED, |
| 934 | 934 | BPF_MAP_TYPE_REUSEPORT_SOCKARRAY, |
| 935 | − BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE, | |
| 935 | + BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED, | |
| 936 | + /* BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE is available to bpf programs | |
| 937 | + * attaching to a cgroup. The new mechanism (BPF_MAP_TYPE_CGRP_STORAGE + | |
| 938 | + * local percpu kptr) supports all BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE | |
| 939 | + * functionality and more. So mark * BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE | |
| 940 | + * deprecated. | |
| 941 | + */ | |
| 942 | + BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE = BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED, | |
| 936 | 943 | BPF_MAP_TYPE_QUEUE, |
| 937 | 944 | BPF_MAP_TYPE_STACK, |
| 938 | 945 | BPF_MAP_TYPE_SK_STORAGE, |