From mboxrd@z Thu Jan 1 00:00:00 1970 From: Auger Eric Subject: Re: [PATCH] vfio_pci: Enable memory accesses before calling pci_map_rom Date: Wed, 13 Feb 2019 11:39:49 +0100 Message-ID: References: <20190213101406.3934-1-eric.auger@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit To: eric.auger.pro@gmail.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, alex.williamson@redhat.com Return-path: In-Reply-To: <20190213101406.3934-1-eric.auger@redhat.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Hi, On 2/13/19 11:14 AM, Eric Auger wrote: > pci_map_rom/pci_get_rom_size() performs memory access in the ROM. > In case the Memory Space accesses were disabled, readw() is likely to > crash the host with a synchronous external abort (aarch64). > > In case memory accesses were disabled, re-enable them before the call > and disable them back again just after. > > Signed-off-by: Eric Auger > --- > drivers/vfio/pci/vfio_pci.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index ff60bd1ea587..96b8bbd909d7 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -706,8 +706,10 @@ static long vfio_pci_ioctl(void *device_data, > break; > case VFIO_PCI_ROM_REGION_INDEX: > { > + bool mem_access_disabled; > void __iomem *io; > size_t size; > + u16 cmd; > > info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index); > info.flags = 0; > @@ -723,6 +725,13 @@ static long vfio_pci_ioctl(void *device_data, > break; > } > > + pci_read_config_word(pdev, PCI_COMMAND, &cmd); > + mem_access_disabled = !(cmd & PCI_COMMAND_MEMORY); > + if (mem_access_disabled) { > + cmd |= PCI_COMMAND_MEMORY; > + pci_write_config_word(pdev, PCI_COMMAND, cmd); > + } > + > /* Is it really there? */ > io = pci_map_rom(pdev, &size); > if (!io || !size) { > @@ -731,6 +740,11 @@ static long vfio_pci_ioctl(void *device_data, > } > pci_unmap_rom(pdev, io); > > + if (mem_access_disabled) { > + cmd &= ~PCI_COMMAND_MEMORY; > + pci_write_config_word(pdev, PCI_COMMAND, cmd); > + } I failed to re-enable in case of error. I will respin. Thanks Eric > + > info.flags = VFIO_REGION_INFO_FLAG_READ; > break; > } >