net/mlx5e: xsk: Fix DMA and xdp_frame leak on XDP_TX xmit failure
Subsystems (6)
Tariq Toukan
maintainerPATCH 1/1 net/mlx5e: xsk: Fix DMA and xdp_frame leak on XDP_TX xmit failure
From: Dragos Tatulea <[email protected]>
In the XSK branch of mlx5e_xmit_xdp_buff(), when sq->xmit_xdp_frame() returns false (e.g. XDPSQ is full), the function returns without unmapping the DMA address or freeing the xdp_frame allocated by xdp_convert_zc_to_xdp_frame(). The xdpi_fifo push only happens on success, so the completion path cannot recover these entries.
With CONFIG_DMA_API_DEBUG=y, the leak surfaces on driver unbind:
DMA-API: pci 0000:08:00.0: device driver has pending DMA allocations while released from device [count=1116]
One of leaked entries details: [device address=0x000000010ffd7028] [size=1534 bytes] [mapped with DMA_TO_DEVICE] [mapped as phy]
WARNING: kernel/dma/debug.c:881 at dma_debug_device_change+0x127/0x180 ... DMA-API: Mapped at: debug_dma_map_phys+0x4b/0xd0 dma_map_phys+0xfd/0x2d0 mlx5e_xdp_handle+0x5ae/0xac0 [mlx5_core] mlx5e_xsk_skb_from_cqe_mpwrq_linear+0xc4/0x170 [mlx5_core] mlx5e_handle_rx_cqe_mpwrq+0xc1/0x290 [mlx5_core]
Add the missing unmap + xdp_return_frame, matching the cleanup already done in mlx5e_xdp_xmit(). has_frags is rejected earlier in this branch, so no per-frag unmap is needed.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +8 -2
@@ -103,9 +103,15 @@ mlx5e_xmit_xdp_buff(struct mlx5e_xdpsq *sq, struct mlx5e_rq *rq, xdptxd->dma_addr = dma_addr; -if (unlikely (!INDIRECT_CALL_2 (sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe, - mlx5e_xmit_xdp_frame, sq, xdptxd,0 ,NULL ))) +if (unlikely (!INDIRECT_CALL_2 (sq->xmit_xdp_frame, + mlx5e_xmit_xdp_frame_mpwqe, + mlx5e_xmit_xdp_frame, + sq, xdptxd,0 ,NULL ))) { +dma_unmap_single (sq->pdev, dma_addr, xdptxd->len, +DMA_TO_DEVICE ); +xdp_return_frame (xdpf);return false; + }/* xmit_mode == MLX5E_XDP_XMIT_MODE_FRAME */ mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo,
base-commit: c05fa14db43ebef3bd862ca9d073981c0358b3f0
Signature · 1 line
2.44.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 4 Jun 2026 16:54:46 +0300 you wrote:
From: Dragos Tatulea <[email protected]>
In the XSK branch of
mlx5e_xmit_xdp_buff(), whensq->xmit_xdp_frame()returns false (e.g. XDPSQ is full), the function returns without unmapping the DMA address or freeing thexdp_frameallocated byxdp_convert_zc_to_xdp_frame(). Thexdpi_fifopush only happens on success, so the completion path cannot recover these entries.[...]
Here is the summary with links:
- [net] net/mlx5e: xsk: Fix DMA and xdp_frame leak on XDP_TX xmit failure
https://git.kernel.org/netdev/net/c/b69004f5a6ad
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html