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
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
References: bsc#907514 bsc#910258 bsc#918984 bsc#923967
|
|
|
|
# Commit df9f5676b3711c95127d44e871ad7ca38d6ed28a
|
|
# Date 2015-04-14 16:51:18 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/vMSI-X: add valid bits for read acceleration
|
|
|
|
Again because Xen doesn't get to see all guest writes, it shouldn't
|
|
serve reads from its cache before having seen a write to the respective
|
|
address.
|
|
|
|
Also use DECLARE_BITMAP() in a related field declaration instead of
|
|
open coding it.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
|
|
--- a/xen/arch/x86/hvm/vmsi.c
|
|
+++ b/xen/arch/x86/hvm/vmsi.c
|
|
@@ -154,11 +154,14 @@ struct msixtbl_entry
|
|
struct pci_dev *pdev;
|
|
unsigned long gtable; /* gpa of msix table */
|
|
unsigned long table_len;
|
|
- unsigned long table_flags[BITS_TO_LONGS(MAX_MSIX_TABLE_ENTRIES)];
|
|
+ DECLARE_BITMAP(table_flags, MAX_MSIX_TABLE_ENTRIES);
|
|
#define MAX_MSIX_ACC_ENTRIES 3
|
|
struct {
|
|
uint32_t msi_ad[3]; /* Shadow of address low, high and data */
|
|
} gentries[MAX_MSIX_ACC_ENTRIES];
|
|
+ DECLARE_BITMAP(acc_valid, 3 * MAX_MSIX_ACC_ENTRIES);
|
|
+#define acc_bit(what, ent, slot, idx) \
|
|
+ what##_bit((slot) * 3 + (idx), (ent)->acc_valid)
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
@@ -233,9 +236,10 @@ static int msixtbl_read(
|
|
if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET )
|
|
{
|
|
nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE;
|
|
- if ( nr_entry >= MAX_MSIX_ACC_ENTRIES )
|
|
- goto out;
|
|
index = offset / sizeof(uint32_t);
|
|
+ if ( nr_entry >= MAX_MSIX_ACC_ENTRIES ||
|
|
+ !acc_bit(test, entry, nr_entry, index) )
|
|
+ goto out;
|
|
*pval = entry->gentries[nr_entry].msi_ad[index];
|
|
}
|
|
else
|
|
@@ -281,6 +285,7 @@ static int msixtbl_write(struct vcpu *v,
|
|
{
|
|
index = offset / sizeof(uint32_t);
|
|
entry->gentries[nr_entry].msi_ad[index] = val;
|
|
+ acc_bit(set, entry, nr_entry, index);
|
|
}
|
|
set_bit(nr_entry, &entry->table_flags);
|
|
goto out;
|