History

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

Alexei Starovoitov says: ==================== pull-request: bpf-next 2021-12-30 The following pull-request contains BPF updates for your *net-next* tree. We've added 72 non-merge commits during the last 20 day(s) which contain a total of 223 files changed, 3510 insertions(+), 1591 deletions(-). The main changes are: 1) Automatic setrlimit in libbpf when bpf is memcg's in the kernel, from Andrii. 2) Beautify and de-verbose verifier logs, from Christy. 3) Composable verifier types, from Hao. 4) bpf_strncmp helper, from Hou. 5) bpf.h header dependency cleanup, from Jakub. 6) get_func_[arg|ret|arg_cnt] helpers, from Jiri. 7) Sleepable local storage, from KP. 8) Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support, from Kumar. ====================

David S. Miller committed 4 years ago

Commit e63a0232 parents ce2b6eb 9e6b19a221 files · +3506 −1591Browse files

Showing the changes to include/net (7 of 221 files). Show all

Unified · Split

7 files
  1. include/net/ip6_fib.h +1 −0
  2. include/net/ipv6.h +2 −0
  3. include/net/netns/bpf.h +8 −1
  4. include/net/route.h +1 −0
  5. include/net/sock.h +1 −1
  6. include/net/xdp_priv.h +0 −1
  7. include/net/xdp_sock.h +1 −0
include/net/ip6_fib.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
20#include <net/inetpeer.h>20#include <net/inetpeer.h>
21#include <net/fib_notifier.h>21#include <net/fib_notifier.h>
22#include <linux/indirect_call_wrapper.h>22#include <linux/indirect_call_wrapper.h>
23#include <uapi/linux/bpf.h>
23 24
24#ifdef CONFIG_IPV6_MULTIPLE_TABLES25#ifdef CONFIG_IPV6_MULTIPLE_TABLES
25#define FIB6_TABLE_HASHSZ 25626#define FIB6_TABLE_HASHSZ 256
include/net/ipv6.h+2−0
@@ -21,6 +21,8 @@ · 20 unmodified lines
21#include <net/snmp.h>21#include <net/snmp.h>
22#include <net/netns/hash.h>22#include <net/netns/hash.h>
23 23
24struct ip_tunnel_info;
25
24#define SIN6_LEN_RFC2133 2426#define SIN6_LEN_RFC2133 24
25 27
26#define IPV6_MAXPLEN 6553528#define IPV6_MAXPLEN 65535
include/net/netns/bpf.h+8−1
@@ -6,11 +6,18 @@ · 5 unmodified lines
6#ifndef __NETNS_BPF_H__6#ifndef __NETNS_BPF_H__
7#define __NETNS_BPF_H__7#define __NETNS_BPF_H__
8 8
9#include <linux/bpf-netns.h>9#include <linux/list.h>
10 10
11struct bpf_prog;11struct bpf_prog;
12struct bpf_prog_array;12struct bpf_prog_array;
13 13
14enum netns_bpf_attach_type {
15 NETNS_BPF_INVALID = -1,
16 NETNS_BPF_FLOW_DISSECTOR = 0,
17 NETNS_BPF_SK_LOOKUP,
18 MAX_NETNS_BPF_ATTACH_TYPE
19};
20
14struct netns_bpf {21struct netns_bpf {
15 /* Array of programs to run compiled from progs or links */22 /* Array of programs to run compiled from progs or links */
16 struct bpf_prog_array __rcu *run_array[MAX_NETNS_BPF_ATTACH_TYPE];23 struct bpf_prog_array __rcu *run_array[MAX_NETNS_BPF_ATTACH_TYPE];
include/net/route.h+1−0
@@ -43,6 +43,7 @@ · 42 unmodified lines
43#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))43#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
44#define RT_CONN_FLAGS_TOS(sk,tos) (RT_TOS(tos) | sock_flag(sk, SOCK_LOCALROUTE))44#define RT_CONN_FLAGS_TOS(sk,tos) (RT_TOS(tos) | sock_flag(sk, SOCK_LOCALROUTE))
45 45
46struct ip_tunnel_info;
46struct fib_nh;47struct fib_nh;
47struct fib_info;48struct fib_info;
48struct uncached_list;49struct uncached_list;
include/net/sock.h+1−1
@@ -56,7 +56,6 @@ · 55 unmodified lines
56#include <linux/wait.h>56#include <linux/wait.h>
57#include <linux/cgroup-defs.h>57#include <linux/cgroup-defs.h>
58#include <linux/rbtree.h>58#include <linux/rbtree.h>
59#include <linux/filter.h>
60#include <linux/rculist_nulls.h>59#include <linux/rculist_nulls.h>
61#include <linux/poll.h>60#include <linux/poll.h>
62#include <linux/sockptr.h>61#include <linux/sockptr.h>
@@ -249,6 +248,7 @@ struct sock_common { · 186 unmodified lines
249};248};
250 249
251struct bpf_local_storage;250struct bpf_local_storage;
251struct sk_filter;
252 252
253/**253/**
254 * struct sock - network layer representation of sockets254 * struct sock - network layer representation of sockets
include/net/xdp_priv.h+0−1
@@ -10,7 +10,6 @@ struct xdp_mem_allocator { · 9 unmodified lines
10 union {10 union {
11 void *allocator;11 void *allocator;
12 struct page_pool *page_pool;12 struct page_pool *page_pool;
13 struct zero_copy_allocator *zc_alloc;
14 };13 };
15 struct rhash_head node;14 struct rhash_head node;
16 struct rcu_head rcu;15 struct rcu_head rcu;
include/net/xdp_sock.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
6#ifndef _LINUX_XDP_SOCK_H6#ifndef _LINUX_XDP_SOCK_H
7#define _LINUX_XDP_SOCK_H7#define _LINUX_XDP_SOCK_H
8 8
9#include <linux/bpf.h>
9#include <linux/workqueue.h>10#include <linux/workqueue.h>
10#include <linux/if_xdp.h>11#include <linux/if_xdp.h>
11#include <linux/mutex.h>12#include <linux/mutex.h>