Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0cded2a authored by Jonathan Lemon's avatar Jonathan Lemon Committed by Greg Kroah-Hartman
Browse files

mlx4: handle non-napi callers to napi_poll 



[ Upstream commit b2b8a92733b288128feb57ffa694758cf475106c ]

netcons calls napi_poll with a budget of 0 to transmit packets.
Handle this by:
 - skipping RX processing
 - do not try to recycle TX packets to the RX cache

Signed-off-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1fecbf3f

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+3 −0
Original line number Diff line number Diff line
@@ -945,6 +945,9 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget) 
	bool clean_complete = true;

	int done;



	if (!budget)

		return 0;



	if (priv->tx_ring_num[TX_XDP]) {

		xdp_tx_cq = priv->tx_cq[TX_XDP][cq->ring];

		if (xdp_tx_cq->xdp_busy) {

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv, 
		.dma = tx_info->map0_dma,

	};



	if (!mlx4_en_rx_recycle(ring->recycle_ring, &frame)) {

	if (!napi_mode || !mlx4_en_rx_recycle(ring->recycle_ring, &frame)) {

		dma_unmap_page(priv->ddev, tx_info->map0_dma,

			       PAGE_SIZE, priv->dma_dir);

		put_page(tx_info->page);