On Wed, Oct 30, 2024 at 09:13:24PM +0800, Gao Shiyuan wrote: > As shown below, if a virtio PCI device is attached under a pci-bridge, the MR > of VirtIOPCIRegion does not belong to any address space. So memory_region_find > cannot be used to search for this MR. > > Introduce the virtio-pci and pci_bridge address spaces to solve this problem. > > Before: > memory-region: pci_bridge_pci > 0000000000000000-ffffffffffffffff (prio 0, i/o): pci_bridge_pci > 00000000fe840000-00000000fe840fff (prio 1, i/o): virtio-net-pci-msix > 00000000fe840000-00000000fe84003f (prio 0, i/o): msix-table > 00000000fe840800-00000000fe840807 (prio 0, i/o): msix-pba > 0000380000000000-0000380000003fff (prio 1, i/o): virtio-pci > 0000380000000000-0000380000000fff (prio 0, i/o): > virtio-pci-common-virtio-net > 0000380000001000-0000380000001fff (prio 0, i/o): > virtio-pci-isr-virtio-net > 0000380000002000-0000380000002fff (prio 0, i/o): > virtio-pci-device-virtio-net > 0000380000003000-0000380000003fff (prio 0, i/o): > virtio-pci-notify-virtio-net > > After: > address-space: virtio-pci-cfg-mem-as > 0000380000000000-0000380000003fff (prio 1, i/o): virtio-pci > 0000380000000000-0000380000000fff (prio 0, i/o): > virtio-pci-common-virtio-net > 0000380000001000-0000380000001fff (prio 0, i/o): virtio-pci-isr-virtio-net > 0000380000002000-0000380000002fff (prio 0, i/o): > virtio-pci-device-virtio-net > 0000380000003000-0000380000003fff (prio 0, i/o): > virtio-pci-notify-virtio-net > > address-space: pci_bridge_pci_mem > 0000000000000000-ffffffffffffffff (prio 0, i/o): pci_bridge_pci > 00000000fe840000-00000000fe840fff (prio 1, i/o): virtio-net-pci-msix > 00000000fe840000-00000000fe84003f (prio 0, i/o): msix-table > 00000000fe840800-00000000fe840807 (prio 0, i/o): msix-pba > 0000380000000000-0000380000003fff (prio 1, i/o): virtio-pci > 0000380000000000-0000380000000fff (prio 0, i/o): > virtio-pci-common-virtio-net > 0000380000001000-0000380000001fff (prio 0, i/o): > virtio-pci-isr-virtio-net > 0000380000002000-0000380000002fff (prio 0, i/o): > virtio-pci-device-virtio-net > 0000380000003000-0000380000003fff (prio 0, i/o): > virtio-pci-notify-virtio-net > > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2576 > Fixes: ffa8a3e3b2e6 ("virtio-pci: Add lookup subregion of VirtIOPCIRegion MR") > Co-developed-by: Zuo Boqun <zuobo...@baidu.com> > Signed-off-by: Zuo Boqun <zuobo...@baidu.com> > Co-developed-by: Wang Liang <wanglian...@baidu.com> > Signed-off-by: Wang Liang <wanglian...@baidu.com> > Signed-off-by: Gao Shiyuan <gaoshiy...@baidu.com> > --- > hw/pci/pci_bridge.c | 5 ++++ > hw/virtio/virtio-pci.c | 10 +++++++ > include/hw/pci/pci_bridge.h | 2 ++ > include/hw/virtio/virtio-pci.h | 3 +++ > tests/qtest/fuzz-virtio-balloon-test.c | 37 ++++++++++++++++++++++++++ > tests/qtest/meson.build | 1 + > 6 files changed, 58 insertions(+) > create mode 100644 tests/qtest/fuzz-virtio-balloon-test.c > > v2 -> v3: > * add qtest for the issue > * fix a bug, only when enable modern_pio, destroy modern_cfg_io_as > > v1 -> v2: > * modify commit message > * add address space for port I/O notification config region
Tested-by: Daniel P. Berrangé <berra...@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
