Commit 903649e7 authored Aug 28, 2017 by Michael Chan Committed by David S. Miller Aug 28, 2017

bnxt_en: Improve -ENOMEM logic in NAPI poll loop.



If we cannot allocate RX buffers in the NAPI poll loop when processing
an RX event, the current code does not count that event towards the NAPI
budget.  This can cause us to potentially loop forever in NAPI if we
consistently cannot allocate new buffers.  Improve it by counting
-ENOMEM event as 1 towards the NAPI budget.

Cc: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Reported-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 27573a7d

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1850,6 +1850,13 @@ static int bnxt_poll_work(struct bnxt bp, struct bnxt_napi bnapi, int budget)
		&event);
		if (likely(rc >= 0))
		rx_pkts += rc;
		/* Increment rx_pkts when rc is -ENOMEM to count towards
		* the NAPI budget. Otherwise, we may potentially loop
		* here forever if we consistently cannot allocate
		* buffers.
		*/
		else if (rc == -ENOMEM)
		rx_pkts++;
		else if (rc == -EBUSY) /* partial completion */
		break;
		} else if (unlikely((TX_CMP_TYPE(txcmp) ==