[src/trunk]: src/sys/dev/pci Revert "viornd(4): Process host entropy in softi...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ae18b4d909d
branches:  trunk
changeset: 365219:5ae18b4d909d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Apr 14 19:47:14 2022 +0000

description:
Revert "viornd(4): Process host entropy in softint context."

Apparently this has the effect of sometimes making the network hang
on Google Compute Engine as used by syzbot, which has held up all the
syzkaller testing for weeks now.  Let's revert this for now, and
separately try to figure out what's wrong with it.

diffstat:

 sys/dev/pci/viornd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 3e669adf6e12 -r 5ae18b4d909d sys/dev/pci/viornd.c
--- a/sys/dev/pci/viornd.c      Thu Apr 14 18:52:27 2022 +0000
+++ b/sys/dev/pci/viornd.c      Thu Apr 14 19:47:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: viornd.c,v 1.17 2022/03/23 23:23:25 riastradh Exp $ */
+/*     $NetBSD: viornd.c,v 1.18 2022/04/14 19:47:14 riastradh Exp $ */
 /*     $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $   */
 
 /*
@@ -139,7 +139,7 @@
        sc->sc_dev = self;
        sc->sc_virtio = vsc;
 
-       mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_SOFTSERIAL);
+       mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_VM);
 
        error = bus_dmamem_alloc(virtio_dmat(vsc),
                                 VIRTIO_PAGE_SIZE, 0, 0, segs, 1, &nsegs,
@@ -177,7 +177,7 @@
        }
 
        virtio_child_attach_start(vsc, self, IPL_NET, &sc->sc_vq,
-           NULL, virtio_vq_intr, VIRTIO_F_INTR_MPSAFE|VIRTIO_F_INTR_SOFTINT,
+           NULL, virtio_vq_intr, 0,
            0, VIRTIO_COMMON_FLAG_BITS);
 
        error = virtio_alloc_vq(vsc, &sc->sc_vq, 0, VIORND_BUFSIZE, 1,