d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assert IFF_DRV_OACTIVE in iflib_timer() when the "hung" case is detected

Browse Source 
so that iflib's admin task can still process the reset directive and restore
functionality.

Sponsored by:	Limelight Networks
This commit is contained in:
sbruno 2017-03-30 16:03:51 +00:00
parent ab46b95800
commit 21ffe1a952
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/iflib.c
View File

@ -2114,7 +2114,7 @@ iflib_timer(void *arg)
return;
hung:
CTX_LOCK(ctx);
if_setdrvflagbits(ctx->ifc_ifp, 0, IFF_DRV_RUNNING);
if_setdrvflagbits(ctx->ifc_ifp, IFF_DRV_OACTIVE, IFF_DRV_RUNNING);
device_printf(ctx->ifc_dev, "TX(%d) desc avail = %d, pidx = %d\n",
txq->ift_id, TXQ_AVAIL(txq), txq->ift_pidx);
@ -3516,8 +3516,11 @@ _task_fn_admin(void *context)
iflib_txq_t txq;
int i;
if (!(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING))
return;
if (!(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING)) {
if (!(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_OACTIVE)) {
return;
}
}
CTX_LOCK(ctx);
for (txq = ctx->ifc_txqs, i = 0; i < sctx->isc_ntxqsets; i++, txq++) {