diff options
| author | Eric Joyner <erj@FreeBSD.org> | 2020-01-02 23:35:06 +0000 |
|---|---|---|
| committer | Eric Joyner <erj@FreeBSD.org> | 2020-01-02 23:35:06 +0000 |
| commit | f6afed726b00d16cf7a63f9285efb13d99a88da8 (patch) | |
| tree | 6af07d76e11d71281259a2ceabaac7479b7f801c | |
| parent | ab43ce7a22690b66cf76f0d8e70d538442657077 (diff) | |
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@intel.com>
PR: 239240
Submitted by: Piotr Pietruszewski <piotr.pietruszewski@intel.com>
Reported by: ultima@
Reviewed by: gallatin@, erj@
MFC after: 3 days
Sponsored by: Intel Corporation
Differential Revision: https://reviews.freebsd.org/D21712
Notes
svn path=/head/; revision=356310
| -rw-r--r-- | sys/net/iflib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net/iflib.c b/sys/net/iflib.c index f77f8e7a8fcc..907e5884af09 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -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 |