Skip to contentSkip to conversation

xdp: remove the function xsk_map_inc

PATCH Superseded Zhu Yanjun 4 participants 5 messages Nov 23, 2020 – Nov 26, 2020

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Zhu Yanjun

author
#0 lore raw

PATCH v3 1/1 xdp: remove the function xsk_map_inc

From: Zhu Yanjun <[email protected]>

The function xsk_map_inc is a simple wrapper of bpf_map_inc and always returns zero. As such, replacing this function with bpf_map_inc and removing the test code.

---
 net/xdp/xsk.c    |  2 +-
 net/xdp/xsk.h    |  1 -
 net/xdp/xskmap.c | 13 +------------
 3 files changed, 2 insertions(+), 14 deletions(-)
net/xdp/xsk.c +1 -1
index cfbec3989a76..a3c1f07d77d8 100644
@@ -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;
 	}
net/xdp/xsk.h +0 -1
index b9e896cee5bb..0aad25c0e223 100644
@@ -41,7 +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,
net/xdp/xskmap.c +1 -12
index 49da2b8ace8b..6b7e9a72b101 100644
@@ -11,12 +11,6 @@
 
 #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);
@@ -26,17 +20,12 @@ 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;
Signature · 1 line
2.25.1
Acked-by on v3 1/1
#1 lore raw
Quoted 6 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

The function xsk_map_inc is a simple wrapper of bpf_map_inc and always returns zero. As such, replacing this function with bpf_map_inc and removing the test code.

Applied it to bpf-next, compiled it and tested it and it passed. Thank you Yanjun!

Quoted 71 lines
---
 net/xdp/xsk.c    |  2 +-
 net/xdp/xsk.h    |  1 -
 net/xdp/xskmap.c | 13 +------------
 3 files changed, 2 insertions(+), 14 deletions(-)
net/xdp/xsk.c +1 -1
index cfbec3989a76..a3c1f07d77d8 100644
@@ -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;
        }
net/xdp/xsk.h +0 -1
index b9e896cee5bb..0aad25c0e223 100644
@@ -41,7 +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,
net/xdp/xskmap.c +1 -13
index 49da2b8ace8b..6b7e9a72b101 100644
@@ -11,12 +11,6 @@
 
 #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);
@@ -26,17 +20,12 @@ 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;
--

2.25.1

#2 lore raw
In reply to Zhu Yanjun
Quoted 44 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

The function xsk_map_inc is a simple wrapper of bpf_map_inc and always returns zero. As such, replacing this function with bpf_map_inc and removing the test code.

---
  net/xdp/xsk.c    |  2 +-
  net/xdp/xsk.h    |  1 -
  net/xdp/xskmap.c | 13 +------------
  3 files changed, 2 insertions(+), 14 deletions(-)
net/xdp/xsk.c +1 -1
index cfbec3989a76..a3c1f07d77d8 100644
@@ -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;
  	}
net/xdp/xsk.h +0 -1
index b9e896cee5bb..0aad25c0e223 100644
@@ -41,7 +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,
net/xdp/xskmap.c +0 -0
index 49da2b8ace8b..6b7e9a72b101 100644
@@ -11,12 +11,6 @@
 

net/xdp/xskmap.c line 15

Quoted 10 lines
net/xdp/xskmap.c +0 -6
  #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)
  {

So, the xsk_map_put() is defined as:

  void xsk_map_put(struct xsk_map *map)
  {
        bpf_map_put(&map->map);
  }

What is the reason to get rid of xsk_map_inc() but not xsk_map_put() wrapper? Can't we just remove both while we're at it?

Thanks,
Daniel

#3 lore raw
Quoted 59 lines · Daniel Borkmann
Quoted 44 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

The function xsk_map_inc is a simple wrapper of bpf_map_inc and always returns zero. As such, replacing this function with bpf_map_inc and removing the test code.

---
  net/xdp/xsk.c    |  2 +-
  net/xdp/xsk.h    |  1 -
  net/xdp/xskmap.c | 13 +------------
  3 files changed, 2 insertions(+), 14 deletions(-)
net/xdp/xsk.c +1 -1
index cfbec3989a76..a3c1f07d77d8 100644
@@ -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;
      }
net/xdp/xsk.h +0 -1
index b9e896cee5bb..0aad25c0e223 100644
@@ -41,7 +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,
net/xdp/xskmap.c +0 -0
index 49da2b8ace8b..6b7e9a72b101 100644
@@ -11,12 +11,6 @@
 

net/xdp/xskmap.c line 15

Quoted 10 lines
net/xdp/xskmap.c +0 -6
  #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)
  {

So, the xsk_map_put() is defined as:

Quoted 7 lines
   void xsk_map_put(struct xsk_map *map)
   {
         bpf_map_put(&map->map);
   }

What is the reason to get rid of xsk_map_inc() but not xsk_map_put() wrapper? Can't we just remove both while we're at it?

Yes, why not. Makes sense.

Yanjun, could you please send a new version that removes this too?

Thank you both!

Quoted 2 lines

Thanks,
Daniel

#4 lore raw
Quoted 66 lines · Magnus Karlsson
Quoted 64 lines · Daniel Borkmann
Quoted 44 lines · Zhu Yanjun

From: Zhu Yanjun <[email protected]>

The function xsk_map_inc is a simple wrapper of bpf_map_inc and always returns zero. As such, replacing this function with bpf_map_inc and removing the test code.

---
  net/xdp/xsk.c    |  2 +-
  net/xdp/xsk.h    |  1 -
  net/xdp/xskmap.c | 13 +------------
  3 files changed, 2 insertions(+), 14 deletions(-)
net/xdp/xsk.c +1 -1
index cfbec3989a76..a3c1f07d77d8 100644
@@ -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;
      }
net/xdp/xsk.h +0 -1
index b9e896cee5bb..0aad25c0e223 100644
@@ -41,7 +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,
net/xdp/xskmap.c +0 -0
index 49da2b8ace8b..6b7e9a72b101 100644
@@ -11,12 +11,6 @@
 

net/xdp/xskmap.c line 15

Quoted 10 lines
net/xdp/xskmap.c +0 -6
  #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)
  {

So, the xsk_map_put() is defined as:

   void xsk_map_put(struct xsk_map *map)
   {
         bpf_map_put(&map->map);
   }
Quoted 6 lines
Quoted 2 lines

What is the reason to get rid of xsk_map_inc() but not xsk_map_put() wrapper? Can't we just remove both while we're at it?

Yes, why not. Makes sense.

Yanjun, could you please send a new version that removes this too?

OK. I will.

Zhu Yanjun

Quoted 5 lines

Thank you both!

Quoted 2 lines

Thanks,
Daniel