| Message ID | 1606035891-6797-1-git-send-email-yanjunz@nvidia.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] xdp: compact the function xsk_map_inc | expand |
| 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, 44 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 |
On Sun, Nov 22, 2020 at 10:07 AM Zhu Yanjun <yanjunz@nvidia.com> wrote: > > From: Zhu Yanjun <zyjzyj2000@gmail.com> > > The function xsk_map_inc always returns zero. As such, changing the > return type to void and removing the test code. > > Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com> > Signed-off-by: Zhu Yanjun <yanjunz@nvidia.com> > --- > net/xdp/xsk.c | 1 - > net/xdp/xsk.h | 2 +- > net/xdp/xskmap.c | 10 ++-------- > 3 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c > index cfbec39..c1b8a88 100644 > --- a/net/xdp/xsk.c > +++ b/net/xdp/xsk.c > @@ -548,7 +548,6 @@ static void xsk_unbind_dev(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)); > map = node->map; > *map_entry = node->map_entry; > } > diff --git a/net/xdp/xsk.h b/net/xdp/xsk.h > index b9e896c..766b9e2 100644 > --- a/net/xdp/xsk.h > +++ b/net/xdp/xsk.h > @@ -41,7 +41,7 @@ struct xsk_map_node { > > 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_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, > diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c > index 49da2b8..c7dd94a 100644 > --- a/net/xdp/xskmap.c > +++ b/net/xdp/xskmap.c > @@ -11,10 +11,9 @@ > > #include "xsk.h" > > -int xsk_map_inc(struct xsk_map *map) > +void xsk_map_inc(struct xsk_map *map) > { > bpf_map_inc(&map->map); > - return 0; > } Thank you Yanjun for your cleanup. I think we can take this one step further and remove the function xsk_map_inc completely and use bpf_map_inc directly in the code. Could you please do this and submit a v2? > void xsk_map_put(struct xsk_map *map) > @@ -26,17 +25,12 @@ void xsk_map_put(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); > - } > + xsk_map_inc(map); > > node->map = map; > node->map_entry = map_entry; > -- > 1.7.1 >
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index cfbec39..c1b8a88 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -548,7 +548,6 @@ static void xsk_unbind_dev(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)); map = node->map; *map_entry = node->map_entry; } diff --git a/net/xdp/xsk.h b/net/xdp/xsk.h index b9e896c..766b9e2 100644 --- a/net/xdp/xsk.h +++ b/net/xdp/xsk.h @@ -41,7 +41,7 @@ struct xsk_map_node { 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_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, diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c index 49da2b8..c7dd94a 100644 --- a/net/xdp/xskmap.c +++ b/net/xdp/xskmap.c @@ -11,10 +11,9 @@ #include "xsk.h" -int xsk_map_inc(struct xsk_map *map) +void xsk_map_inc(struct xsk_map *map) { bpf_map_inc(&map->map); - return 0; } void xsk_map_put(struct xsk_map *map) @@ -26,17 +25,12 @@ void xsk_map_put(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); - } + xsk_map_inc(map); node->map = map; node->map_entry = map_entry;