[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-8.0.5 09/66] raven: disable reentrancy detection for iomem
From: |
Michael Tokarev |
Subject: |
[Stable-8.0.5 09/66] raven: disable reentrancy detection for iomem |
Date: |
Wed, 13 Sep 2023 16:17:33 +0300 |
From: Alexander Bulekov <alxndr@bu.edu>
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>
(cherry picked from commit 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
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.2
- [Stable-8.0.5 00/66] v2 Patch Round-up for stable 8.0.5, freeze on 2023-09-19, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 01/66] memory: prevent dma-reentracy issues, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 02/66] async: Add an optional reentrancy guard to the BH API, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 03/66] async: avoid use-after-free on re-entrancy guard, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 04/66] checkpatch: add qemu_bh_new/aio_bh_new checks, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 05/66] hw: replace most qemu_bh_new calls with qemu_bh_new_guarded, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 06/66] lsi53c895a: disable reentrancy detection for script RAM, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 07/66] lsi53c895a: disable reentrancy detection for MMIO region, too, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 08/66] bcm2835_property: disable reentrancy detection for iomem, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 10/66] apic: disable reentrancy detection for apic-msi, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 09/66] raven: disable reentrancy detection for iomem,
Michael Tokarev <=
- [Stable-8.0.5 11/66] loongarch: mark loongarch_ipi_iocsr re-entrnacy safe, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 12/66] pnv_lpc: disable reentrancy detection for lpc-hc, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 57/66] arm64: Restore trapless ptimer access, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 56/66] virtio: Drop out of coroutine context in virtio_load(), Michael Tokarev, 2023/09/13
- [Stable-8.0.5 58/66] hw/char/riscv_htif: Fix printing of console characters on big endian hosts, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 59/66] hw/char/riscv_htif: Fix the console syscall on big endian hosts, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 60/66] hw/intc: Fix upper/lower mtime write calculation, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 61/66] hw/intc: Make rtc variable names consistent, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 63/66] hw/riscv: virt: Fix riscv,pmu DT node path, Michael Tokarev, 2023/09/13
- [Stable-8.0.5 62/66] linux-user/riscv: Use abi type for target_ucontext, Michael Tokarev, 2023/09/13