diff options
| author | ozaki-r <ozaki-r@NetBSD.org> | 2014-12-24 02:48:24 +0000 |
|---|---|---|
| committer | ozaki-r <ozaki-r@NetBSD.org> | 2014-12-24 02:48:24 +0000 |
| commit | 0198d500af302999cfdb3fc25fa5c279c98b8d7e (patch) | |
| tree | ad7a0bcc8bd23f0d3bc11598df644bda681ceccf /sys/dev | |
| parent | 2f859bf3dc55ee578d1c1fe4e82898513a1b025d (diff) | |
Take TX/RX locks when sc_stopping = true in if_stop
Taking the locks is needed to ensure ongoing TX/RX operations finish.
Otherwise, if_stop may run during TX/RX operations.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_vioif.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/pci/if_vioif.c b/sys/dev/pci/if_vioif.c index 852dba317df..b2002057817 100644 --- a/sys/dev/pci/if_vioif.c +++ b/sys/dev/pci/if_vioif.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vioif.c,v 1.12 2014/12/19 06:54:40 ozaki-r Exp $ */ +/* $NetBSD: if_vioif.c,v 1.13 2014/12/24 02:48:24 ozaki-r Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.12 2014/12/19 06:54:40 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.13 2014/12/24 02:48:24 ozaki-r Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -707,7 +707,12 @@ vioif_stop(struct ifnet *ifp, int disable) struct vioif_softc *sc = ifp->if_softc; struct virtio_softc *vsc = sc->sc_virtio; + /* Take the locks to ensure that ongoing TX/RX finish */ + VIOIF_TX_LOCK(sc); + VIOIF_RX_LOCK(sc); sc->sc_stopping = true; + VIOIF_RX_UNLOCK(sc); + VIOIF_TX_UNLOCK(sc); /* only way to stop I/O and DMA is resetting... */ virtio_reset(vsc); |
