Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_iflib: Return the correct filter result in more interrupt handlers.

Browse Source 
Confirmed by tqh to fix #14803.
This commit is contained in:
Augustin Cavalier 2019-01-08 15:12:01 -05:00
parent 7ea987c1b8
commit 4947d1a8c7
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/compat/freebsd_iflib/iflib.c
View File

@ -1504,18 +1504,19 @@ iflib_fast_intr(void *arg)
static int
iflib_fast_intr_rxtx(void *arg)
{
int i, cidx;
int i, cidx, result;
iflib_filter_info_t info = arg;
struct grouptask *gtask = info->ifi_task;
iflib_rxq_t rxq = (iflib_rxq_t)info->ifi_ctx;
if_ctx_t ctx = NULL;
if (!iflib_started)
return (FILTER_HANDLED);
return (FILTER_STRAY);
DBG_COUNTER_INC(fast_intrs);
if (info->ifi_filter != NULL && info->ifi_filter(info->ifi_filter_arg) == FILTER_HANDLED)
return (FILTER_HANDLED);
if (info->ifi_filter != NULL
&& (result = info->ifi_filter(info->ifi_filter_arg)) != FILTER_SCHEDULE_THREAD)
return result;
MPASS(rxq->ifr_ntxqirq);
for (i = 0; i < rxq->ifr_ntxqirq; i++) {
@ -1539,7 +1540,7 @@ iflib_fast_intr_rxtx(void *arg)
IFDI_RX_QUEUE_INTR_ENABLE(ctx, rxq->ifr_id);
DBG_COUNTER_INC(rx_intr_enables);
}
return (FILTER_HANDLED);
return (FILTER_SCHEDULE_THREAD);
}
@ -1548,16 +1549,18 @@ iflib_fast_intr_ctx(void *arg)
{
iflib_filter_info_t info = arg;
struct grouptask *gtask = info->ifi_task;
int result;
if (!iflib_started)
return (FILTER_HANDLED);
return (FILTER_STRAY);
DBG_COUNTER_INC(fast_intrs);
if (info->ifi_filter != NULL && info->ifi_filter(info->ifi_filter_arg) == FILTER_HANDLED)
return (FILTER_HANDLED);
if (info->ifi_filter != NULL
&& (result = info->ifi_filter(info->ifi_filter_arg)) != FILTER_SCHEDULE_THREAD)
return result;
GROUPTASK_ENQUEUE(gtask);
return (FILTER_HANDLED);
return (FILTER_SCHEDULE_THREAD);
}
static int