Commit 8f50d8bb authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: stop XDP NAPI processing when build_skb() fails 



When the code path below fails:

enetc_clean_rx_ring_xdp // XDP_PASS
-> enetc_build_skb
   -> enetc_map_rx_buff_to_skb
      -> build_skb

enetc_clean_rx_ring_xdp will 'break', but that 'break' instruction isn't
strong enough to actually break the NAPI poll loop, just the switch/case
statement for XDP actions. So we increment rx_frm_cnt and go to the next
frames minding our own business.

Instead let's do what the skb NAPI poll function does, and break the
loop now, waiting for the memory pressure to go away. Otherwise the next
calls to build_skb() are likely to fail too.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 672f9a21

drivers/net/ethernet/freescale/enetc/enetc.c

+2 −2
Original line number Diff line number Diff line
@@ -1275,8 +1275,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, 
					      &i, &cleaned_cnt,

					      ENETC_RXB_DMA_SIZE_XDP);

			if (unlikely(!skb))

				/* Exit the switch/case, not the loop */

				break;

				goto out;



			napi_gro_receive(napi, skb);

			break;
@@ -1338,6 +1337,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, 
		rx_frm_cnt++;

	}



out:

	rx_ring->next_to_clean = i;



	rx_ring->stats.packets += rx_frm_cnt;