Synchronize changes to linux/bpf.h from * "bpf: allow zero-initializing hash map seed" * "bpf: move BPF_F_QUERY_EFFECTIVE after map flags"
Unified · Split
| @@ -257,9 +257,6 @@ enum bpf_attach_type { · 256 unmodified lines | ||
| 257 | 257 | /* Specify numa node during map creation */ |
| 258 | 258 | #define BPF_F_NUMA_NODE (1U << 2) |
| 259 | 259 | |
| 260 | −/* flags for BPF_PROG_QUERY */ | |
| 261 | −#define BPF_F_QUERY_EFFECTIVE (1U << 0) | |
| 262 | − | |
| 263 | 260 | #define BPF_OBJ_NAME_LEN 16U |
| 264 | 261 | |
| 265 | 262 | /* Flags for accessing BPF object */ |
| @@ -269,6 +266,12 @@ enum bpf_attach_type { · 3 unmodified lines | ||
| 269 | 266 | /* Flag for stack_map, store build_id+offset instead of pointer */ |
| 270 | 267 | #define BPF_F_STACK_BUILD_ID (1U << 5) |
| 271 | 268 | |
| 269 | +/* Zero-initialize hash function seed. This should only be used for testing. */ | |
| 270 | +#define BPF_F_ZERO_SEED (1U << 6) | |
| 271 | + | |
| 272 | +/* flags for BPF_PROG_QUERY */ | |
| 273 | +#define BPF_F_QUERY_EFFECTIVE (1U << 0) | |
| 274 | + | |
| 272 | 275 | enum bpf_stack_build_id_status { |
| 273 | 276 | /* user space need an empty entry to identify end of a trace */ |
| 274 | 277 | BPF_STACK_BUILD_ID_EMPTY = 0, |
| @@ -2201,6 +2204,8 @@ union bpf_attr { · 1926 unmodified lines | ||
| 2201 | 2204 | * **CONFIG_NET** configuration option. |
| 2202 | 2205 | * Return |
| 2203 | 2206 | * Pointer to *struct bpf_sock*, or NULL in case of failure. |
| 2207 | + * For sockets with reuseport option, *struct bpf_sock* | |
| 2208 | + * return is from reuse->socks[] using hash of the packet. | |
| 2204 | 2209 | * |
| 2205 | 2210 | * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u32 netns, u64 flags) |
| 2206 | 2211 | * Description |
| @@ -2233,6 +2238,8 @@ union bpf_attr { · 26 unmodified lines | ||
| 2233 | 2238 | * **CONFIG_NET** configuration option. |
| 2234 | 2239 | * Return |
| 2235 | 2240 | * Pointer to *struct bpf_sock*, or NULL in case of failure. |
| 2241 | + * For sockets with reuseport option, *struct bpf_sock* | |
| 2242 | + * return is from reuse->socks[] using hash of the packet. | |
| 2236 | 2243 | * |
| 2237 | 2244 | * int bpf_sk_release(struct bpf_sock *sk) |
| 2238 | 2245 | * Description |