2023-03-13 14:43:54 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Alexander Bulekov <alxndr@bu.edu>
|
|
|
|
|
Date: Mon, 13 Mar 2023 04:24:17 -0400
|
|
|
|
|
Subject: [PATCH] lsi53c895a: disable reentrancy detection for script RAM
|
|
|
|
|
|
|
|
|
|
As the code is designed to use the memory APIs to access the script ram,
|
|
|
|
|
disable reentrancy checks for the pseudo-RAM ram_io MemoryRegion.
|
|
|
|
|
|
|
|
|
|
In the future, ram_io may be converted from an IO to a proper RAM MemoryRegion.
|
|
|
|
|
|
|
|
|
|
Reported-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
|
|
|
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
|
|
|
|
---
|
|
|
|
|
hw/scsi/lsi53c895a.c | 6 ++++++
|
|
|
|
|
1 file changed, 6 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
index af93557a9a..db27872963 100644
|
2023-03-13 14:43:54 +03:00
|
|
|
--- a/hw/scsi/lsi53c895a.c
|
|
|
|
|
+++ b/hw/scsi/lsi53c895a.c
|
|
|
|
|
@@ -2302,6 +2302,12 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
|
|
|
|
|
memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s,
|
|
|
|
|
"lsi-io", 256);
|
|
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Since we use the address-space API to interact with ram_io, disable the
|
|
|
|
|
+ * re-entrancy guard.
|
|
|
|
|
+ */
|
|
|
|
|
+ s->ram_io.disable_reentrancy_guard = true;
|
|
|
|
|
+
|
|
|
|
|
address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
|
|
|
|
|
qdev_init_gpio_out(d, &s->ext_irq, 1);
|
|
|
|
|
|