On Thu, Nov 26, 2020 at 4:05 PM Zhu Yanjun <yanj...@nvidia.com> wrote:
>
> From: Zhu Yanjun <zyjzyj2...@gmail.com>
>
> The functions xsk_map_put and xsk_map_inc are simple wrappers.
> As such, replacing these functions with the functions bpf_map_inc
> and bpf_map_put and removing some test codes.
>
> Fixes: d20a1676df7e ("xsk: Move xskmap.c to net/xdp/")
> Signed-off-by: Zhu Yanjun <zyjzyj2...@gmail.com>
> ---
> net/xdp/xsk.c | 4 ++--
> net/xdp/xsk.h | 2 --
> net/xdp/xskmap.c | 20 ++------------------
> 3 files changed, 4 insertions(+), 22 deletions(-)
Thank you Yanjun for this cleanup!
Acked-by: Magnus Karlsson <magnus.karls...@intel.com>
> diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> index cfbec3989a76..4f0250f5d676 100644
> --- a/net/xdp/xsk.c
> +++ b/net/xdp/xsk.c
> @@ -548,7 +548,7 @@ static struct xsk_map *xsk_get_map_list_entry(struct
> xdp_sock *xs,
> node = list_first_entry_or_null(&xs->map_list, struct xsk_map_node,
> node);
> if (node) {
> - WARN_ON(xsk_map_inc(node->map));
> + bpf_map_inc(&node->map->map);
> map = node->map;
> *map_entry = node->map_entry;
> }
> @@ -578,7 +578,7 @@ static void xsk_delete_from_maps(struct xdp_sock *xs)
>
> while ((map = xsk_get_map_list_entry(xs, &map_entry))) {
> xsk_map_try_sock_delete(map, xs, map_entry);
> - xsk_map_put(map);
> + bpf_map_put(&map->map);
> }
> }
>
> diff --git a/net/xdp/xsk.h b/net/xdp/xsk.h
> index b9e896cee5bb..edcf249ad1f1 100644
> --- a/net/xdp/xsk.h
> +++ b/net/xdp/xsk.h
> @@ -41,8 +41,6 @@ static inline struct xdp_sock *xdp_sk(struct sock *sk)
>
> void xsk_map_try_sock_delete(struct xsk_map *map, struct xdp_sock *xs,
> struct xdp_sock **map_entry);
> -int xsk_map_inc(struct xsk_map *map);
> -void xsk_map_put(struct xsk_map *map);
> void xsk_clear_pool_at_qid(struct net_device *dev, u16 queue_id);
> int xsk_reg_pool_at_qid(struct net_device *dev, struct xsk_buff_pool *pool,
> u16 queue_id);
> diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c
> index 49da2b8ace8b..66231ba6c348 100644
> --- a/net/xdp/xskmap.c
> +++ b/net/xdp/xskmap.c
> @@ -11,32 +11,16 @@
>
> #include "xsk.h"
>
> -int xsk_map_inc(struct xsk_map *map)
> -{
> - bpf_map_inc(&map->map);
> - return 0;
> -}
> -
> -void xsk_map_put(struct xsk_map *map)
> -{
> - bpf_map_put(&map->map);
> -}
> -
> static struct xsk_map_node *xsk_map_node_alloc(struct xsk_map *map,
> struct xdp_sock **map_entry)
> {
> struct xsk_map_node *node;
> - int err;
>
> node = kzalloc(sizeof(*node), GFP_ATOMIC | __GFP_NOWARN);
> if (!node)
> return ERR_PTR(-ENOMEM);
>
> - err = xsk_map_inc(map);
> - if (err) {
> - kfree(node);
> - return ERR_PTR(err);
> - }
> + bpf_map_inc(&map->map);
>
> node->map = map;
> node->map_entry = map_entry;
> @@ -45,7 +29,7 @@ static struct xsk_map_node *xsk_map_node_alloc(struct
> xsk_map *map,
>
> static void xsk_map_node_free(struct xsk_map_node *node)
> {
> - xsk_map_put(node->map);
> + bpf_map_put(&node->map->map);
> kfree(node);
> }
>
> --
> 2.25.1
>
