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 (2 of 101 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/socket.h +2 −0
  2. include/uapi/linux/bpf.h +6 −0
include/uapi/asm-generic/socket.h+2−0
@@ -117,6 +117,8 @@ · 116 unmodified lines
117117 #define SO_RCVTIMEO_NEW 66
118118 #define SO_SNDTIMEO_NEW 67
119119
120+#define SO_DETACH_REUSEPORT_BPF 68
121+
120122 #if !defined(__KERNEL__)
121123
122124 #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
include/uapi/linux/bpf.h+6−0
@@ -3085,6 +3085,10 @@ struct bpf_sock_tuple { · 3084 unmodified lines
30853085 };
30863086 };
30873087
3088+struct bpf_xdp_sock {
3089+ __u32 queue_id;
3090+};
3091+
30883092 #define XDP_PACKET_HEADROOM 256
30893093
30903094 /* User return codes for XDP prog type.
@@ -3245,6 +3249,7 @@ struct bpf_sock_addr { · 154 unmodified lines
32453249 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.
32463250 * Stored in network byte order.
32473251 */
3252+ __bpf_md_ptr(struct bpf_sock *, sk);
32483253 };
32493254
32503255 /* User bpf_sock_ops struct to access socket values and specify request ops
@@ -3296,6 +3301,7 @@ struct bpf_sock_ops { · 45 unmodified lines
32963301 __u32 sk_txhash;
32973302 __u64 bytes_received;
32983303 __u64 bytes_acked;
3304+ __bpf_md_ptr(struct bpf_sock *, sk);
32993305 };
33003306
33013307 /* Definitions for bpf_sock_ops_cb_flags */