xsk: s/free_list_node/list_node/

Now that free_list_node's purpose is two-folded, make it just a
'list_node'.

Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20241007122458.282590-3-maciej.fijalkowski@intel.com

diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
index 360bc1244c6af19b3e924196daff3b4bd6d30ea3..40085afd916077c02bcd51b8276ed5fda934b295 100644 (file)
--- a/include/net/xdp_sock_drv.h
+++ b/include/net/xdp_sock_drv.h
@@ -126,8 +126,8 @@ static inline void xsk_buff_free(struct xdp_buff *xdp)
        if (likely(!xdp_buff_has_frags(xdp)))
                goto out;
 
-       list_for_each_entry_safe(pos, tmp, xskb_list, free_list_node) {
-               list_del(&pos->free_list_node);
+       list_for_each_entry_safe(pos, tmp, xskb_list, list_node) {
+               list_del(&pos->list_node);
                xp_free(pos);
        }
 
@@ -140,7 +140,7 @@ static inline void xsk_buff_add_frag(struct xdp_buff *xdp)
 {
        struct xdp_buff_xsk *frag = container_of(xdp, struct xdp_buff_xsk, xdp);
 
-       list_add_tail(&frag->free_list_node, &frag->pool->xskb_list);
+       list_add_tail(&frag->list_node, &frag->pool->xskb_list);
 }
 
 static inline struct xdp_buff *xsk_buff_get_frag(struct xdp_buff *first)
@@ -150,9 +150,9 @@ static inline struct xdp_buff *xsk_buff_get_frag(struct xdp_buff *first)
        struct xdp_buff_xsk *frag;
 
        frag = list_first_entry_or_null(&xskb->pool->xskb_list,
-                                       struct xdp_buff_xsk, free_list_node);
+                                       struct xdp_buff_xsk, list_node);
        if (frag) {
-               list_del(&frag->free_list_node);
+               list_del(&frag->list_node);
                ret = &frag->xdp;
        }
 
@@ -163,7 +163,7 @@ static inline void xsk_buff_del_tail(struct xdp_buff *tail)
 {
        struct xdp_buff_xsk *xskb = container_of(tail, struct xdp_buff_xsk, xdp);
 
-       list_del(&xskb->free_list_node);
+       list_del(&xskb->list_node);
 }
 
 static inline struct xdp_buff *xsk_buff_get_tail(struct xdp_buff *first)
@@ -172,7 +172,7 @@ static inline struct xdp_buff *xsk_buff_get_tail(struct xdp_buff *first)
        struct xdp_buff_xsk *frag;
 
        frag = list_last_entry(&xskb->pool->xskb_list, struct xdp_buff_xsk,
-                              free_list_node);
+                              list_node);
        return &frag->xdp;
 }
 

diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h
index aa7f1d0b3a5e7aef92a0bf4ba48e1b83449b2485..af8b6f776f8693e0346a10e967322921cce2f658 100644 (file)
--- a/include/net/xsk_buff_pool.h
+++ b/include/net/xsk_buff_pool.h
@@ -29,7 +29,7 @@ struct xdp_buff_xsk {
        dma_addr_t frame_dma;
        struct xsk_buff_pool *pool;
        u64 orig_addr;
-       struct list_head free_list_node;
+       struct list_head list_node;
 };
 
 #define XSK_CHECK_PRIV_TYPE(t) BUILD_BUG_ON(sizeof(t) > offsetofend(struct xdp_buff_xsk, cb))

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 9c93064349a8c2256cf26fc466774e3b6045dfe1..520023405908867f5201e82fe1263f4a7aef9ba1 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -171,14 +171,14 @@ static int xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len)
                return 0;
 
        xskb_list = &xskb->pool->xskb_list;
-       list_for_each_entry_safe(pos, tmp, xskb_list, free_list_node) {
+       list_for_each_entry_safe(pos, tmp, xskb_list, list_node) {
                if (list_is_singular(xskb_list))
                        contd = 0;
                len = pos->xdp.data_end - pos->xdp.data;
                err = __xsk_rcv_zc(xs, pos, len, contd);
                if (err)
                        goto err;
-               list_del(&pos->free_list_node);
+               list_del(&pos->list_node);
        }
 
        return 0;

diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index e5368db7d18e739cb37b4855686c829f072d7c1f..973557d5e4f762a1df1090ddf37e4c1326b933b3 100644 (file)
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -101,7 +101,7 @@ struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,
                xskb = &pool->heads[i];
                xskb->pool = pool;
                xskb->xdp.frame_sz = umem->chunk_size - umem->headroom;
-               INIT_LIST_HEAD(&xskb->free_list_node);
+               INIT_LIST_HEAD(&xskb->list_node);
                if (pool->unaligned)
                        pool->free_heads[i] = xskb;
                else
@@ -549,8 +549,8 @@ struct xdp_buff *xp_alloc(struct xsk_buff_pool *pool)
        } else {
                pool->free_list_cnt--;
                xskb = list_first_entry(&pool->free_list, struct xdp_buff_xsk,
-                                       free_list_node);
-               list_del_init(&xskb->free_list_node);
+                                       list_node);
+               list_del_init(&xskb->list_node);
        }
 
        xskb->xdp.data = xskb->xdp.data_hard_start + XDP_PACKET_HEADROOM;
@@ -616,8 +616,8 @@ static u32 xp_alloc_reused(struct xsk_buff_pool *pool, struct xdp_buff **xdp, u3
 
        i = nb_entries;
        while (i--) {
-               xskb = list_first_entry(&pool->free_list, struct xdp_buff_xsk, free_list_node);
-               list_del_init(&xskb->free_list_node);
+               xskb = list_first_entry(&pool->free_list, struct xdp_buff_xsk, list_node);
+               list_del_init(&xskb->list_node);
 
                *xdp = &xskb->xdp;
                xdp++;
@@ -687,11 +687,11 @@ EXPORT_SYMBOL(xp_can_alloc);
 
 void xp_free(struct xdp_buff_xsk *xskb)
 {
-       if (!list_empty(&xskb->free_list_node))
+       if (!list_empty(&xskb->list_node))
                return;
 
        xskb->pool->free_list_cnt++;
-       list_add(&xskb->free_list_node, &xskb->pool->free_list);
+       list_add(&xskb->list_node, &xskb->pool->free_list);
 }
 EXPORT_SYMBOL(xp_free);