[src/trunk]: src/sys/dev/pci vioif(4): stop interrupt before schedule handler

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

details:   https://anonhg.NetBSD.org/src/rev/6d4a9490e48d
branches:  trunk
changeset: 373956:6d4a9490e48d
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Thu Mar 23 01:36:50 2023 +0000

description:
vioif(4): stop interrupt before schedule handler

diffstat:

 sys/dev/pci/if_vioif.c |  22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r b576288a718a -r 6d4a9490e48d sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Thu Mar 23 01:33:20 2023 +0000
+++ b/sys/dev/pci/if_vioif.c    Thu Mar 23 01:36:50 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.86 2023/03/23 01:33:20 yamaguchi Exp $  */
+/*     $NetBSD: if_vioif.c,v 1.87 2023/03/23 01:36:50 yamaguchi Exp $  */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.86 2023/03/23 01:33:20 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.87 2023/03/23 01:36:50 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1685,6 +1685,7 @@
        struct virtio_softc *vsc = vq->vq_owner;
        struct vioif_softc *sc = device_private(virtio_child(vsc));
        bool more;
+       int enqueued;
 
        KASSERT(mutex_owned(rxq->rxq_lock));
        KASSERT(!rxq->rxq_stopping);
@@ -1694,8 +1695,10 @@
                vioif_rx_sched_handle(sc, rxq);
                return;
        }
-       more = virtio_start_vq_intr(vsc, rxq->rxq_vq);
-       if (more) {
+
+       enqueued = virtio_start_vq_intr(vsc, rxq->rxq_vq);
+       if (enqueued != 0) {
+               virtio_stop_vq_intr(vsc, rxq->rxq_vq);
                vioif_rx_sched_handle(sc, rxq);
                return;
        }
@@ -1805,6 +1808,7 @@
        struct vioif_softc *sc = device_private(virtio_child(vsc));
        struct ifnet *ifp = &sc->sc_ethercom.ec_if;
        bool more;
+       int enqueued;
 
        KASSERT(mutex_owned(txq->txq_lock));
        KASSERT(!txq->txq_stopping);
@@ -1815,11 +1819,11 @@
                return;
        }
 
-       if (virtio_features(vsc) & VIRTIO_F_RING_EVENT_IDX)
-               more = virtio_postpone_intr_smart(vsc, vq);
-       else
-               more = virtio_start_vq_intr(vsc, vq);
-       if (more) {
+       enqueued = (virtio_features(vsc) & VIRTIO_F_RING_EVENT_IDX) ?
+           virtio_postpone_intr_smart(vsc, vq):
+           virtio_start_vq_intr(vsc, vq);
+       if (enqueued != 0) {
+               virtio_stop_vq_intr(vsc, vq);
                vioif_tx_sched_handle(sc, txq);
                return;
        }