There is a delta between kernel UAPI bpf.h and tools UAPI bpf.h, thus sync them again.
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -5519,11 +5519,12 @@ union bpf_attr { · 5518 unmodified lines | ||
| 5519 | 5519 | * **-EOPNOTSUPP** if the hash calculation failed or **-EINVAL** if |
| 5520 | 5520 | * invalid arguments are passed. |
| 5521 | 5521 | * |
| 5522 | − * void *bpf_kptr_xchg(void *map_value, void *ptr) | |
| 5522 | + * void *bpf_kptr_xchg(void *dst, void *ptr) | |
| 5523 | 5523 | * Description |
| 5524 | − * Exchange kptr at pointer *map_value* with *ptr*, and return the | |
| 5525 | − * old value. *ptr* can be NULL, otherwise it must be a referenced | |
| 5526 | − * pointer which will be released when this helper is called. | |
| 5524 | + * Exchange kptr at pointer *dst* with *ptr*, and return the old value. | |
| 5525 | + * *dst* can be map value or local kptr. *ptr* can be NULL, otherwise | |
| 5526 | + * it must be a referenced pointer which will be released when this helper | |
| 5527 | + * is called. | |
| 5527 | 5528 | * Return |
| 5528 | 5529 | * The old value of kptr (which can be NULL). The returned pointer |
| 5529 | 5530 | * if not NULL, is a reference which must be released using its |
| @@ -6046,11 +6047,6 @@ enum { · 516 unmodified lines | ||
| 6046 | 6047 | BPF_F_MARK_ENFORCE = (1ULL << 6), |
| 6047 | 6048 | }; |
| 6048 | 6049 | |
| 6049 | −/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */ | |
| 6050 | −enum { | |
| 6051 | − BPF_F_INGRESS = (1ULL << 0), | |
| 6052 | −}; | |
| 6053 | − | |
| 6054 | 6050 | /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */ |
| 6055 | 6051 | enum { |
| 6056 | 6052 | BPF_F_TUNINFO_IPV6 = (1ULL << 0), |
| @@ -6197,10 +6193,12 @@ enum { · 140 unmodified lines | ||
| 6197 | 6193 | BPF_F_BPRM_SECUREEXEC = (1ULL << 0), |
| 6198 | 6194 | }; |
| 6199 | 6195 | |
| 6200 | −/* Flags for bpf_redirect_map helper */ | |
| 6196 | +/* Flags for bpf_redirect and bpf_redirect_map helpers */ | |
| 6201 | 6197 | enum { |
| 6202 | − BPF_F_BROADCAST = (1ULL << 3), | |
| 6203 | − BPF_F_EXCLUDE_INGRESS = (1ULL << 4), | |
| 6198 | + BPF_F_INGRESS = (1ULL << 0), /* used for skb path */ | |
| 6199 | + BPF_F_BROADCAST = (1ULL << 3), /* used for XDP path */ | |
| 6200 | + BPF_F_EXCLUDE_INGRESS = (1ULL << 4), /* used for XDP path */ | |
| 6201 | +#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS) | |
| 6204 | 6202 | }; |
| 6205 | 6203 | |
| 6206 | 6204 | #define __bpf_md_ptr(type, name) \ |