summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorCong Wang <cong.wang@bytedance.com>2021-03-30 19:32:28 -0700
committerAlexei Starovoitov <ast@kernel.org>2021-04-01 10:56:13 -0700
commit2004fdbd8a2b56757691717639f86d0eea3ab5b4 (patch)
tree74cf7c76ec5d7430e9666b9971a348afdfb7367b /net/core
parent190179f65ba8bc18dc1d38435b7932505ca5544f (diff)
sock_map: Simplify sock_map_link() a bit
sock_map_link() passes down map progs, but it is confusing to see both map progs and psock progs. Make the map progs more obvious by retrieving it directly with sock_map_progs() inside sock_map_link(). Now it is aligned with sock_map_link_no_progs() too. Signed-off-by: Cong Wang <cong.wang@bytedance.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/bpf/20210331023237.41094-8-xiyou.wangcong@gmail.com
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock_map.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index e564fdeaada1..d06face0f16c 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -26,6 +26,7 @@ struct bpf_stab {
static int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
struct bpf_prog *old, u32 which);
+static struct sk_psock_progs *sock_map_progs(struct bpf_map *map);
static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
{
@@ -224,10 +225,10 @@ out:
return psock;
}
-static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
- struct sock *sk)
+static int sock_map_link(struct bpf_map *map, struct sock *sk)
{
struct bpf_prog *msg_parser, *stream_parser, *stream_verdict;
+ struct sk_psock_progs *progs = sock_map_progs(map);
struct sk_psock *psock;
int ret;
@@ -492,7 +493,7 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx,
* and sk_write_space callbacks overridden.
*/
if (sock_map_redirect_allowed(sk))
- ret = sock_map_link(map, &stab->progs, sk);
+ ret = sock_map_link(map, sk);
else
ret = sock_map_link_no_progs(map, sk);
if (ret < 0)
@@ -1004,7 +1005,7 @@ static int sock_hash_update_common(struct bpf_map *map, void *key,
* and sk_write_space callbacks overridden.
*/
if (sock_map_redirect_allowed(sk))
- ret = sock_map_link(map, &htab->progs, sk);
+ ret = sock_map_link(map, sk);
else
ret = sock_map_link_no_progs(map, sk);
if (ret < 0)