763b78040d
config handling stack overflow CVE-2015-3259-xsa137.patch - Upstream patches from Jan 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 559bdde5-pull-in-latest-linux-earlycpio.patch - Upstream patches from Jan pending review 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 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.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 55795a52-x86-vMSI-X-support-qword-MMIO-access.patch 557eb55f-gnttab-per-active-entry-locking.patch 557eb5b6-gnttab-introduce-maptrack-lock.patch 557eb620-gnttab-make-the-grant-table-lock-a-read-write-lock.patch 557ffab8-evtchn-factor-out-freeing-an-event-channel.patch 5582bf43-evtchn-simplify-port_is_valid.patch 5582bf81-evtchn-remove-the-locking-when-unmasking-an-event-channel.patch 5583d9c5-x86-MSI-X-cleanup.patch 5583da09-x86-MSI-track-host-and-guest-masking-separately.patch 5583da64-gnttab-use-per-VCPU-maptrack-free-lists.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=369
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
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>
|
|
|
|
--- sle12sp1.orig/xen/arch/x86/msi.c 2015-06-22 09:06:30.000000000 +0200
|
|
+++ sle12sp1/xen/arch/x86/msi.c 2015-06-22 09:23:08.000000000 +0200
|
|
@@ -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;
|
|
}
|
|
|
|
--- sle12sp1.orig/xen/include/asm-x86/msi.h 2015-07-08 00:00:00.000000000 +0200
|
|
+++ sle12sp1/xen/include/asm-x86/msi.h 2015-06-19 09:32:02.000000000 +0200
|
|
@@ -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;
|
|
};
|
|
|