diff options
| author |   Jakub Sitnicki <jakub@cloudflare.com> | 2020-06-25 16:13:55 +0200 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-06-30 10:45:08 -0700 |
| commit | 695c12147a40181fe9221d321c3f2de33c9574ed (patch) | |
| tree | fddc7f1a11f4d32deb9a45cb3e5a604ece6f2cb2 /include | |
| parent | flow_dissector: Pull BPF program assignment up to bpf-netns (diff) | |
| download | wireguard-linux-695c12147a40181fe9221d321c3f2de33c9574ed.tar.xz wireguard-linux-695c12147a40181fe9221d321c3f2de33c9574ed.zip | |
bpf, netns: Keep attached programs in bpf_prog_array
Prepare for having multi-prog attachments for new netns attach types by
storing programs to run in a bpf_prog_array, which is well suited for
iterating over programs and running them in sequence.
After this change bpf(PROG_QUERY) may block to allocate memory in
bpf_prog_array_copy_to_user() for collected program IDs. This forces a
change in how we protect access to the attached program in the query
callback. Because bpf_prog_array_copy_to_user() can sleep, we switch from
an RCU read lock to holding a mutex that serializes updaters.
Because we allow only one BPF flow_dissector program to be attached to
netns at all times, the bpf_prog_array pointed by net->bpf.run_array is
always either detached (null) or one element long.
No functional changes intended.
Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200625141357.910330-3-jakub@cloudflare.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/bpf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/netns/bpf.h b/include/net/netns/bpf.h index a8dce2a380c8..a5015bda9979 100644 --- a/include/net/netns/bpf.h +++ b/include/net/netns/bpf.h @@ -9,9 +9,12 @@ #include <linux/bpf-netns.h> struct bpf_prog; +struct bpf_prog_array; struct netns_bpf { - struct bpf_prog __rcu *progs[MAX_NETNS_BPF_ATTACH_TYPE]; + /* Array of programs to run compiled from progs or links */ + struct bpf_prog_array __rcu *run_array[MAX_NETNS_BPF_ATTACH_TYPE]; + struct bpf_prog *progs[MAX_NETNS_BPF_ATTACH_TYPE]; struct bpf_link *links[MAX_NETNS_BPF_ATTACH_TYPE]; }; |