[Patch bpf-next v8 07/16] sock_map: simplify sock_map_link() a bit

[Cong Wang]

From: Cong Wang <cong.w...@bytedance.com>

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.

Cc: Daniel Borkmann <dan...@iogearbox.net>
Cc: Jakub Sitnicki <ja...@cloudflare.com>
Cc: Lorenz Bauer <l...@cloudflare.com>
Cc: John Fastabend <john.fastab...@gmail.com>
Signed-off-by: Cong Wang <cong.w...@bytedance.com>
---
 net/core/sock_map.c | 9 +++++----
 1 file 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 @@ static struct sk_psock *sock_map_psock_get_checked(struct 
sock *sk)
        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)
-- 
2.25.1