047483513a
xen-4.6.0-testing-src.tar.bz2 mini-os.tar.bz2 blktap2-no-uninit.patch stubdom-have-iovec.patch - Renamed xsa149.patch to CVE-2015-7969-xsa149.patch - Dropped patches now contained in tarball or unnecessary xen-4.5.2-testing-src.tar.bz2 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch 54f4985f-libxl-fix-libvirtd-double-free.patch 55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch 551ac326-xentop-add-support-for-qdisk.patch 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch 5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch 5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
58 lines
1.8 KiB
Diff
58 lines
1.8 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>
|
|
|
|
Index: xen-4.6.0-testing/xen/arch/x86/msi.c
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/xen/arch/x86/msi.c
|
|
+++ xen-4.6.0-testing/xen/arch/x86/msi.c
|
|
@@ -1336,6 +1336,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;
|
|
}
|
|
|