Author: erj
Date: Fri Jan 10 18:29:05 2020
New Revision: 356605
URL: https://svnweb.freebsd.org/changeset/base/356605
Log:
MFC r356310: iflib: Prevent watchdog from resetting idle queues
Sponsored by: Intel Corporation
Modified:
stable/12/sys/net/iflib.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/net/iflib.c
==============================================================================
--- stable/12/sys/net/iflib.c Fri Jan 10 18:24:17 2020 (r356604)
+++ stable/12/sys/net/iflib.c Fri Jan 10 18:29:05 2020 (r356605)
@@ -2301,8 +2301,11 @@ iflib_timer(void *arg)
(sctx->isc_pause_frames == 0)))
goto hung;
- if (ifmp_ring_is_stalled(txq->ift_br))
+ if (txq->ift_qstatus != IFLIB_QUEUE_IDLE &&
+ ifmp_ring_is_stalled(txq->ift_br)) {
+ KASSERT(ctx->ifc_link_state == LINK_STATE_UP, ("queue
can't be marked as hung if interface is down"));
txq->ift_qstatus = IFLIB_QUEUE_HUNG;
+ }
txq->ift_cleaned_prev = txq->ift_cleaned;
}
#ifdef DEV_NETMAP
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
