xsk: ixgbe: i40e: ice: mlx5: Xsk_umem_discard_addr to xsk_umem_release_addr

Change the name of xsk_umem_discard_addr to xsk_umem_release_addr to
better reflect the new naming of the AF_XDP queue manipulation
functions. As this functions is used by drivers implementing support
for AF_XDP zero-copy, it requires a name change to these drivers. The
function xsk_umem_release_addr_rq has also changed name in the same
fashion.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/1576759171-28550-10-git-send-email-magnus.karlsson@intel.com

diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index d07e1a8904283684f448e4a1346db6cfc6d4d9eb..20d6f11a3468ed1ac7ab411af39cea0fbef64a8e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -269,7 +269,7 @@ static bool i40e_alloc_buffer_zc(struct i40e_ring *rx_ring,
 
        bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
-       xsk_umem_discard_addr(umem);
+       xsk_umem_release_addr(umem);
        return true;
 }
 
@@ -306,7 +306,7 @@ static bool i40e_alloc_buffer_slow_zc(struct i40e_ring *rx_ring,
 
        bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
-       xsk_umem_discard_addr_rq(umem);
+       xsk_umem_release_addr_rq(umem);
        return true;
 }
 

diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index cf9b8b22d24f4febf5a5727da2d2b23935ab3761..0af1f0b951c0e2b0b92b8ec980b8fe556cb848aa 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -555,7 +555,7 @@ ice_alloc_buf_fast_zc(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)
 
        rx_buf->handle = handle + umem->headroom;
 
-       xsk_umem_discard_addr(umem);
+       xsk_umem_release_addr(umem);
        return true;
 }
 
@@ -591,7 +591,7 @@ ice_alloc_buf_slow_zc(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)
 
        rx_buf->handle = handle + umem->headroom;
 
-       xsk_umem_discard_addr_rq(umem);
+       xsk_umem_release_addr_rq(umem);
        return true;
 }
 

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index d6feaacfbf898a285036d6d48308f01558c00486..1501d0a220784bcd401fcbd6ecf4da1c79879e4e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@ -277,7 +277,7 @@ static bool ixgbe_alloc_buffer_zc(struct ixgbe_ring *rx_ring,
 
        bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
-       xsk_umem_discard_addr(umem);
+       xsk_umem_release_addr(umem);
        return true;
 }
 
@@ -304,7 +304,7 @@ static bool ixgbe_alloc_buffer_slow_zc(struct ixgbe_ring *rx_ring,
 
        bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
-       xsk_umem_discard_addr_rq(umem);
+       xsk_umem_release_addr_rq(umem);
        return true;
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
index 475b6bd5d29be7683cc6bbe058eb04c48d4ea357..62fc8a128a8dfd4576037a9862f892794d9da3ec 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
@@ -35,7 +35,7 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,
         */
        dma_info->addr = xdp_umem_get_dma(umem, handle);
 
-       xsk_umem_discard_addr_rq(umem);
+       xsk_umem_release_addr_rq(umem);
 
        dma_sync_single_for_device(rq->pdev, dma_info->addr, PAGE_SIZE,
                                   DMA_BIDIRECTIONAL);

diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 63f005830866a2cca7609601b0b059bfea5bd66d..e86ec48ef627492e6528bb64e04ebe48354b5dca 100644 (file)
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -119,7 +119,7 @@ bool xsk_is_setup_for_bpf_map(struct xdp_sock *xs);
 /* Used from netdev driver */
 bool xsk_umem_has_addrs(struct xdp_umem *umem, u32 cnt);
 bool xsk_umem_peek_addr(struct xdp_umem *umem, u64 *addr);
-void xsk_umem_discard_addr(struct xdp_umem *umem);
+void xsk_umem_release_addr(struct xdp_umem *umem);
 void xsk_umem_complete_tx(struct xdp_umem *umem, u32 nb_entries);
 bool xsk_umem_consume_tx(struct xdp_umem *umem, struct xdp_desc *desc);
 void xsk_umem_consume_tx_done(struct xdp_umem *umem);
@@ -208,12 +208,12 @@ static inline bool xsk_umem_peek_addr_rq(struct xdp_umem *umem, u64 *addr)
        return addr;
 }
 
-static inline void xsk_umem_discard_addr_rq(struct xdp_umem *umem)
+static inline void xsk_umem_release_addr_rq(struct xdp_umem *umem)
 {
        struct xdp_umem_fq_reuse *rq = umem->fq_reuse;
 
        if (!rq->length)
-               xsk_umem_discard_addr(umem);
+               xsk_umem_release_addr(umem);
        else
                rq->length--;
 }
@@ -258,7 +258,7 @@ static inline u64 *xsk_umem_peek_addr(struct xdp_umem *umem, u64 *addr)
        return NULL;
 }
 
-static inline void xsk_umem_discard_addr(struct xdp_umem *umem)
+static inline void xsk_umem_release_addr(struct xdp_umem *umem)
 {
 }
 
@@ -332,7 +332,7 @@ static inline u64 *xsk_umem_peek_addr_rq(struct xdp_umem *umem, u64 *addr)
        return NULL;
 }
 
-static inline void xsk_umem_discard_addr_rq(struct xdp_umem *umem)
+static inline void xsk_umem_release_addr_rq(struct xdp_umem *umem)
 {
 }
 

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 4e932a930b3a174e684da151143b81342e292f67..55092feeaf36e3715b8086a8087cda2776fbe341 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -51,11 +51,11 @@ bool xsk_umem_peek_addr(struct xdp_umem *umem, u64 *addr)
 }
 EXPORT_SYMBOL(xsk_umem_peek_addr);
 
-void xsk_umem_discard_addr(struct xdp_umem *umem)
+void xsk_umem_release_addr(struct xdp_umem *umem)
 {
        xskq_cons_release(umem->fq);
 }
-EXPORT_SYMBOL(xsk_umem_discard_addr);
+EXPORT_SYMBOL(xsk_umem_release_addr);
 
 void xsk_set_rx_need_wakeup(struct xdp_umem *umem)
 {