f158f55e6a
xen-4.5.2-testing-src.tar.bz2 - Drop the following xen-4.5.1-testing-src.tar.bz2 552d0f49-x86-traps-identify-the-vcpu-in-context-when-dumping-regs.patch 5576f178-kexec-add-more-pages-to-v1-environment.patch 55780be1-x86-EFI-adjust-EFI_MEMORY_WP-handling-for-spec-version-2.5.patch 558bfaa0-x86-traps-avoid-using-current-too-early.patch 5592a116-nested-EPT-fix-the-handling-of-nested-EPT.patch 559b9dd6-x86-p2m-ept-don-t-unmap-in-use-EPT-pagetable.patch 559bc633-x86-cpupool-clear-proper-cpu_valid-bit-on-CPU-teardown.patch 559bc64e-credit1-properly-deal-with-CPUs-not-in-any-pool.patch 559bc87f-x86-hvmloader-avoid-data-corruption-with-xenstore-rw.patch 559bdde5-pull-in-latest-linux-earlycpio.patch 55a62eb0-xl-correct-handling-of-extra_config-in-main_cpupoolcreate.patch 55a66a1e-make-rangeset_report_ranges-report-all-ranges.patch 55a77e4f-dmar-device-scope-mem-leak-fix.patch 55c1d83d-x86-gdt-Drop-write-only-xalloc-d-array.patch 55c3232b-x86-mm-Make-hap-shadow-teardown-preemptible.patch 55dc78e9-x86-amd_ucode-skip-updates-for-final-levels.patch 55df2f76-IOMMU-skip-domains-without-page-tables-when-dumping.patch 55e43fd8-x86-NUMA-fix-setup_node.patch 55e43ff8-x86-NUMA-don-t-account-hotplug-regions.patch 55e593f1-x86-NUMA-make-init_node_heap-respect-Xen-heap-limit.patch 55f2e438-x86-hvm-fix-saved-pmtimer-and-hpet-values.patch 55f9345b-x86-MSI-fail-if-no-hardware-support.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 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=384
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.5.2-testing/xen/arch/x86/msi.c
|
|
===================================================================
|
|
--- xen-4.5.2-testing.orig/xen/arch/x86/msi.c
|
|
+++ xen-4.5.2-testing/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;
|
|
}
|
|
|