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
98 lines
3.1 KiB
Diff
98 lines
3.1 KiB
Diff
# Commit 284ffb4f9b0d5c3a33c4c5bd87645d0cc342ca96
|
|
# Date 2015-06-11 11:52:18 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/vMSI-X: support qword MMIO access
|
|
|
|
The specification explicitly provides for this, so we should have
|
|
supported this from the beginning.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
|
|
--- a/xen/arch/x86/hvm/vmsi.c
|
|
+++ b/xen/arch/x86/hvm/vmsi.c
|
|
@@ -223,7 +223,7 @@ static int msixtbl_read(
|
|
unsigned int nr_entry, index;
|
|
int r = X86EMUL_UNHANDLEABLE;
|
|
|
|
- if ( len != 4 || (address & 3) )
|
|
+ if ( (len != 4 && len != 8) || (address & (len - 1)) )
|
|
return r;
|
|
|
|
rcu_read_lock(&msixtbl_rcu_lock);
|
|
@@ -241,13 +241,25 @@ static int msixtbl_read(
|
|
!acc_bit(test, entry, nr_entry, index) )
|
|
goto out;
|
|
*pval = entry->gentries[nr_entry].msi_ad[index];
|
|
+ if ( len == 8 )
|
|
+ {
|
|
+ if ( index )
|
|
+ offset = PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
|
|
+ else if ( acc_bit(test, entry, nr_entry, 1) )
|
|
+ *pval |= (u64)entry->gentries[nr_entry].msi_ad[1] << 32;
|
|
+ else
|
|
+ goto out;
|
|
+ }
|
|
}
|
|
- else
|
|
+ if ( offset == PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET )
|
|
{
|
|
virt = msixtbl_addr_to_virt(entry, address);
|
|
if ( !virt )
|
|
goto out;
|
|
- *pval = readl(virt);
|
|
+ if ( len == 4 )
|
|
+ *pval = readl(virt);
|
|
+ else
|
|
+ *pval |= (u64)readl(virt) << 32;
|
|
}
|
|
|
|
r = X86EMUL_OKAY;
|
|
@@ -268,7 +280,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address,
|
|
unsigned long flags, orig;
|
|
struct irq_desc *desc;
|
|
|
|
- if ( len != 4 || (address & 3) )
|
|
+ if ( (len != 4 && len != 8) || (address & (len - 1)) )
|
|
return r;
|
|
|
|
rcu_read_lock(&msixtbl_rcu_lock);
|
|
@@ -279,16 +291,23 @@ static int msixtbl_write(struct vcpu *v, unsigned long address,
|
|
nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE;
|
|
|
|
offset = address & (PCI_MSIX_ENTRY_SIZE - 1);
|
|
- if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET)
|
|
+ if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET )
|
|
{
|
|
+ index = offset / sizeof(uint32_t);
|
|
if ( nr_entry < MAX_MSIX_ACC_ENTRIES )
|
|
{
|
|
- index = offset / sizeof(uint32_t);
|
|
entry->gentries[nr_entry].msi_ad[index] = val;
|
|
acc_bit(set, entry, nr_entry, index);
|
|
+ if ( len == 8 && !index )
|
|
+ {
|
|
+ entry->gentries[nr_entry].msi_ad[1] = val >> 32;
|
|
+ acc_bit(set, entry, nr_entry, 1);
|
|
+ }
|
|
}
|
|
set_bit(nr_entry, &entry->table_flags);
|
|
- goto out;
|
|
+ if ( len != 8 || !index )
|
|
+ goto out;
|
|
+ val >>= 32;
|
|
}
|
|
|
|
/* Exit to device model when unmasking and address/data got modified. */
|
|
@@ -352,7 +371,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address,
|
|
|
|
unlock:
|
|
spin_unlock_irqrestore(&desc->lock, flags);
|
|
- r = X86EMUL_OKAY;
|
|
+ if ( len == 4 )
|
|
+ r = X86EMUL_OKAY;
|
|
|
|
out:
|
|
rcu_read_unlock(&msixtbl_rcu_lock);
|