History

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

Alexei Starovoitov says: ==================== pull-request: bpf-next 2019-06-19 The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) new SO_REUSEPORT_DETACH_BPF setsocktopt, from Martin. 2) BTF based map definition, from Andrii. 3) support bpf_map_lookup_elem for xskmap, from Jonathan. 4) bounded loops and scalar precision logic in the verifier, from Alexei. ====================

David S. Miller committed 7 years ago

Commit dca73a62 parents 497ad9f 94079b6101 files · +4048 −860Browse files

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

Unified · Split

include/uapi/linux/bpf.h+6−0
@@ -3085,6 +3085,10 @@ struct bpf_sock_tuple { · 3084 unmodified lines
3085 };3085 };
3086};3086};
3087 3087
3088struct bpf_xdp_sock {
3089 __u32 queue_id;
3090};
3091
3088#define XDP_PACKET_HEADROOM 2563092#define XDP_PACKET_HEADROOM 256
3089 3093
3090/* User return codes for XDP prog type.3094/* User return codes for XDP prog type.
@@ -3245,6 +3249,7 @@ struct bpf_sock_addr { · 154 unmodified lines
3245 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.3249 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.
3246 * Stored in network byte order.3250 * Stored in network byte order.
3247 */3251 */
3252 __bpf_md_ptr(struct bpf_sock *, sk);
3248};3253};
3249 3254
3250/* User bpf_sock_ops struct to access socket values and specify request ops3255/* User bpf_sock_ops struct to access socket values and specify request ops
@@ -3296,6 +3301,7 @@ struct bpf_sock_ops { · 45 unmodified lines
3296 __u32 sk_txhash;3301 __u32 sk_txhash;
3297 __u64 bytes_received;3302 __u64 bytes_received;
3298 __u64 bytes_acked;3303 __u64 bytes_acked;
3304 __bpf_md_ptr(struct bpf_sock *, sk);
3299};3305};
3300 3306
3301/* Definitions for bpf_sock_ops_cb_flags */3307/* Definitions for bpf_sock_ops_cb_flags */