[Xen-devel] [PATCH 2/5] Xen/MCE: vMCE injection

["Liu, Jinsong" <jinsong.liu@xxxxxxxxx>]

Xen/MCE: vMCE injection

for Intel MCE, broadcast vMCE to all vcpus;
for AMD MCE, only inject vMCE to 1 vcpu, say, vcpu0

Signed-off-by: Liu, Jinsong <jinsong.liu@xxxxxxxxx>
Suggested_by: Christoph Egger <Christoph.Egger@xxxxxxx>
Suggested_by: Jan Beulich <jbeulich@xxxxxxxx>

diff -r 570d98e2f1cf xen/arch/x86/cpu/mcheck/mce.h
--- a/xen/arch/x86/cpu/mcheck/mce.h     Wed Sep 19 23:22:57 2012 +0800
+++ b/xen/arch/x86/cpu/mcheck/mce.h     Wed Sep 26 18:59:03 2012 +0800
@@ -168,7 +168,7 @@
 
 int fill_vmsr_data(struct mcinfo_bank *mc_bank, struct domain *d,
     uint64_t gstatus);
-int inject_vmce(struct domain *d);
+int inject_vmce(struct domain *d, int vcpuid);
 
 static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr)
 {
diff -r 570d98e2f1cf xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c       Wed Sep 19 23:22:57 2012 +0800
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c       Wed Sep 26 18:59:03 2012 +0800
@@ -359,7 +359,7 @@
                 }
 
                 /* We will inject vMCE to DOMU*/
-                if ( inject_vmce(d) < 0 )
+                if ( inject_vmce(d, -1) < 0 )
                 {
                     mce_printk(MCE_QUIET, "inject vMCE to DOM%d"
                       " failed\n", d->domain_id);
diff -r 570d98e2f1cf xen/arch/x86/cpu/mcheck/vmce.c
--- a/xen/arch/x86/cpu/mcheck/vmce.c    Wed Sep 19 23:22:57 2012 +0800
+++ b/xen/arch/x86/cpu/mcheck/vmce.c    Wed Sep 26 18:59:03 2012 +0800
@@ -338,51 +338,44 @@
 HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt,
                           vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU);
 
-int inject_vmce(struct domain *d)
+/*
+ * for Intel MCE, broadcast vMCE to all vcpus
+ * for AMD MCE, only inject vMCE to 1 vcpu, say, vcpu0
+ * @ d, domain to which would inject vmce
+ * @ vcpuid,
+ *   < 0, broadcast vMCE to all vcpus
+ *   >= 0, vcpu who would be injected vMCE
+ * return 0 for success injection, -1 for fail injection
+ */
+int inject_vmce(struct domain *d, int vcpuid)
 {
-    int cpu = smp_processor_id();
+    struct vcpu *v;
+    int ret = -1;
 
-    /* PV guest and HVM guest have different vMCE# injection methods. */
-    if ( !test_and_set_bool(d->vcpu[0]->mce_pending) )
+    for_each_vcpu(d, v)
     {
-        if ( d->is_hvm )
+        if ( (vcpuid < 0) || (vcpuid == v->vcpu_id) )
         {
-            mce_printk(MCE_VERBOSE, "MCE: inject vMCE to HVM DOM %d\n",
-                       d->domain_id);
-            vcpu_kick(d->vcpu[0]);
-        }
-        else
-        {
-            mce_printk(MCE_VERBOSE, "MCE: inject vMCE to PV DOM%d\n",
-                       d->domain_id);
-            if ( guest_has_trap_callback(d, 0, TRAP_machine_check) )
+            if ( !test_and_set_bool(v->mce_pending) &&
+                ((d->is_hvm) ||
+                guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) )
             {
-                cpumask_copy(d->vcpu[0]->cpu_affinity_tmp,
-                             d->vcpu[0]->cpu_affinity);
-                mce_printk(MCE_VERBOSE, "MCE: CPU%d set affinity, old %d\n",
-                           cpu, d->vcpu[0]->processor);
-                vcpu_set_affinity(d->vcpu[0], cpumask_of(cpu));
-                vcpu_kick(d->vcpu[0]);
+                mce_printk(MCE_VERBOSE, "MCE: inject vMCE to dom%d vcpu%d\n",
+                           d->domain_id, v->vcpu_id);
+                vcpu_kick(v);
+                ret = 0;
             }
             else
             {
-                mce_printk(MCE_VERBOSE,
-                           "MCE: Kill PV guest with No MCE handler\n");
-                domain_crash(d);
+                mce_printk(MCE_QUIET, "Fail to inject vMCE to dom%d vcpu%d\n",
+                           d->domain_id, v->vcpu_id);
+                ret = -1;
+                break;
             }
         }
     }
-    else
-    {
-        /* new vMCE comes while first one has not been injected yet,
-         * in this case, inject fail. [We can't lose this vMCE for
-         * the mce node's consistency].
-         */
-        mce_printk(MCE_QUIET, "There's a pending vMCE waiting to be injected "
-                   " to this DOM%d!\n", d->domain_id);
-        return -1;
-    }
-    return 0;
+
+    return ret;
 }
 
 int fill_vmsr_data(struct mcinfo_bank *mc_bank, struct domain *d,

Attachment: 2_vmce_injection.patch
Description: 2_vmce_injection.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel