[PATCH bpf-next v3 3/7] bpf: Remove attach_type in sockmap_link

[Tao Chen]

Use attach_type in bpf_link, and remove it in sockmap_link.

Acked-by: Jiri Olsa <jo...@kernel.org>
Signed-off-by: Tao Chen <chen.dyl...@linux.dev>
---
 net/core/sock_map.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index fbe9a33ddf1..5947b38e4f8 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -1709,7 +1709,6 @@ EXPORT_SYMBOL_GPL(sock_map_close);
 struct sockmap_link {
        struct bpf_link link;
        struct bpf_map *map;
-       enum bpf_attach_type attach_type;
 };
 
 static void sock_map_link_release(struct bpf_link *link)
@@ -1721,7 +1720,7 @@ static void sock_map_link_release(struct bpf_link *link)
                goto out;
 
        WARN_ON_ONCE(sock_map_prog_update(sockmap_link->map, NULL, link->prog, 
link,
-                                         sockmap_link->attach_type));
+                                         link->attach_type));
 
        bpf_map_put_with_uref(sockmap_link->map);
        sockmap_link->map = NULL;
@@ -1772,7 +1771,7 @@ static int sock_map_link_update_prog(struct bpf_link 
*link,
        }
 
        ret = sock_map_prog_link_lookup(sockmap_link->map, &pprog, &plink,
-                                       sockmap_link->attach_type);
+                                       link->attach_type);
        if (ret)
                goto out;
 
@@ -1817,7 +1816,7 @@ static int sock_map_link_fill_info(const struct bpf_link 
*link,
        u32 map_id = sock_map_link_get_map_id(sockmap_link);
 
        info->sockmap.map_id = map_id;
-       info->sockmap.attach_type = sockmap_link->attach_type;
+       info->sockmap.attach_type = link->attach_type;
        return 0;
 }
 
@@ -1828,7 +1827,7 @@ static void sock_map_link_show_fdinfo(const struct 
bpf_link *link,
        u32 map_id = sock_map_link_get_map_id(sockmap_link);
 
        seq_printf(seq, "map_id:\t%u\n", map_id);
-       seq_printf(seq, "attach_type:\t%u\n", sockmap_link->attach_type);
+       seq_printf(seq, "attach_type:\t%u\n", link->attach_type);
 }
 
 static const struct bpf_link_ops sock_map_link_ops = {
@@ -1869,7 +1868,6 @@ int sock_map_link_create(const union bpf_attr *attr, 
struct bpf_prog *prog)
        bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, 
&sock_map_link_ops, prog,
                      attach_type);
        sockmap_link->map = map;
-       sockmap_link->attach_type = attach_type;
 
        ret = bpf_link_prime(&sockmap_link->link, &link_primer);
        if (ret) {
-- 
2.48.1