diff options
author | John Fastabend <john.fastabend@gmail.com> | 2017-09-08 23:00:49 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-09 06:11:00 +0200 |
commit | 5a67da2a71c64daeb456f6f3e87b5c7cecdc5ffa (patch) | |
tree | f79a061cee45f81cf3a5a9a2c9606e5b4532f2f9 /kernel/bpf/sockmap.c | |
parent | net: rcu lock and preempt disable missing around generic xdp (diff) | |
download | linux-5a67da2a71c64daeb456f6f3e87b5c7cecdc5ffa.tar.xz linux-5a67da2a71c64daeb456f6f3e87b5c7cecdc5ffa.zip |
bpf: add support for sockmap detach programs
The bpf map sockmap supports adding programs via attach commands. This
patch adds the detach command to keep the API symmetric and allow
users to remove previously added programs. Otherwise the user would
have to delete the map and re-add it to get in this state.
This also adds a series of additional tests to capture detach operation
and also attaching/detaching invalid prog types.
API note: socks will run (or not run) programs depending on the state
of the map at the time the sock is added. We do not for example walk
the map and remove programs from previously attached socks.
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/sockmap.c')
-rw-r--r-- | kernel/bpf/sockmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index f6ffde9c6a68..6424ce0e4969 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -792,7 +792,7 @@ out_progs: return err; } -int sock_map_attach_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type) +int sock_map_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type) { struct bpf_stab *stab = container_of(map, struct bpf_stab, map); struct bpf_prog *orig; |