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
80 lines
2.6 KiB
Diff
80 lines
2.6 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>
|
|
|
|
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
|
|
@@ -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;
|
|
}
|
|
|
|
Index: xen-4.5.2-testing/xen/include/asm-x86/msi.h
|
|
===================================================================
|
|
--- xen-4.5.2-testing.orig/xen/include/asm-x86/msi.h
|
|
+++ xen-4.5.2-testing/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;
|
|
};
|
|
|