Date: Thu, 14 May 2020 21:36:59 +0000 (UTC) From: Eric Joyner <erj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r361061 - stable/11/sys/net Message-ID: <202005142136.04ELax9a021145@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erj Date: Thu May 14 21:36:59 2020 New Revision: 361061 URL: https://svnweb.freebsd.org/changeset/base/361061 Log: MFC r356310: iflib: Prevent watchdog from resetting idle queues Sponsored by: Intel Corporation Modified: stable/11/sys/net/iflib.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net/iflib.c ============================================================================== --- stable/11/sys/net/iflib.c Thu May 14 21:12:08 2020 (r361060) +++ stable/11/sys/net/iflib.c Thu May 14 21:36:59 2020 (r361061) @@ -2144,8 +2144,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; /* handle any laggards */ if (txq->ift_db_pending)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005142136.04ELax9a021145>