307deeb5ff
- kvm-linux-headers-Update-to-Linux-v6.12-rc5.patch [RHEL-50212] - kvm-s390x-cpumodel-add-msa10-subfunctions.patch [RHEL-50212] - kvm-s390x-cpumodel-add-msa11-subfunctions.patch [RHEL-50212] - kvm-s390x-cpumodel-add-msa12-changes.patch [RHEL-50212] - kvm-s390x-cpumodel-add-msa13-subfunctions.patch [RHEL-50212] - kvm-s390x-cpumodel-Add-ptff-Query-Time-Stamp-Event-QTSE-.patch [RHEL-50212] - kvm-linux-headers-Update-to-Linux-6.13-rc1.patch [RHEL-50212] - kvm-s390x-cpumodel-add-Concurrent-functions-facility-sup.patch [RHEL-50212] - kvm-s390x-cpumodel-add-Vector-Enhancements-facility-3.patch [RHEL-50212] - kvm-s390x-cpumodel-add-Miscellaneous-Instruction-Extensi.patch [RHEL-50212] - kvm-s390x-cpumodel-add-Vector-Packed-Decimal-Enhancement.patch [RHEL-50212] - kvm-s390x-cpumodel-add-Ineffective-nonconstrained-transa.patch [RHEL-50212] - kvm-s390x-cpumodel-Add-Sequential-Instruction-Fetching-f.patch [RHEL-50212] - kvm-s390x-cpumodel-correct-PLO-feature-wording.patch [RHEL-50212] - kvm-s390x-cpumodel-Add-PLO-extension-facility.patch [RHEL-50212] - kvm-s390x-cpumodel-gen17-model.patch [RHEL-50212] - kvm-qga-skip-bind-mounts-in-fs-list.patch [RHEL-71940] - kvm-vhost-fail-device-start-if-iotlb-update-fails.patch [RHEL-27832] - kvm-hw-char-pl011-Use-correct-masks-for-IBRD-and-FBRD.patch [RHEL-67107] - Resolves: RHEL-50212 ([IBM 9.6 FEAT] KVM: CPU model for new IBM Z HW - qemu part) - Resolves: RHEL-71940 (qemu-ga cannot freeze filesystems with sentinelone) - Resolves: RHEL-27832 (The post-copy migration of RT-VM leads to race while accessing vhost-user device and hung/stalled target VM) - Resolves: RHEL-67107 ([aarch64] [rhel-9.6] Backport some important post 9.1 qemu fixes)
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From f9b6f2440117eaa4c57a3b924ba935580ef2ecf1 Mon Sep 17 00:00:00 2001
|
|
From: Prasad Pandit <pjp@fedoraproject.org>
|
|
Date: Thu, 7 Nov 2024 17:02:47 +0530
|
|
Subject: [PATCH 18/19] vhost: fail device start if iotlb update fails
|
|
|
|
RH-Author: Prasad Pandit <None>
|
|
RH-MergeRequest: 309: vhost: fail device start if iotlb update fails
|
|
RH-Jira: RHEL-27832
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [1/1] c10d1b2d3414285c2feec8760eb8e63e186fd564 (pjp/cs-qemu-kvm)
|
|
|
|
While starting a vhost device, updating iotlb entries
|
|
via 'vhost_device_iotlb_miss' may return an error.
|
|
|
|
qemu-kvm: vhost_device_iotlb_miss:
|
|
700871,700871: Fail to update device iotlb
|
|
|
|
Fail device start when such an error occurs.
|
|
|
|
Jira: https://issues.redhat.com/browse/RHEL-27832
|
|
Signed-off-by: Prasad Pandit <pjp@fedoraproject.org>
|
|
Message-Id: <20241107113247.46532-1-ppandit@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
(cherry picked from commit 571bdc97b83646dfd3746ec56fb2f70bca55b9a2)
|
|
Signed-off-by: Prasad Pandit <pjp@fedoraproject.org>
|
|
---
|
|
hw/virtio/vhost.c | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
|
|
index 06fc71746e..e25fdce3dd 100644
|
|
--- a/hw/virtio/vhost.c
|
|
+++ b/hw/virtio/vhost.c
|
|
@@ -2151,11 +2151,22 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev, bool vrings)
|
|
* vhost-kernel code requires for this.*/
|
|
for (i = 0; i < hdev->nvqs; ++i) {
|
|
struct vhost_virtqueue *vq = hdev->vqs + i;
|
|
- vhost_device_iotlb_miss(hdev, vq->used_phys, true);
|
|
+ r = vhost_device_iotlb_miss(hdev, vq->used_phys, true);
|
|
+ if (r) {
|
|
+ goto fail_iotlb;
|
|
+ }
|
|
}
|
|
}
|
|
vhost_start_config_intr(hdev);
|
|
return 0;
|
|
+fail_iotlb:
|
|
+ if (vhost_dev_has_iommu(hdev) &&
|
|
+ hdev->vhost_ops->vhost_set_iotlb_callback) {
|
|
+ hdev->vhost_ops->vhost_set_iotlb_callback(hdev, false);
|
|
+ }
|
|
+ if (hdev->vhost_ops->vhost_dev_start) {
|
|
+ hdev->vhost_ops->vhost_dev_start(hdev, false);
|
|
+ }
|
|
fail_start:
|
|
if (vrings) {
|
|
vhost_dev_set_vring_enable(hdev, false);
|
|
--
|
|
2.39.3
|
|
|