3f55414718
- Upstream or pending upstream patches from Jan 25587-fix-off-by-one-parsing-error.patch 25616-x86-MCi_CTL-default.patch 25617-vtd-qinval-addr.patch 25688-x86-nr_irqs_gsi.patch - bnc#773393 - VUL-0: CVE-2012-3433: xen: HVM guest destroy p2m teardown host DoS vulnerability CVE-2012-3433-xsa11.patch - bnc#773401 - VUL-1: CVE-2012-3432: xen: HVM guest user mode MMIO emulation DoS 25682-x86-inconsistent-io-state.patch - bnc#762484 - VUL-1: CVE-2012-2625: xen: pv bootloader doesn't check the size of the bzip2 or lzma compressed kernel, leading to denial of service 25589-pygrub-size-limits.patch - Make it build with latest TeXLive 2012 with new package layout OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=196
126 lines
3.7 KiB
Diff
126 lines
3.7 KiB
Diff
# HG changeset patch
|
|
# User Liu, Jinsong <jinsong.liu@intel.com>
|
|
# Date 1342709122 -3600
|
|
# Node ID 8a4cda0bbdc2309c7f86445eaa14e4f75e9bd21a
|
|
# Parent 3625ff5e9f80aebb403d6efc75522eef08cd3802
|
|
Xen/MCE: stick all 1's to MCi_CTL of vMCE
|
|
|
|
This patch is a middle-work patch, prepare for future new vMCE model.
|
|
It remove mci_ctl array, and keep MCi_CTL all 1's.
|
|
|
|
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
|
|
Committed-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/cpu/mcheck/vmce.c
|
|
+++ b/xen/arch/x86/cpu/mcheck/vmce.c
|
|
@@ -25,7 +25,6 @@ uint64_t g_mcg_cap;
|
|
|
|
/* Real value in physical CTL MSR */
|
|
uint64_t h_mcg_ctl = 0UL;
|
|
-uint64_t *h_mci_ctrl;
|
|
|
|
int vmce_init_msr(struct domain *d)
|
|
{
|
|
@@ -33,15 +32,6 @@ int vmce_init_msr(struct domain *d)
|
|
if ( !dom_vmce(d) )
|
|
return -ENOMEM;
|
|
|
|
- dom_vmce(d)->mci_ctl = xmalloc_array(uint64_t, nr_mce_banks);
|
|
- if ( !dom_vmce(d)->mci_ctl )
|
|
- {
|
|
- xfree(dom_vmce(d));
|
|
- return -ENOMEM;
|
|
- }
|
|
- memset(dom_vmce(d)->mci_ctl, ~0,
|
|
- nr_mce_banks * sizeof(*dom_vmce(d)->mci_ctl));
|
|
-
|
|
dom_vmce(d)->mcg_status = 0x0;
|
|
dom_vmce(d)->mcg_ctl = ~(uint64_t)0x0;
|
|
dom_vmce(d)->nr_injection = 0;
|
|
@@ -56,7 +46,6 @@ void vmce_destroy_msr(struct domain *d)
|
|
{
|
|
if ( !dom_vmce(d) )
|
|
return;
|
|
- xfree(dom_vmce(d)->mci_ctl);
|
|
xfree(dom_vmce(d));
|
|
dom_vmce(d) = NULL;
|
|
}
|
|
@@ -93,9 +82,8 @@ static int bank_mce_rdmsr(const struct v
|
|
switch ( msr & (MSR_IA32_MC0_CTL | 3) )
|
|
{
|
|
case MSR_IA32_MC0_CTL:
|
|
- if ( bank < nr_mce_banks )
|
|
- *val = vmce->mci_ctl[bank] &
|
|
- (h_mci_ctrl ? h_mci_ctrl[bank] : ~0UL);
|
|
+ /* stick all 1's to MCi_CTL */
|
|
+ *val = ~0UL;
|
|
mce_printk(MCE_VERBOSE, "MCE: rdmsr MC%u_CTL 0x%"PRIx64"\n",
|
|
bank, *val);
|
|
break;
|
|
@@ -220,8 +208,10 @@ static int bank_mce_wrmsr(struct vcpu *v
|
|
switch ( msr & (MSR_IA32_MC0_CTL | 3) )
|
|
{
|
|
case MSR_IA32_MC0_CTL:
|
|
- if ( bank < nr_mce_banks )
|
|
- vmce->mci_ctl[bank] = val;
|
|
+ /*
|
|
+ * if guest crazy clear any bit of MCi_CTL,
|
|
+ * treat it as not implement and ignore write change it.
|
|
+ */
|
|
break;
|
|
case MSR_IA32_MC0_STATUS:
|
|
if ( entry && (entry->bank == bank) )
|
|
@@ -522,22 +512,6 @@ int vmce_domain_inject(
|
|
int vmce_init(struct cpuinfo_x86 *c)
|
|
{
|
|
u64 value;
|
|
- unsigned int i;
|
|
-
|
|
- if ( !h_mci_ctrl )
|
|
- {
|
|
- h_mci_ctrl = xmalloc_array(uint64_t, nr_mce_banks);
|
|
- if (!h_mci_ctrl)
|
|
- {
|
|
- dprintk(XENLOG_INFO, "Failed to alloc h_mci_ctrl\n");
|
|
- return -ENOMEM;
|
|
- }
|
|
- /* Don't care banks before firstbank */
|
|
- memset(h_mci_ctrl, ~0,
|
|
- min(firstbank, nr_mce_banks) * sizeof(*h_mci_ctrl));
|
|
- for (i = firstbank; i < nr_mce_banks; i++)
|
|
- rdmsrl(MSR_IA32_MCx_CTL(i), h_mci_ctrl[i]);
|
|
- }
|
|
|
|
rdmsrl(MSR_IA32_MCG_CAP, value);
|
|
/* For Guest vMCE usage */
|
|
@@ -550,18 +524,13 @@ int vmce_init(struct cpuinfo_x86 *c)
|
|
|
|
static int mca_ctl_conflict(struct mcinfo_bank *bank, struct domain *d)
|
|
{
|
|
- int bank_nr;
|
|
-
|
|
- if ( !bank || !d || !h_mci_ctrl )
|
|
+ if ( !bank || !d )
|
|
return 1;
|
|
|
|
/* Will MCE happen in host if If host mcg_ctl is 0? */
|
|
if ( ~d->arch.vmca_msrs->mcg_ctl & h_mcg_ctl )
|
|
return 1;
|
|
|
|
- bank_nr = bank->mc_bank;
|
|
- if (~d->arch.vmca_msrs->mci_ctl[bank_nr] & h_mci_ctrl[bank_nr] )
|
|
- return 1;
|
|
return 0;
|
|
}
|
|
|
|
--- a/xen/include/asm-x86/mce.h
|
|
+++ b/xen/include/asm-x86/mce.h
|
|
@@ -18,7 +18,6 @@ struct domain_mca_msrs
|
|
/* Guest should not change below values after DOM boot up */
|
|
uint64_t mcg_ctl;
|
|
uint64_t mcg_status;
|
|
- uint64_t *mci_ctl;
|
|
uint16_t nr_injection;
|
|
struct list_head impact_header;
|
|
spinlock_t lock;
|