svn commit: r342750 - in stable: 11/sys/dev/cxgbe 12/sys/dev/cxgbe

[John Baldwin]

Author: jhb
Date: Fri Jan  4 00:06:30 2019
New Revision: 342750
URL: https://svnweb.freebsd.org/changeset/base/342750

Log:
  MFC 340021: Assert that reclaim_tx_descs() is always making forward progress.

Modified:
  stable/12/sys/dev/cxgbe/t4_sge.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/dev/cxgbe/t4_sge.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_sge.c	Thu Jan  3 23:06:05 2019	(r342749)
+++ stable/12/sys/dev/cxgbe/t4_sge.c	Fri Jan  4 00:06:30 2019	(r342750)
@@ -5079,6 +5079,9 @@ reclaim_tx_descs(struct sge_txq *txq, u_int n)
 		KASSERT(can_reclaim >= ndesc,
 		    ("%s: unexpected number of credits: %d, %d",
 		    __func__, can_reclaim, ndesc));
+		KASSERT(ndesc != 0,
+		    ("%s: descriptor with no credits: cidx %d",
+		    __func__, eq->cidx));
 
 		for (m = txsd->m; m != NULL; m = nextpkt) {
 			nextpkt = m->m_nextpkt;