9e9b5acb9c
5604f239-x86-PV-properly-populate-descriptor-tables.patch 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-0.patch 561d2046-VT-d-use-proper-error-codes-in-iommu_enable_x2apic_IR.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-handling.patch - bsc#951845 - VUL-0: CVE-2015-7972: xen: x86: populate-on-demand balloon size inaccuracy can crash guests (XSA-153) xsa153-libxl.patch - bsc#950703 - VUL-1: CVE-2015-7969: xen: leak of main per-domain vcpu pointer array (DoS) (XSA-149) xsa149.patch - bsc#950705 - VUL-1: CVE-2015-7969: xen: x86: leak of per-domain profiling-related vcpu pointer array (DoS) (XSA-151) xsa151.patch - bsc#950706 - VUL-0: CVE-2015-7971: xen: x86: some pmu and profiling hypercalls log without rate limiting (XSA-152) xsa152.patch - Dropped 55dc7937-x86-IO-APIC-don-t-create-pIRQ-mapping-from-masked-RTE.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch - bsc#932267 - VUL-1: CVE-2015-4037: qemu,kvm,xen: insecure temporary file use in /net/slirp.c CVE-2015-4037-qemuu-smb-config-dir-name.patch CVE-2015-4037-qemut-smb-config-dir-name.patch - bsc#877642 - VUL-0: CVE-2014-0222: qemu: qcow1: validate L2 table size to avoid integer overflows OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=382
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
|
|
@@ -843,6 +843,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();
|
|
@@ -1111,6 +1117,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;
|
|
};
|
|
|