2fe1fc7b2d
- kvm-virtio-introduce-macro-VIRTIO_CONFIG_IRQ_IDX.patch [bz#1905805] - kvm-virtio-pci-decouple-notifier-from-interrupt-process.patch [bz#1905805] - kvm-virtio-pci-decouple-the-single-vector-from-the-inter.patch [bz#1905805] - kvm-vhost-introduce-new-VhostOps-vhost_set_config_call.patch [bz#1905805] - kvm-vhost-vdpa-add-support-for-config-interrupt.patch [bz#1905805] - kvm-virtio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-vhost-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-net-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-mmio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-pci-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-s390x-s390-virtio-ccw-Activate-zPCI-features-on-s390.patch [bz#2159408] - kvm-vhost-fix-vq-dirty-bitmap-syncing-when-vIOMMU-is-ena.patch [bz#2124856] - kvm-block-drop-bdrv_remove_filter_or_cow_child.patch [bz#2155112] - kvm-qed-Don-t-yield-in-bdrv_qed_co_drain_begin.patch [bz#2155112] - kvm-test-bdrv-drain-Don-t-yield-in-.bdrv_co_drained_begi.patch [bz#2155112] - kvm-block-Revert-.bdrv_drained_begin-end-to-non-coroutin.patch [bz#2155112] - kvm-block-Remove-drained_end_counter.patch [bz#2155112] - kvm-block-Inline-bdrv_drain_invoke.patch [bz#2155112] - kvm-block-Fix-locking-for-bdrv_reopen_queue_child.patch [bz#2155112] - kvm-block-Drain-individual-nodes-during-reopen.patch [bz#2155112] - kvm-block-Don-t-use-subtree-drains-in-bdrv_drop_intermed.patch [bz#2155112] - kvm-stream-Replace-subtree-drain-with-a-single-node-drai.patch [bz#2155112] - kvm-block-Remove-subtree-drains.patch [bz#2155112] - kvm-block-Call-drain-callbacks-only-once.patch [bz#2155112] - kvm-block-Remove-ignore_bds_parents-parameter-from-drain.patch [bz#2155112] - kvm-block-Drop-out-of-coroutine-in-bdrv_do_drained_begin.patch [bz#2155112] - kvm-block-Don-t-poll-in-bdrv_replace_child_noperm.patch [bz#2155112] - kvm-block-Remove-poll-parameter-from-bdrv_parent_drained.patch [bz#2155112] - kvm-accel-introduce-accelerator-blocker-API.patch [bz#1979276] - kvm-KVM-keep-track-of-running-ioctls.patch [bz#1979276] - kvm-kvm-Atomic-memslot-updates.patch [bz#1979276] - Resolves: bz#1905805 (support config interrupt in vhost-vdpa qemu) - Resolves: bz#2159408 ([s390x] VMs with ISM passthrough don't autostart after leapp upgrade from RHEL 8) - Resolves: bz#2124856 (VM with virtio interface and iommu=on will crash when try to migrate) - Resolves: bz#2155112 (Qemu coredump after do snapshot of mirrored top image and its converted base image(iothread enabled)) - Resolves: bz#1979276 (SVM: non atomic memslot updates cause boot failure with seabios and cpu-pm=on)
263 lines
8.8 KiB
Diff
263 lines
8.8 KiB
Diff
From 34a267758cf016f34b327318500efdbf0f606033 Mon Sep 17 00:00:00 2001
|
|
From: Cindy Lu <lulu@redhat.com>
|
|
Date: Thu, 22 Dec 2022 15:04:42 +0800
|
|
Subject: [PATCH 01/31] virtio: introduce macro VIRTIO_CONFIG_IRQ_IDX
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Cindy Lu <lulu@redhat.com>
|
|
RH-MergeRequest: 132: vhost-vdpa: support config interrupt in vhost-vdpa
|
|
RH-Bugzilla: 1905805
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [1/10] f374aaae221bc5a4c2521a267d21350b812e11ba (lulu6/qemu-kvm3)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1905805
|
|
To support configure interrupt for vhost-vdpa
|
|
Introduce VIRTIO_CONFIG_IRQ_IDX -1 as configure interrupt's queue index,
|
|
Then we can reuse the functions guest_notifier_mask and guest_notifier_pending.
|
|
Add the check of queue index in these drivers, if the driver does not support
|
|
configure interrupt, the function will just return
|
|
|
|
Signed-off-by: Cindy Lu <lulu@redhat.com>
|
|
Message-Id: <20221222070451.936503-2-lulu@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 544f0278afcab2bebab61b14e4c2c58e65911f5b)
|
|
Signed-off-by: Cindy Lu <lulu@redhat.com>
|
|
---
|
|
hw/display/vhost-user-gpu.c | 18 ++++++++++++++++++
|
|
hw/net/virtio-net.c | 22 ++++++++++++++++++++--
|
|
hw/virtio/vhost-user-fs.c | 18 ++++++++++++++++++
|
|
hw/virtio/vhost-user-gpio.c | 10 ++++++++++
|
|
hw/virtio/vhost-vsock-common.c | 18 ++++++++++++++++++
|
|
hw/virtio/virtio-crypto.c | 18 ++++++++++++++++++
|
|
include/hw/virtio/virtio.h | 3 +++
|
|
7 files changed, 105 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
|
|
index 19c0e20103..4380a5e672 100644
|
|
--- a/hw/display/vhost-user-gpu.c
|
|
+++ b/hw/display/vhost-user-gpu.c
|
|
@@ -486,6 +486,15 @@ vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx)
|
|
{
|
|
VhostUserGPU *g = VHOST_USER_GPU(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return false;
|
|
+ }
|
|
return vhost_virtqueue_pending(&g->vhost->dev, idx);
|
|
}
|
|
|
|
@@ -494,6 +503,15 @@ vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
|
|
{
|
|
VhostUserGPU *g = VHOST_USER_GPU(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
vhost_virtqueue_mask(&g->vhost->dev, vdev, idx, mask);
|
|
}
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index aba12759d5..bee35d6f9f 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -3316,6 +3316,15 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
|
|
} else {
|
|
nc = qemu_get_subqueue(n->nic, vq2q(idx));
|
|
}
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return false
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return false;
|
|
+ }
|
|
return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
|
|
}
|
|
|
|
@@ -3339,8 +3348,17 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
|
|
} else {
|
|
nc = qemu_get_subqueue(n->nic, vq2q(idx));
|
|
}
|
|
- vhost_net_virtqueue_mask(get_vhost_net(nc->peer),
|
|
- vdev, idx, mask);
|
|
+ /*
|
|
+ *Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
|
|
}
|
|
|
|
static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features)
|
|
diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
|
|
index d97b179e6f..f5049735ac 100644
|
|
--- a/hw/virtio/vhost-user-fs.c
|
|
+++ b/hw/virtio/vhost-user-fs.c
|
|
@@ -159,6 +159,15 @@ static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx,
|
|
{
|
|
VHostUserFS *fs = VHOST_USER_FS(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
vhost_virtqueue_mask(&fs->vhost_dev, vdev, idx, mask);
|
|
}
|
|
|
|
@@ -166,6 +175,15 @@ static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx)
|
|
{
|
|
VHostUserFS *fs = VHOST_USER_FS(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return false;
|
|
+ }
|
|
return vhost_virtqueue_pending(&fs->vhost_dev, idx);
|
|
}
|
|
|
|
diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c
|
|
index b7b82a1099..fe3da32c74 100644
|
|
--- a/hw/virtio/vhost-user-gpio.c
|
|
+++ b/hw/virtio/vhost-user-gpio.c
|
|
@@ -191,6 +191,16 @@ static void vu_gpio_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask)
|
|
{
|
|
VHostUserGPIO *gpio = VHOST_USER_GPIO(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
vhost_virtqueue_mask(&gpio->vhost_dev, vdev, idx, mask);
|
|
}
|
|
|
|
diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c
|
|
index d21c72b401..d2b5519d5a 100644
|
|
--- a/hw/virtio/vhost-vsock-common.c
|
|
+++ b/hw/virtio/vhost-vsock-common.c
|
|
@@ -127,6 +127,15 @@ static void vhost_vsock_common_guest_notifier_mask(VirtIODevice *vdev, int idx,
|
|
{
|
|
VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
vhost_virtqueue_mask(&vvc->vhost_dev, vdev, idx, mask);
|
|
}
|
|
|
|
@@ -135,6 +144,15 @@ static bool vhost_vsock_common_guest_notifier_pending(VirtIODevice *vdev,
|
|
{
|
|
VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return false;
|
|
+ }
|
|
return vhost_virtqueue_pending(&vvc->vhost_dev, idx);
|
|
}
|
|
|
|
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
|
|
index 97da74e719..516425e26a 100644
|
|
--- a/hw/virtio/virtio-crypto.c
|
|
+++ b/hw/virtio/virtio-crypto.c
|
|
@@ -1182,6 +1182,15 @@ static void virtio_crypto_guest_notifier_mask(VirtIODevice *vdev, int idx,
|
|
|
|
assert(vcrypto->vhost_started);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return;
|
|
+ }
|
|
cryptodev_vhost_virtqueue_mask(vdev, queue, idx, mask);
|
|
}
|
|
|
|
@@ -1192,6 +1201,15 @@ static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx)
|
|
|
|
assert(vcrypto->vhost_started);
|
|
|
|
+ /*
|
|
+ * Add the check for configure interrupt, Use VIRTIO_CONFIG_IRQ_IDX -1
|
|
+ * as the Marco of configure interrupt's IDX, If this driver does not
|
|
+ * support, the function will return
|
|
+ */
|
|
+
|
|
+ if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
|
+ return false;
|
|
+ }
|
|
return cryptodev_vhost_virtqueue_pending(vdev, queue, idx);
|
|
}
|
|
|
|
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
|
|
index acfd4df125..1f4a41b958 100644
|
|
--- a/include/hw/virtio/virtio.h
|
|
+++ b/include/hw/virtio/virtio.h
|
|
@@ -79,6 +79,9 @@ typedef struct VirtQueueElement
|
|
|
|
#define VIRTIO_NO_VECTOR 0xffff
|
|
|
|
+/* special index value used internally for config irqs */
|
|
+#define VIRTIO_CONFIG_IRQ_IDX -1
|
|
+
|
|
#define TYPE_VIRTIO_DEVICE "virtio-device"
|
|
OBJECT_DECLARE_TYPE(VirtIODevice, VirtioDeviceClass, VIRTIO_DEVICE)
|
|
|
|
--
|
|
2.31.1
|
|
|