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
100 lines
3.1 KiB
Diff
100 lines
3.1 KiB
Diff
References: bsc#907514 bsc#910258 bsc#918984 bsc#923967
|
|
|
|
# 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 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,
|
|
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,
|
|
|
|
unlock:
|
|
spin_unlock_irqrestore(&desc->lock, flags);
|
|
- r = X86EMUL_OKAY;
|
|
+ if ( len == 4 )
|
|
+ r = X86EMUL_OKAY;
|
|
|
|
out:
|
|
rcu_read_unlock(&msixtbl_rcu_lock);
|