History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says: ==================== pull-request: bpf-next 2019-02-01 The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) introduce bpf_spin_lock, from Alexei. 2) convert xdp samples to libbpf, from Maciej. 3) skip verifier tests for unsupported program/map types, from Stanislav. 4) powerpc64 JIT support for BTF line info, from Sandipan. 5) assorted fixed, from Valdis, Jesper, Jiong. ====================

David S. Miller committed 7 years ago

Commit beb73552 parents d6b0a01 5974b7c50 files · +2197 −262Browse files

Showing the changes to include/uapi/linux (1 of 50 files). Show all

Unified · Split

include/uapi/linux/bpf.h+7−1
@@ -267,6 +267,7 @@ enum bpf_attach_type { · 266 unmodified lines
267#define BPF_ANY 0 /* create new element or update existing */267#define BPF_ANY 0 /* create new element or update existing */
268#define BPF_NOEXIST 1 /* create new element if it didn't exist */268#define BPF_NOEXIST 1 /* create new element if it didn't exist */
269#define BPF_EXIST 2 /* update existing element */269#define BPF_EXIST 2 /* update existing element */
270#define BPF_F_LOCK 4 /* spin_lock-ed map_lookup/map_update */
270 271
271/* flags for BPF_MAP_CREATE command */272/* flags for BPF_MAP_CREATE command */
272#define BPF_F_NO_PREALLOC (1U << 0)273#define BPF_F_NO_PREALLOC (1U << 0)
@@ -2422,7 +2423,9 @@ union bpf_attr { · 2149 unmodified lines
2422 FN(map_peek_elem), \2423 FN(map_peek_elem), \
2423 FN(msg_push_data), \2424 FN(msg_push_data), \
2424 FN(msg_pop_data), \2425 FN(msg_pop_data), \
2425 FN(rc_pointer_rel),2426 FN(rc_pointer_rel), \
2427 FN(spin_lock), \
2428 FN(spin_unlock),
2426 2429
2427/* integer value in 'imm' field of BPF_CALL instruction selects which helper2430/* integer value in 'imm' field of BPF_CALL instruction selects which helper
2428 * function eBPF program intends to call2431 * function eBPF program intends to call
@@ -3056,4 +3059,7 @@ struct bpf_line_info { · 627 unmodified lines
3056 __u32 line_col;3059 __u32 line_col;
3057};3060};
3058 3061
3062struct bpf_spin_lock {
3063 __u32 val;
3064};
3059#endif /* _UAPI__LINUX_BPF_H__ */3065#endif /* _UAPI__LINUX_BPF_H__ */