svn commit: r356310 - head/sys/net

[Eric Joyner]

Author: erj
Date: Thu Jan  2 23:35:06 2020
New Revision: 356310
URL: https://svnweb.freebsd.org/changeset/base/356310

Log:
  iflib: Prevent watchdog from resetting idle queues
  
  While changing link state in iflib_link_state_change(), queues are
  marked as IFLIB_QUEUE_IDLE to disable watchdog. Currently, iflib_timer()
  watchdog does not check for previous queue status before marking it as
  IFLIB_QUEUE_HUNG.
  
  This patch adds check of queue status before marking it as hung.
  
  Signed-off-by: Piotr Pietruszewski <piotr.pietruszewski at intel.com>
  
  PR:		239240
  Submitted by:	Piotr Pietruszewski <piotr.pietruszewski at intel.com>
  Reported by:	ultima@
  Reviewed by:	gallatin@, erj@
  MFC after:	3 days
  Sponsored by:	Intel Corporation
  Differential Revision:	https://reviews.freebsd.org/D21712

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Thu Jan  2 23:24:57 2020	(r356309)
+++ head/sys/net/iflib.c	Thu Jan  2 23:35:06 2020	(r356310)
@@ -2263,8 +2263,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