19d8f590f0
xen.spec - bsc#945167 - Running command ’ xl pci-assignable-add 03:10.1’ secondly show errors 55f7f9d2-libxl-slightly-refine-pci-assignable-add-remove-handling.patch - Upstream patches from Jan 55f2e438-x86-hvm-fix-saved-pmtimer-and-hpet-values.patch 55f9345b-x86-MSI-fail-if-no-hardware-support.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch 5604f2e6-vt-d-fix-IM-bit-mask-and-unmask-of-FECTL_REG.patch 560a4af9-x86-EPT-tighten-conditions-of-IOMMU-mapping-updates.patch 560a7c36-x86-p2m-pt-delay-freeing-of-intermediate-page-tables.patch 560a7c53-x86-p2m-pt-ignore-pt-share-flag-for-shadow-mode-guests.patch 560bd926-credit1-fix-tickling-when-it-happens-from-a-remote-pCPU.patch 560e6d34-x86-p2m-pt-tighten-conditions-of-IOMMU-mapping-updates.patch - bsc#941074 - VmError: Device 51728 (vbd) could not be connected. Hotplug scripts not working. hotplug-Linux-block-performance-fix.patch - bsc#947165 - VUL-0: CVE-2015-7311: xen: libxl fails to honour readonly flag on disks with qemu-xen (xsa-142) CVE-2015-7311-xsa142.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=378
76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
References: bsc#907514 bsc#910258 bsc#918984 bsc#923967
|
|
|
|
# Commit 484d7c852e4ff79c945406ed28b5db63a5a0b7f3
|
|
# Date 2015-07-23 10:14:13 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/MSI-X: track host and guest mask-all requests separately
|
|
|
|
Host uses of the bits will be added subsequently, and must not be
|
|
overridden by guests (including Dom0, namely when acting on behalf of
|
|
a guest).
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
|
|
--- a/xen/arch/x86/msi.c
|
|
+++ b/xen/arch/x86/msi.c
|
|
@@ -845,6 +845,12 @@ static int msix_capability_init(struct p
|
|
|
|
if ( !msix->used_entries )
|
|
{
|
|
+ msix->host_maskall = 0;
|
|
+ if ( !msix->guest_maskall )
|
|
+ control &= ~PCI_MSIX_FLAGS_MASKALL;
|
|
+ else
|
|
+ control |= PCI_MSIX_FLAGS_MASKALL;
|
|
+
|
|
if ( rangeset_add_range(mmio_ro_ranges, msix->table.first,
|
|
msix->table.last) )
|
|
WARN();
|
|
@@ -1113,6 +1119,34 @@ void pci_cleanup_msi(struct pci_dev *pde
|
|
int pci_msi_conf_write_intercept(struct pci_dev *pdev, unsigned int reg,
|
|
unsigned int size, uint32_t *data)
|
|
{
|
|
+ u16 seg = pdev->seg;
|
|
+ u8 bus = pdev->bus;
|
|
+ u8 slot = PCI_SLOT(pdev->devfn);
|
|
+ u8 func = PCI_FUNC(pdev->devfn);
|
|
+ struct msi_desc *entry;
|
|
+ unsigned int pos;
|
|
+
|
|
+ if ( pdev->msix )
|
|
+ {
|
|
+ entry = find_msi_entry(pdev, -1, PCI_CAP_ID_MSIX);
|
|
+ pos = entry ? entry->msi_attrib.pos
|
|
+ : pci_find_cap_offset(seg, bus, slot, func,
|
|
+ PCI_CAP_ID_MSIX);
|
|
+ ASSERT(pos);
|
|
+
|
|
+ if ( reg < pos || reg >= msix_pba_offset_reg(pos) + 4 )
|
|
+ return 0;
|
|
+
|
|
+ if ( reg != msix_control_reg(pos) || size != 2 )
|
|
+ return -EACCES;
|
|
+
|
|
+ pdev->msix->guest_maskall = !!(*data & PCI_MSIX_FLAGS_MASKALL);
|
|
+ if ( pdev->msix->host_maskall )
|
|
+ *data |= PCI_MSIX_FLAGS_MASKALL;
|
|
+
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--- a/xen/include/asm-x86/msi.h
|
|
+++ b/xen/include/asm-x86/msi.h
|
|
@@ -228,6 +228,7 @@ struct arch_msix {
|
|
int table_refcnt[MAX_MSIX_TABLE_PAGES];
|
|
int table_idx[MAX_MSIX_TABLE_PAGES];
|
|
spinlock_t table_lock;
|
|
+ bool_t host_maskall, guest_maskall;
|
|
domid_t warned;
|
|
};
|
|
|