diff options
author | Andriy Gapon <avg@FreeBSD.org> | 2021-11-19 07:56:30 +0000 |
---|---|---|
committer | Andriy Gapon <avg@FreeBSD.org> | 2021-12-10 12:33:12 +0000 |
commit | f43d2e1199b9fd265b72281d2779e2554fa7cb6d (patch) | |
tree | 34e773951de51f750bc04ec287181807b2215e6c | |
parent | 3507728e59ab64f109e7495311f38549b007706b (diff) | |
download | src-f43d2e1199b9fd265b72281d2779e2554fa7cb6d.tar.gz src-f43d2e1199b9fd265b72281d2779e2554fa7cb6d.zip |
iflib_stop: drain rx tasks to prevent any data races
iflib_stop modifies iflib data structures that are used by _task_fn_rx,
most prominently the free lists. So, iflib_stop has to ensure that the
rx task threads are not active.
This should help to fix a crash seen when iflib_if_ioctl (e.g.,
SIOCSIFCAP) is called while there is already traffic flowing.
The crash has been seen on VMWare guests with vmxnet3 driver.
My guess is that on physical hardware the couple of 1ms delays that
iflib_stop has after disabling interrupts are enough for the queued work
to be completed before any iflib state is touched.
But on busy hypervisors the guests might not get enough CPU time to
complete the work, thus there can be a race between the taskqueue
threads and the work done to handle an ioctl, specifically in iflib_stop
and iflib_init_locked.
PR: 259458
(cherry picked from commit 1bfdb812c786ac2607a82633f9c84a5d16f54079)
-rw-r--r-- | sys/net/iflib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 3a86671c7443..304518e2a24d 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2692,7 +2692,8 @@ iflib_stop(if_ctx_t ctx) bzero((void *)di->idi_vaddr, di->idi_size); } for (i = 0; i < scctx->isc_nrxqsets; i++, rxq++) { - /* make sure all transmitters have completed before proceeding XXX */ + gtaskqueue_drain(rxq->ifr_task.gt_taskqueue, + &rxq->ifr_task.gt_task); rxq->ifr_cq_cidx = 0; for (j = 0, di = rxq->ifr_ifdi; j < sctx->isc_nrxqs; j++, di++) |