[PATCH 2/2] if_tsec: Fix deadlock

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Mar 8 07:09:52 UTC 2017


The tsec_error_intr_locked() is called with the global lock owned (e.g.
the transmit and the receive lock are both owned).  We must not call
tsec_receive_intr_locked() while owning the transmit lock.  The normal
receive interrupt takes care that frames are received, this is none of
the business of the error interrupt.
---
 sys/dev/tsec/if_tsec.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
index 66ee130..0db552b 100644
--- a/sys/dev/tsec/if_tsec.c
+++ b/sys/dev/tsec/if_tsec.c
@@ -1576,9 +1576,6 @@ tsec_error_intr_locked(struct tsec_softc *sc, int count)
 	/* Check for discarded frame due to a lack of buffers */
 	if (eflags & TSEC_IEVENT_BSY) {
 		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
-
-		/* Get data from RX buffers */
-		tsec_receive_intr_locked(sc, count);
 	}
 
 	if (ifp->if_flags & IFF_DEBUG)
-- 
1.8.4.5



More information about the freebsd-net mailing list