a799a516c5
- kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch [bz#2186725] - kvm-graph-lock-Disable-locking-for-now.patch [bz#2186725] - kvm-nbd-server-Fix-drained_poll-to-wake-coroutine-in-rig.patch [bz#2186725] - kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch [bz#2186725] - kvm-memory-prevent-dma-reentracy-issues.patch [RHEL-516] - kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch [RHEL-516] - kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch [RHEL-516] - kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch [RHEL-516] - kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch [RHEL-516] - kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch [RHEL-516] - kvm-raven-disable-reentrancy-detection-for-iomem.patch [RHEL-516] - kvm-apic-disable-reentrancy-detection-for-apic-msi.patch [RHEL-516] - kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch [RHEL-516] - kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch [RHEL-516] - kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch [RHEL-516] - kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch [RHEL-516] - kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch [RHEL-516] - kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch [bz#2189423] - kvm-multifd-Fix-the-number-of-channels-ready.patch [bz#2196289] - kvm-util-async-teardown-wire-up-query-command-line-optio.patch [bz#2168500] - kvm-s390x-pv-Fix-spurious-warning-with-asynchronous-tear.patch [bz#2168500] - Resolves: bz#2186725 (Qemu hang when commit during fio running(iothread enable)) - Resolves: RHEL-516 (CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]) - Resolves: bz#2189423 (Failed to migrate VM from rhel 9.3 to rhel 9.2) - Resolves: bz#2196289 (Fix number of ready channels on multifd) - Resolves: bz#2168500 ([IBM 9.3 FEAT] KVM: Improve memory reclaiming for z15 Secure Execution guests - qemu part)
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 936e21428a04524ccffeb36110d1aa61de9f44e5 Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Tue, 9 May 2023 10:29:03 -0400
|
|
Subject: [PATCH 11/21] raven: disable reentrancy detection for iomem
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
RH-MergeRequest: 165: memory: prevent dma-reentracy issues
|
|
RH-Jira: RHEL-516
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [7/13] 48278583aa1ab08b912f49cd8b3a79d1bb3abf5f (jmaloy/jmaloy-qemu-kvm-2)
|
|
|
|
Jira: https://issues.redhat.com/browse/RHEL-516
|
|
Upstream: Merged
|
|
CVE: CVE-2023-2680
|
|
|
|
commit 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7
|
|
Author: Alexander Bulekov <alxndr@bu.edu>
|
|
Date: Thu Apr 27 17:10:12 2023 -0400
|
|
|
|
raven: disable reentrancy detection for iomem
|
|
|
|
As the code is designed for re-entrant calls from raven_io_ops to
|
|
pci-conf, mark raven_io_ops as reentrancy-safe.
|
|
|
|
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
|
Message-Id: <20230427211013.2994127-8-alxndr@bu.edu>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
---
|
|
hw/pci-host/raven.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
|
|
index 072ffe3c5e..9a11ac4b2b 100644
|
|
--- a/hw/pci-host/raven.c
|
|
+++ b/hw/pci-host/raven.c
|
|
@@ -294,6 +294,13 @@ static void raven_pcihost_initfn(Object *obj)
|
|
memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000);
|
|
address_space_init(&s->pci_io_as, &s->pci_io, "raven-io");
|
|
|
|
+ /*
|
|
+ * Raven's raven_io_ops use the address-space API to access pci-conf-idx
|
|
+ * (which is also owned by the raven device). As such, mark the
|
|
+ * pci_io_non_contiguous as re-entrancy safe.
|
|
+ */
|
|
+ s->pci_io_non_contiguous.disable_reentrancy_guard = true;
|
|
+
|
|
/* CPU address space */
|
|
memory_region_add_subregion(address_space_mem, PCI_IO_BASE_ADDR,
|
|
&s->pci_io);
|
|
--
|
|
2.39.3
|
|
|