|
 |
1bdc94 |
From 3483f36dbf965a4ca01c4a2d3bce1132340596d1 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: "plai@redhat.com" <plai@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 31 Aug 2018 16:25:52 +0200
|
|
|
1bdc94 |
Subject: [PATCH 10/29] vfio/pci: do not set the PCIDevice 'has_rom' attribute
|
|
|
1bdc94 |
MIME-Version: 1.0
|
|
|
1bdc94 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1bdc94 |
Content-Transfer-Encoding: 8bit
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: plai@redhat.com
|
|
|
1bdc94 |
Message-id: <1535732759-22481-3-git-send-email-plai@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 82004
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 PATCH BZ 1539280 2/9] vfio/pci: do not set the PCIDevice 'has_rom' attribute
|
|
|
1bdc94 |
Bugzilla: 1539280
|
|
|
1bdc94 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Cédric Le Goater <clg@kaod.org>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
PCI devices needing a ROM allocate an optional MemoryRegion with
|
|
|
1bdc94 |
pci_add_option_rom(). pci_del_option_rom() does the cleanup when the
|
|
|
1bdc94 |
device is destroyed. The only action taken by this routine is to call
|
|
|
1bdc94 |
vmstate_unregister_ram() which clears the id string of the optional
|
|
|
1bdc94 |
ROM RAMBlock and now, also flags the RAMBlock as non-migratable. This
|
|
|
1bdc94 |
was recently added by commit b895de502717 ("migration: discard
|
|
|
1bdc94 |
non-migratable RAMBlocks"), .
|
|
|
1bdc94 |
|
|
|
1bdc94 |
VFIO devices do their own loading of the PCI option ROM in
|
|
|
1bdc94 |
vfio_pci_size_rom(). The memory region is switched to an I/O region
|
|
|
1bdc94 |
and the PCI attribute 'has_rom' is set but the RAMBlock of the ROM
|
|
|
1bdc94 |
region is not allocated. When the associated PCI device is deleted,
|
|
|
1bdc94 |
pci_del_option_rom() calls vmstate_unregister_ram() which tries to
|
|
|
1bdc94 |
flag a NULL RAMBlock, leading to a SEGV.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
It seems that 'has_rom' was set to have memory_region_destroy()
|
|
|
1bdc94 |
called, but since commit 469b046ead06 ("memory: remove
|
|
|
1bdc94 |
memory_region_destroy") this is not necessary anymore as the
|
|
|
1bdc94 |
MemoryRegion is freed automagically.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Remove the PCIDevice 'has_rom' attribute setting in vfio.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Fixes: b895de502717 ("migration: discard non-migratable RAMBlocks")
|
|
|
1bdc94 |
Signed-off-by: Cédric Le Goater <clg@kaod.org>
|
|
|
1bdc94 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 26c0ae56386edacc8b0da40264748f59afedb1bb)
|
|
|
1bdc94 |
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/vfio/pci.c | 1 -
|
|
|
1bdc94 |
1 file changed, 1 deletion(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
|
|
|
1bdc94 |
index 4683eb4..c00b91c 100644
|
|
|
1bdc94 |
--- a/hw/vfio/pci.c
|
|
|
1bdc94 |
+++ b/hw/vfio/pci.c
|
|
|
1bdc94 |
@@ -990,7 +990,6 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev)
|
|
|
1bdc94 |
pci_register_bar(&vdev->pdev, PCI_ROM_SLOT,
|
|
|
1bdc94 |
PCI_BASE_ADDRESS_SPACE_MEMORY, &vdev->pdev.rom);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
- vdev->pdev.has_rom = true;
|
|
|
1bdc94 |
vdev->rom_read_failed = false;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|