yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-vfio-pci-do-not-set-the-PCIDevice-has_rom-attribute.patch

26ba25
From 85d3fdbf408b0d96ff27c38d09770685c6bac4ec Mon Sep 17 00:00:00 2001
26ba25
From: "plai@redhat.com" <plai@redhat.com>
26ba25
Date: Mon, 7 Jan 2019 17:02:15 +0000
26ba25
Subject: [PATCH 14/22] vfio/pci: do not set the PCIDevice 'has_rom' attribute
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: plai@redhat.com
26ba25
Message-id: <1546880543-24860-3-git-send-email-plai@redhat.com>
26ba25
Patchwork-id: 83888
26ba25
O-Subject: [RHEL8.0 qemu-kvm PATCH v7 02/10] vfio/pci: do not set the PCIDevice 'has_rom' attribute
26ba25
Bugzilla: 1539285
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
26ba25
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
26ba25
26ba25
From: Cédric Le Goater <clg@kaod.org>
26ba25
26ba25
PCI devices needing a ROM allocate an optional MemoryRegion with
26ba25
pci_add_option_rom(). pci_del_option_rom() does the cleanup when the
26ba25
device is destroyed. The only action taken by this routine is to call
26ba25
vmstate_unregister_ram() which clears the id string of the optional
26ba25
ROM RAMBlock and now, also flags the RAMBlock as non-migratable. This
26ba25
was recently added by commit b895de502717 ("migration: discard
26ba25
non-migratable RAMBlocks"), .
26ba25
26ba25
VFIO devices do their own loading of the PCI option ROM in
26ba25
vfio_pci_size_rom(). The memory region is switched to an I/O region
26ba25
and the PCI attribute 'has_rom' is set but the RAMBlock of the ROM
26ba25
region is not allocated. When the associated PCI device is deleted,
26ba25
pci_del_option_rom() calls vmstate_unregister_ram() which tries to
26ba25
flag a NULL RAMBlock, leading to a SEGV.
26ba25
26ba25
It seems that 'has_rom' was set to have memory_region_destroy()
26ba25
called, but since commit 469b046ead06 ("memory: remove
26ba25
memory_region_destroy") this is not necessary anymore as the
26ba25
MemoryRegion is freed automagically.
26ba25
26ba25
Remove the PCIDevice 'has_rom' attribute setting in vfio.
26ba25
26ba25
Fixes: b895de502717 ("migration: discard non-migratable RAMBlocks")
26ba25
Signed-off-by: Cédric Le Goater <clg@kaod.org>
26ba25
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
26ba25
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
26ba25
(cherry picked from commit 26c0ae56386edacc8b0da40264748f59afedb1bb)
26ba25
Signed-off-by: Paul Lai <plai@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 hw/vfio/pci.c | 1 -
26ba25
 1 file changed, 1 deletion(-)
26ba25
26ba25
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
26ba25
index b463661..ba3a393 100644
26ba25
--- a/hw/vfio/pci.c
26ba25
+++ b/hw/vfio/pci.c
26ba25
@@ -990,7 +990,6 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev)
26ba25
     pci_register_bar(&vdev->pdev, PCI_ROM_SLOT,
26ba25
                      PCI_BASE_ADDRESS_SPACE_MEMORY, &vdev->pdev.rom);
26ba25
 
26ba25
-    vdev->pdev.has_rom = true;
26ba25
     vdev->rom_read_failed = false;
26ba25
 }
26ba25
 
26ba25
-- 
26ba25
1.8.3.1
26ba25