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

Alexei Starovoitov says: ==================== pull-request: bpf-next 2020-07-13 The following pull-request contains BPF updates for your *net-next* tree. We've added 36 non-merge commits during the last 7 day(s) which contain a total of 62 files changed, 2242 insertions(+), 468 deletions(-). The main changes are: 1) Avoid trace_printk warning banner by switching bpf_trace_printk to use its own tracing event, from Alan. 2) Better libbpf support on older kernels, from Andrii. 3) Additional AF_XDP stats, from Ciara. 4) build time resolution of BTF IDs, from Jiri. 5) BPF_CGROUP_INET_SOCK_RELEASE hook, from Stanislav. ====================

David S. Miller committed 6 years ago

Commit 07dd1b72 parents bfe4c40 8afb25962 files · +2242 −468Browse files

Showing the changes to tools/include/uapi/linux (2 of 62 files). Show all

Unified · Split

2 files

tools/include/uapi/linux/bpf.h +1 −0
tools/include/uapi/linux/if_xdp.h +4 −1

tools/include/uapi/linux/bpf.h+1−0

@@ -226,6 +226,7 @@ enum bpf_attach_type { · 225 unmodified lines
226	BPF_CGROUP_INET4_GETSOCKNAME,	226	BPF_CGROUP_INET4_GETSOCKNAME,
227	BPF_CGROUP_INET6_GETSOCKNAME,	227	BPF_CGROUP_INET6_GETSOCKNAME,
228	BPF_XDP_DEVMAP,	228	BPF_XDP_DEVMAP,
		229	BPF_CGROUP_INET_SOCK_RELEASE,
229	__MAX_BPF_ATTACH_TYPE	230	__MAX_BPF_ATTACH_TYPE
230	};	231	};
231		232

tools/include/uapi/linux/if_xdp.h+4−1

 };
 struct xdp_statistics {
-	__u64 rx_dropped; /* Dropped for reasons other than invalid desc */
+	__u64 rx_dropped; /* Dropped for other reasons */
 	__u64 rx_invalid_descs; /* Dropped due to invalid descriptor */
 	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */
+	__u64 rx_ring_full; /* Dropped due to rx ring being full */
+	__u64 rx_fill_ring_empty_descs; /* Failed to retrieve item from fill ring */
+	__u64 tx_ring_empty_descs; /* Failed to retrieve item from tx ring */
 };
 struct xdp_options {