Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (cd075ce4) · Commits · 戴 / test

Daniel Borkmann says: ==================== pull-request: bpf 2018-06-02 The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) BPF uapi fix in struct bpf_prog_info and struct bpf_map_info in order to fix offsets on 32 bit archs. This will have a minor merge conflict with net-next which has the __u32 gpl_compatible:1 bitfield in struct bpf_prog_info at this location. Resolution is to use the gpl_compatible member. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

include/uapi/linux/bpf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1017,6 +1017,7 @@ struct bpf_prog_info {
		__aligned_u64 map_ids;
		char name[BPF_OBJ_NAME_LEN];
		__u32 ifindex;
		__u32 :32;
		__u64 netns_dev;
		__u64 netns_ino;
		} __attribute__((aligned(8)));
		@@ -1030,6 +1031,7 @@ struct bpf_map_info {
		__u32 map_flags;
		char name[BPF_OBJ_NAME_LEN];
		__u32 ifindex;
		__u32 :32;
		__u64 netns_dev;
		__u64 netns_ino;
		} __attribute__((aligned(8)));

tools/include/uapi/linux/bpf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1017,6 +1017,7 @@ struct bpf_prog_info {
		__aligned_u64 map_ids;
		char name[BPF_OBJ_NAME_LEN];
		__u32 ifindex;
		__u32 :32;
		__u64 netns_dev;
		__u64 netns_ino;
		} __attribute__((aligned(8)));
		@@ -1030,6 +1031,7 @@ struct bpf_map_info {
		__u32 map_flags;
		char name[BPF_OBJ_NAME_LEN];
		__u32 ifindex;
		__u32 :32;
		__u64 netns_dev;
		__u64 netns_ino;
		} __attribute__((aligned(8)));

Admin message