| Message ID | 20230426161951.2948996-9-alxndr@bu.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | memory: prevent dma-reentracy issues | expand |
On 26/04/2023 18.19, Alexander Bulekov wrote: > 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> > --- > 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); Reviewed-by: Thomas Huth <thuth@redhat.com>
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);
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> --- hw/pci-host/raven.c | 7 +++++++ 1 file changed, 7 insertions(+)