mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
pci: clear {host/guest}_maskall field on assign
The current implementation of host_maskall makes it sticky across assign and deassign calls, which means that once a guest forces Xen to set host_maskall the maskall bit is not going to be cleared until a call to PHYSDEVOP_prepare_msix is performed. Such call however shouldn't be part of the normal flow when doing PCI passthrough, and hence the flag needs to be cleared when assigning in order to prevent host_maskall being carried over from previous assignations. Note that the entry maskbit is reset when the msix capability is initialized, and the guest_maskall field is also cleared so that the hardware value matches Xen's internal state (hardware maskall = host_maskall | guest_maskall). Also note that doing the reset of host_maskall there would allow the guest to reset such field by enabling and disabling MSIX, which is not intended. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> Tested-by: Chao Gao <chao.gao@intel.com> Release-acked-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
1 parent
af9f357fb8
commit
575e18d54d
3 files changed
+28
No files matched your search
@@ -1249,6 +1249,28 @@ void pci_cleanup_msi(struct pci_dev *pdev)
|
||||
msi_free_irqs(pdev);
|
||||
}
|
||||
|
||||
int pci_reset_msix_state(struct pci_dev *pdev)
|
||||
{
|
||||
unsigned int pos = pci_find_cap_offset(pdev->seg, pdev->bus, pdev->sbdf.dev,
|
||||
pdev->sbdf.fn, PCI_CAP_ID_MSIX);
|
||||
|
||||
ASSERT(pos);
|
||||
/*
|
||||
* Xen expects the device state to be the after reset one, and hence
|
||||
* host_maskall = guest_maskall = false and all entries should have the
|
||||
* mask bit set. Test that the maskall bit is not set, having it set could
|
||||
* signal that the device hasn't been reset properly.
|
||||
*/
|
||||
if ( pci_conf_read16(pdev->sbdf, msix_control_reg(pos)) &
|
||||
PCI_MSIX_FLAGS_MASKALL )
|
||||
return -EBUSY;
|
||||
|
||||
pdev->msix->host_maskall = false;
|
||||
pdev->msix->guest_maskall = false;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int pci_msi_conf_write_intercept(struct pci_dev *pdev, unsigned int reg,
|
||||
unsigned int size, uint32_t *data)
|
||||
{
|
||||
|
||||
@@ -1505,7 +1505,12 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
|
||||
}
|
||||
|
||||
if ( pdev->msix )
|
||||
{
|
||||
rc = pci_reset_msix_state(pdev);
|
||||
if ( rc )
|
||||
goto done;
|
||||
msixtbl_init(d);
|
||||
}
|
||||
|
||||
pdev->fault.count = 0;
|
||||
|
||||
|
||||
@@ -92,6 +92,7 @@ extern int __setup_msi_irq(struct irq_desc *, struct msi_desc *,
|
||||
extern void teardown_msi_irq(int irq);
|
||||
extern int msi_free_vector(struct msi_desc *entry);
|
||||
extern int pci_restore_msi_state(struct pci_dev *pdev);
|
||||
extern int pci_reset_msix_state(struct pci_dev *pdev);
|
||||
|
||||
struct msi_desc {
|
||||
struct msi_attrib {
|
||||
|
||||