lkml.org 
[lkml]   [2021]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 024/128] ice: xsk: return xsk buffers back to pool when cleaning the ring
    Date
    From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

    [ Upstream commit afe8a3ba85ec2a6b6849367e25c06a2f8e0ddd05 ]

    Currently we only NULL the xdp_buff pointer in the internal SW ring but
    we never give it back to the xsk buffer pool. This means that buffers
    can be leaked out of the buff pool and never be used again.

    Add missing xsk_buff_free() call to the routine that is supposed to
    clean the entries that are left in the ring so that these buffers in the
    umem can be used by other sockets.

    Also, only go through the space that is actually left to be cleaned
    instead of a whole ring.

    Fixes: 2d4238f55697 ("ice: Add support for AF_XDP")
    Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
    Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_xsk.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
    index f4ab5259a56cc..37c7dc6b44a9f 100644
    --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
    +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
    @@ -810,14 +810,14 @@ bool ice_xsk_any_rx_ring_ena(struct ice_vsi *vsi)
    */
    void ice_xsk_clean_rx_ring(struct ice_ring *rx_ring)
    {
    - u16 i;
    -
    - for (i = 0; i < rx_ring->count; i++) {
    - struct xdp_buff **xdp = &rx_ring->xdp_buf[i];
    + u16 count_mask = rx_ring->count - 1;
    + u16 ntc = rx_ring->next_to_clean;
    + u16 ntu = rx_ring->next_to_use;

    - if (!xdp)
    - continue;
    + for ( ; ntc != ntu; ntc = (ntc + 1) & count_mask) {
    + struct xdp_buff **xdp = &rx_ring->xdp_buf[ntc];

    + xsk_buff_free(*xdp);
    *xdp = NULL;
    }
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2021-12-27 16:44    [W:4.194 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site