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

Alexei Starovoitov says: ==================== pull-request: bpf-next 2021-04-01 The following pull-request contains BPF updates for your *net-next* tree. We've added 68 non-merge commits during the last 7 day(s) which contain a total of 70 files changed, 2944 insertions(+), 1139 deletions(-). The main changes are: 1) UDP support for sockmap, from Cong. 2) Verifier merge conflict resolution fix, from Daniel. 3) xsk selftests enhancements, from Maciej. 4) Unstable helpers aka kernel func calling, from Martin. 5) Batches ops for LPM map, from Pedro. 6) Fix race in bpf_get_local_storage, from Yonghong. ====================

David S. Miller committed 5 years ago

Commit c2bcb4c2 parents bd78980 89d69c570 files · +2944 −1139Browse files

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

Unified · Split

include/uapi/linux/bpf.h+5−0

@@ -957,6 +957,7 @@ enum bpf_attach_type { · 956 unmodified lines
957	957	BPF_XDP_CPUMAP,
958	958	BPF_SK_LOOKUP,
959	959	BPF_XDP,
	960	+ BPF_SK_SKB_VERDICT,
960	961	__MAX_BPF_ATTACH_TYPE
961	962	};
962	963
@@ -1117,6 +1118,10 @@ enum bpf_link_type { · 154 unmodified lines
1117	1118	* offset to another bpf function
1118	1119	*/
1119	1120	#define BPF_PSEUDO_CALL 1
	1121	+/* when bpf_call->src_reg == BPF_PSEUDO_KFUNC_CALL,
	1122	+ * bpf_call->imm == btf_id of a BTF_KIND_FUNC in the running kernel
	1123	+ */
	1124	+#define BPF_PSEUDO_KFUNC_CALL 2
1120	1125
1121	1126	/* flags for BPF_MAP_UPDATE_ELEM command */
1122	1127	enum {