89 lines
2.5 KiB
Diff
89 lines
2.5 KiB
Diff
|
From fdbf66e4c70de16ab36d70ea591322b1b24df591 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
||
|
|
Date: Thu, 21 Jul 2022 15:38:55 +0200
|
||
|
|
Subject: [PATCH 11/32] vhost: Reorder vhost_svq_kick
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-MergeRequest: 108: Net Control Virtqueue shadow Support
|
||
|
|
RH-Commit: [11/27] 1d08b97eb3960a0f85f2dd48c3331b803f7ea205 (eperezmartin/qemu-kvm)
|
||
|
|
RH-Bugzilla: 1939363
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/1939363
|
||
|
|
|
||
|
|
Upstream Status: git://git.qemu.org/qemu.git
|
||
|
|
|
||
|
|
commit d93a2405ca6efa9dc1c420cee5a34bd8242818d0
|
||
|
|
Author: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Date: Wed Jul 20 08:59:30 2022 +0200
|
||
|
|
|
||
|
|
vhost: Reorder vhost_svq_kick
|
||
|
|
|
||
|
|
Future code needs to call it from vhost_svq_add.
|
||
|
|
|
||
|
|
No functional change intended.
|
||
|
|
|
||
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
---
|
||
|
|
hw/virtio/vhost-shadow-virtqueue.c | 28 ++++++++++++++--------------
|
||
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
|
||
|
|
index 9c46c3a8fa..05cd39d1eb 100644
|
||
|
|
--- a/hw/virtio/vhost-shadow-virtqueue.c
|
||
|
|
+++ b/hw/virtio/vhost-shadow-virtqueue.c
|
||
|
|
@@ -215,6 +215,20 @@ static bool vhost_svq_add_split(VhostShadowVirtqueue *svq,
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void vhost_svq_kick(VhostShadowVirtqueue *svq)
|
||
|
|
+{
|
||
|
|
+ /*
|
||
|
|
+ * We need to expose the available array entries before checking the used
|
||
|
|
+ * flags
|
||
|
|
+ */
|
||
|
|
+ smp_mb();
|
||
|
|
+ if (svq->vring.used->flags & VRING_USED_F_NO_NOTIFY) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ event_notifier_set(&svq->hdev_kick);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* Add an element to a SVQ.
|
||
|
|
*
|
||
|
|
@@ -235,20 +249,6 @@ static bool vhost_svq_add(VhostShadowVirtqueue *svq, VirtQueueElement *elem)
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static void vhost_svq_kick(VhostShadowVirtqueue *svq)
|
||
|
|
-{
|
||
|
|
- /*
|
||
|
|
- * We need to expose the available array entries before checking the used
|
||
|
|
- * flags
|
||
|
|
- */
|
||
|
|
- smp_mb();
|
||
|
|
- if (svq->vring.used->flags & VRING_USED_F_NO_NOTIFY) {
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- event_notifier_set(&svq->hdev_kick);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
/**
|
||
|
|
* Forward available buffers.
|
||
|
|
*
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|