Module Name: src
Committed By: msaitoh
Date: Thu Aug 7 09:35:22 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-6-0]: if_vioif.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1102):
sys/dev/pci/if_vioif.c: revision 1.5
Don't set SOFTINT_MPSAFE to vioif_rx_softint
vioif_rx_softint calls vioif_populate_rx_mbufs that is not MPSAFE.
vioif_populate_rx_mbufs is also called via vioif_ioctl and so can
be called by two LWPs simultaneously, resulting in kernel panic.
PR kern/49007
To generate a diff of this commit:
cvs rdiff -u -r1.2.14.1 -r1.2.14.2 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.2.14.1 src/sys/dev/pci/if_vioif.c:1.2.14.2
--- src/sys/dev/pci/if_vioif.c:1.2.14.1 Sun May 12 16:38:33 2013
+++ src/sys/dev/pci/if_vioif.c Thu Aug 7 09:35:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $ */
+/* $NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.14.1 2013/05/12 16:38:33 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.2.14.2 2014/08/07 09:35:22 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -557,7 +557,7 @@ vioif_attach(device_t parent, device_t s
}
}
- sc->sc_rx_softint = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE,
+ sc->sc_rx_softint = softint_establish(SOFTINT_NET,
vioif_rx_softint, sc);
if (sc->sc_rx_softint == NULL) {
aprint_error_dev(self, "cannot establish softint\n");
