History

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

Daniel Borkmann says: ==================== pull-request: bpf 2019-07-03 The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Fix the interpreter to properly handle BPF_ALU32 | BPF_ARSH on BE architectures, from Jiong. 2) Fix several bugs in the x32 BPF JIT for handling shifts by 0, from Luke and Xi. 3) Fix NULL pointer deref in btf_type_is_resolve_source_only(), from Stanislav. 4) Properly handle the check that forwarding is enabled on the device in bpf_ipv6_fib_lookup() helper code, from Anton. 5) Fix UAPI bpf_prog_info fields alignment for archs that have 16 bit alignment such as m68k, from Baruch. 6) Fix kernel hanging in unregister_netdevice loop while unregistering device bound to XDP socket, from Ilya. 7) Properly terminate tail update in xskq_produce_flush_desc(), from Nathan. 8) Fix broken always_inline handling in test_lwt_seg6local, from Jiri. 9) Fix bpftool to use correct argument in cgroup errors, from Jakub. 10) Fix detaching dummy prog in XDP redirect sample code, from Prashant. 11) Add Jonathan to AF_XDP reviewers, from Björn. ====================

David S. Miller committed 7 years ago

Commit c3ead2d2 parents 0d581ba 455302d16 files · +230 −296Browse files

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

Unified · Split

include/uapi/linux/bpf.h+1−0
@@ -3143,6 +3143,7 @@ struct bpf_prog_info { · 3142 unmodified lines
3143 char name[BPF_OBJ_NAME_LEN];3143 char name[BPF_OBJ_NAME_LEN];
3144 __u32 ifindex;3144 __u32 ifindex;
3145 __u32 gpl_compatible:1;3145 __u32 gpl_compatible:1;
3146 __u32 :31; /* alignment pad */
3146 __u64 netns_dev;3147 __u64 netns_dev;
3147 __u64 netns_ino;3148 __u64 netns_ino;
3148 __u32 nr_jited_ksyms;3149 __u32 nr_jited_ksyms;