History

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

Daniel Borkmann says: ==================== pull-request: bpf-next 2018-07-15 The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) Various different arm32 JIT improvements in order to optimize code emission and make the JIT code itself more robust, from Russell. 2) Support simultaneous driver and offloaded XDP in order to allow for advanced use-cases where some work is offloaded to the NIC and some to the host. Also add ability for bpftool to load programs and maps beyond just the cgroup case, from Jakub. 3) Add BPF JIT support in nfp for multiplication as well as division. For the latter in particular, it uses the reciprocal algorithm to emulate it, from Jiong. 4) Add BTF pretty print functionality to bpftool in plain and JSON output format, from Okash. 5) Add build and installation to the BPF helper man page into bpftool, from Quentin. 6) Add a TCP BPF callback for listening sockets which is triggered right after the socket transitions to TCP_LISTEN state, from Andrey. 7) Add a new cgroup tree command to bpftool which iterates over the whole cgroup tree and prints all attached programs, from Roman. 8) Improve xdp_redirect_cpu sample to support parsing of double VLAN tagged packets, from Jesper. ====================

David S. Miller committed 8 years ago

Commit 2aa4a332 parents f5c64e5 13f743267 files · +3119 −929Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +5 −4
  2. include/uapi/linux/if_link.h +4 −0
include/uapi/linux/bpf.h+5−4
@@ -1826,7 +1826,7 @@ union bpf_attr { · 1825 unmodified lines
18261826 * A non-negative value equal to or less than *size* on success,
18271827 * or a negative error in case of failure.
18281828 *
1829− * int skb_load_bytes_relative(const struct sk_buff *skb, u32 offset, void *to, u32 len, u32 start_header)
1829+ * int bpf_skb_load_bytes_relative(const struct sk_buff *skb, u32 offset, void *to, u32 len, u32 start_header)
18301830 * Description
18311831 * This helper is similar to **bpf_skb_load_bytes**\ () in that
18321832 * it provides an easy way to load *len* bytes from *offset*
@@ -1877,7 +1877,7 @@ union bpf_attr { · 44 unmodified lines
18771877 * * < 0 if any input argument is invalid
18781878 * * 0 on success (packet is forwarded, nexthop neighbor exists)
18791879 * * > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
1880− * * packet is not forwarded or needs assist from full stack
1880+ * packet is not forwarded or needs assist from full stack
18811881 *
18821882 * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags)
18831883 * Description
@@ -2033,7 +2033,6 @@ union bpf_attr { · 149 unmodified lines
20332033 * This helper is only available is the kernel was compiled with
20342034 * the **CONFIG_BPF_LIRC_MODE2** configuration option set to
20352035 * "**y**".
2036− *
20372036 * Return
20382037 * 0
20392038 *
@@ -2053,7 +2052,6 @@ union bpf_attr { · 13 unmodified lines
20532052 * This helper is only available is the kernel was compiled with
20542053 * the **CONFIG_BPF_LIRC_MODE2** configuration option set to
20552054 * "**y**".
2056− *
20572055 * Return
20582056 * 0
20592057 *
@@ -2557,6 +2555,9 @@ enum { · 497 unmodified lines
25572555 * Arg1: old_state
25582556 * Arg2: new_state
25592557 */
2558+ BPF_SOCK_OPS_TCP_LISTEN_CB, /* Called on listen(2), right after
2559+ * socket transition to LISTEN state.
2560+ */
25602561 };
25612562
25622563 /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
include/uapi/linux/if_link.h+4−0
@@ -920,6 +920,7 @@ enum { · 919 unmodified lines
920920 XDP_ATTACHED_DRV,
921921 XDP_ATTACHED_SKB,
922922 XDP_ATTACHED_HW,
923+ XDP_ATTACHED_MULTI,
923924 };
924925
925926 enum {
@@ -928,6 +929,9 @@ enum { · 2 unmodified lines
928929 IFLA_XDP_ATTACHED,
929930 IFLA_XDP_FLAGS,
930931 IFLA_XDP_PROG_ID,
932+ IFLA_XDP_DRV_PROG_ID,
933+ IFLA_XDP_SKB_PROG_ID,
934+ IFLA_XDP_HW_PROG_ID,
931935 __IFLA_XDP_MAX,
932936 };
933937