8724a18868
config handling stack overflow 55a62eb0-xl-correct-handling-of-extra_config-in-main_cpupoolcreate.patch - bsc#907514 - Bus fatal error & sles12 sudden reboot has been observed - bsc#910258 - SLES12 Xen host crashes with FATAL NMI after shutdown of guest with VT-d NIC - bsc#918984 - Bus fatal error & sles11-SP4 sudden reboot has been observed - bsc#923967 - Partner-L3: Bus fatal error & sles11-SP3 sudden reboot has been observed 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5576f143-x86-adjust-PV-I-O-emulation-functions-types.patch 55795a52-x86-vMSI-X-support-qword-MMIO-access.patch 5583d9c5-x86-MSI-X-cleanup.patch 5583da09-x86-MSI-track-host-and-guest-masking-separately.patch 55b0a218-x86-PCI-CFG-write-intercept.patch 55b0a255-x86-MSI-X-maskall.patch 55b0a283-x86-MSI-X-teardown.patch 55b0a2ab-x86-MSI-X-enable.patch 55b0a2db-x86-MSI-track-guest-masking.patch - Upstream patches from Jan 552d0f49-x86-traps-identify-the-vcpu-in-context-when-dumping-regs.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 55a66a1e-make-rangeset_report_ranges-report-all-ranges.patch 55a77e4f-dmar-device-scope-mem-leak-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=373
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;
|
|
};
|
|
|