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
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
References: bsc#907514 bsc#910258 bsc#918984 bsc#923967
|
|
|
|
# Commit aa7c1fdf9dd04a1287f4770906b2c41b88a28228
|
|
# Date 2015-07-23 10:16:27 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/MSI: properly track guest masking requests
|
|
|
|
... by monitoring writes to the mask register.
|
|
|
|
This allows reverting the main effect of the XSA-129 patches in qemu.
|
|
|
|
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
|
|
@@ -1305,6 +1305,37 @@ int pci_msi_conf_write_intercept(struct
|
|
return 1;
|
|
}
|
|
|
|
+ entry = find_msi_entry(pdev, -1, PCI_CAP_ID_MSI);
|
|
+ if ( entry && entry->msi_attrib.maskbit )
|
|
+ {
|
|
+ uint16_t cntl;
|
|
+ uint32_t unused;
|
|
+
|
|
+ pos = entry->msi_attrib.pos;
|
|
+ if ( reg < pos || reg >= entry->msi.mpos + 8 )
|
|
+ return 0;
|
|
+
|
|
+ if ( reg == msi_control_reg(pos) )
|
|
+ return size == 2 ? 1 : -EACCES;
|
|
+ if ( reg < entry->msi.mpos || reg >= entry->msi.mpos + 4 || size != 4 )
|
|
+ return -EACCES;
|
|
+
|
|
+ cntl = pci_conf_read16(seg, bus, slot, func, msi_control_reg(pos));
|
|
+ unused = ~(uint32_t)0 >> (32 - multi_msi_capable(cntl));
|
|
+ for ( pos = 0; pos < entry->msi.nvec; ++pos, ++entry )
|
|
+ {
|
|
+ entry->msi_attrib.guest_masked =
|
|
+ *data >> entry->msi_attrib.entry_nr;
|
|
+ if ( entry->msi_attrib.host_masked )
|
|
+ *data |= 1 << pos;
|
|
+ unused &= ~(1 << pos);
|
|
+ }
|
|
+
|
|
+ *data |= unused;
|
|
+
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|