vpci/msix: fix PBA accesses
PATCH 1/1 vpci/msix: fix PBA accesses
Map the PBA in order to access it from the MSI-X read handler. Note that previously the handler will pass the physical host address into the read{l,q} handlers, which is wrong as those expect a linear address.
Map the PBA using ioremap when the first access is performed. Note that 32bit arches might want to abstract the call to ioremap into a vPCI arch handler, so they can use a fixmap range to map the PBA.
Reported-by Jan Beulich <[email protected]>
Signed-off-by Roger Pau Monné <[email protected]>
---
I don't seem to have a box with a driver that will try to access the PBA, so I would consider this specific code path only build tested. At least it doesn't seem to regress the current state of vPCI.
--- xen/drivers/vpci/msix.c | 28 +++++++++++++++++++++++++--- xen/drivers/vpci/vpci.c | 2 ++ xen/include/xen/vpci.h | 2 ++ 3 files changed, 29 insertions(+), 3 deletions(-)
xen/drivers/vpci/msix.c +25 -3
@@ -198,8 +198,13 @@ static int msix_read(struct vcpu *v, unsigned long addr, unsigned int len,if ( !access_allowed (msix->pdev, addr, len) )return X86EMUL_OKAY ; +spin_lock (&msix->pdev->vpci->lock);if (VMSIX_ADDR_IN_RANGE (addr, msix->pdev->vpci,VPCI_MSIX_PBA ) ) { +struct vpci *vpci = msix->pdev->vpci; +paddr_t base =vmsix_table_addr (vpci,VPCI_MSIX_PBA ); +unsigned int idx = addr - base; +/* * Access to PBA. *
@@ -207,25 +212,42 @@ static int msix_read(struct vcpu *v, unsigned long addr, unsigned int len,* guest address space. If this changes the address will need to be * translated. */ + +if ( !msix->pba ) + { + msix->pba =ioremap (base,vmsix_table_size (vpci,VPCI_MSIX_PBA )); +if ( !msix->pba ) + { +/* +* If unable to map the PBA return all 1s (all pending): it's +* likely better to trigger spurious events than drop them. +*/ +spin_unlock (&vpci->lock); +gprintk (XENLOG_WARNING ,"%pp: unable to map MSI-X PBA\n" , + msix->pdev); +return X86EMUL_OKAY ; + } + } +switch ( len ) {case 4 : - *data =readl (addr); + *data =readl (msix->pba + idx);break ;case 8 : - *data =readq (addr); + *data =readq (msix->pba + idx);break ;default :ASSERT_UNREACHABLE ();break ; } +spin_unlock (&vpci->lock);return X86EMUL_OKAY ; } -spin_lock (&msix->pdev->vpci->lock); entry =get_entry (msix, addr); offset = addr & (PCI_MSIX_ENTRY_SIZE -1 );
xen/drivers/vpci/vpci.c +2 -0
@@ -51,6 +51,8 @@ void vpci_remove_device(struct pci_dev *pdev)xfree (r); }spin_unlock (&pdev->vpci->lock); +if ( pdev->vpci->msix && pdev->vpci->msix->pba ) +iounmap (pdev->vpci->msix->pba);xfree (pdev->vpci->msix);xfree (pdev->vpci->msi);xfree (pdev->vpci);
xen/include/xen/vpci.h +2 -0
@@ -127,6 +127,8 @@ struct vpci { bool enabled : 1;/* Masked? */ bool masked : 1; +/* PBA map */ +void *pba;/* Entries. */ struct vpci_msix_entry {uint64_t addr;
Signature · 1 line
2.34.1