diff mbox series

[v5,1/1] xdp: remove the functions xsk_map_inc and xsk_map_put

Message ID 1606402998-12562-1-git-send-email-yanjunz@nvidia.com (mailing list archive)
State Accepted
Commit bb1b25cab04324d0749f7ae22653aff58157bf83
Delegated to: BPF
Headers show
Series [v5,1/1] xdp: remove the functions xsk_map_inc and xsk_map_put | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Guessed tree name to be net-next
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 1 this patch: 1
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 65 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 1 this patch: 1
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Zhu Yanjun Nov. 26, 2020, 3:03 p.m. UTC 
From: Zhu Yanjun <zyjzyj2000@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 <zyjzyj2000@gmail.com>
---
 net/xdp/xsk.c    |  4 ++--
 net/xdp/xsk.h    |  2 --
 net/xdp/xskmap.c | 20 ++------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

Comments

Magnus Karlsson Nov. 27, 2020, 7:03 a.m. UTC | #1 
On Thu, Nov 26, 2020 at 4:05 PM Zhu Yanjun <yanjunz@nvidia.com> wrote:
>
> From: Zhu Yanjun <zyjzyj2000@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 <zyjzyj2000@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.karlsson@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
>
patchwork-bot+netdevbpf@kernel.org Nov. 27, 2020, 10:10 p.m. UTC | #2 
Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

On Thu, 26 Nov 2020 23:03:18 +0800 you wrote:
> From: Zhu Yanjun <zyjzyj2000@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 <zyjzyj2000@gmail.com>
> 
> [...]

Here is the summary with links:
  - [v5,1/1] xdp: remove the functions xsk_map_inc and xsk_map_put
    https://git.kernel.org/bpf/bpf-next/c/bb1b25cab043

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

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);
 }