Skip to contentSkip to conversation

porting lockless mce from x86_64 to i386

PATCH In review Guo Racing 2 participants 3 messages May 19, 2005 – May 21, 2005

lore
Share & tools
lore

Guo Racing

author
#0 lore raw

PATCH 1/2 porting lockless mce from x86_64 to i386

Lockless MCE(machine check exception) is ported from x86-64 to i386. This patch is for preparation.
1. rename mce.c(i386)
2. delete k7.c, mce.h(i386), non-fatal.c, p4.c and p6.c
3. move mce.h from include/asm-x86_64 to arch/x86_64/kernel

---

 arch/i386/kernel/cpu/mcheck/init.c      |   77 +++++++++
 arch/i386/kernel/cpu/mcheck/k7.c        |   97 -----------
 arch/i386/kernel/cpu/mcheck/mce.c       |   77 ---------
 arch/i386/kernel/cpu/mcheck/mce.h       |   14 -
 arch/i386/kernel/cpu/mcheck/non-fatal.c |   93 ----------
 arch/i386/kernel/cpu/mcheck/p4.c        |  271 --------------------------------
 arch/i386/kernel/cpu/mcheck/p6.c        |  115 -------------
 arch/x86_64/kernel/mce.h                |   80 +++++++++
 include/asm-x86_64/mce.h                |   80 ---------
 9 files changed, 157 insertions(+), 747 deletions(-)
arch/i386/kernel/cpu/mcheck/init.c +77 -0
diff -rNu 2.6.11.10/arch/i386/kernel/cpu/mcheck/init.c 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/init.c
@@ -0,0 +1,77 @@
+/*
+ * mce.c - x86 Machine Check Exception Reporting
+ * (c) 2002 Alan Cox <[email protected]>, Dave Jones <[email protected]>
+ */
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/smp.h>
+#include <linux/thread_info.h>
+
+#include <asm/processor.h> 
+#include <asm/system.h>
+
+#include "mce.h"
+
+int mce_disabled __initdata = 0;
+int nr_mce_banks;
+
+EXPORT_SYMBOL_GPL(nr_mce_banks);	/* non-fatal.o */
+
+/* Handle unconfigured int18 (should never happen) */
+static fastcall void unexpected_machine_check(struct pt_regs * regs, long error_code)
+{	
+	printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
+}
+
+/* Call the installed machine check handler for this CPU setup. */
+void fastcall (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
+
+/* This has to be run for each processor */
+void __init mcheck_init(struct cpuinfo_x86 *c)
+{
+	if (mce_disabled==1)
+		return;
+
+	switch (c->x86_vendor) {
+		case X86_VENDOR_AMD:
+			if (c->x86==6 || c->x86==15)
+				amd_mcheck_init(c);
+			break;
+
+		case X86_VENDOR_INTEL:
+			if (c->x86==5)
+				intel_p5_mcheck_init(c);
+			if (c->x86==6)
+				intel_p6_mcheck_init(c);
+			if (c->x86==15)
+				intel_p4_mcheck_init(c);
+			break;
+
+		case X86_VENDOR_CENTAUR:
+			if (c->x86==5)
+				winchip_mcheck_init(c);
+			break;
+
+		default:
+			break;
+	}
+}
+
+static int __init mcheck_disable(char *str)
+{
+	mce_disabled = 1;
+	return 0;
+}
+
+static int __init mcheck_enable(char *str)
+{
+	mce_disabled = -1;
+	return 0;
+}
+
+__setup("nomce", mcheck_disable);
+__setup("mce", mcheck_enable);
arch/i386/kernel/cpu/mcheck/k7.c +0 -97

97 lines not on this page · raw message

arch/i386/kernel/cpu/mcheck/mce.c +0 -77

77 lines not on this page · raw message

arch/i386/kernel/cpu/mcheck/mce.h +0 -14
diff -rNu 2.6.11.10/arch/i386/kernel/cpu/mcheck/mce.h 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/mce.h
@@ -1,14 +0,0 @@
-#include <linux/init.h>
-
-void amd_mcheck_init(struct cpuinfo_x86 *c);
-void intel_p4_mcheck_init(struct cpuinfo_x86 *c);
-void intel_p5_mcheck_init(struct cpuinfo_x86 *c);
-void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
-void winchip_mcheck_init(struct cpuinfo_x86 *c);
-
-/* Call the installed machine check handler for this CPU setup. */
-extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
-
-extern int mce_disabled __initdata;
-extern int nr_mce_banks;
-
arch/i386/kernel/cpu/mcheck/non-fatal.c +0 -93

93 lines not on this page · raw message

arch/i386/kernel/cpu/mcheck/p4.c +0 -271

271 lines not on this page · raw message

arch/i386/kernel/cpu/mcheck/p6.c +0 -115

115 lines not on this page · raw message

arch/x86_64/kernel/mce.h +80 -0

80 lines not on this page · raw message

include/asm-x86_64/mce.h +0 -80

80 lines not on this page · raw message

author
#1 lore raw

PATCH 2/2 porting lockless mce from x86_64 to i386

Lockless MCE(machine check exception) is ported from x86-64 to i386. This patch is for implementation.

---

 arch/i386/Kconfig                          |   48 ++++++++---------------------
 arch/i386/defconfig                        |    3 -
 arch/i386/kernel/apic.c                    |    6 +--
 arch/i386/kernel/cpu/common.c              |    4 +-
 arch/i386/kernel/cpu/mcheck/Makefile       |    6 ++-
 arch/i386/kernel/cpu/mcheck/init.c         |   40 ++++++------------------
 arch/i386/kernel/cpu/mcheck/p5.c           |    5 ---
 arch/i386/kernel/cpu/mcheck/winchip.c      |    2 -
 arch/x86_64/kernel/mce.c                   |   42 ++++++++++++++++---------
 arch/x86_64/kernel/mce.h                   |   32 +++++++++++--------
 arch/x86_64/kernel/mce_intel.c             |    4 +-
 include/asm-i386/mach-default/entry_arch.h |    2 -
 12 files changed, 86 insertions(+), 108 deletions(-)
arch/i386/defconfig +1 -2
diff -rNu 2.6.11.10-mce-prep/arch/i386/defconfig 2.6.11.10-mce-impl/arch/i386/defconfig
@@ -99,8 +99,7 @@
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=y
-CONFIG_X86_MCE_P4THERMAL=y
+CONFIG_X86_MCE_INTEL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 # CONFIG_MICROCODE is not set
arch/i386/Kconfig +14 -34

55 lines not on this page · raw message

arch/i386/kernel/apic.c +3 -3
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/apic.c 2.6.11.10-mce-impl/arch/i386/kernel/apic.c
@@ -78,7 +78,7 @@
 	set_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
 
 	/* thermal monitor LVT interrupt */
-#ifdef CONFIG_X86_MCE_P4THERMAL
+#ifdef CONFIG_X86_MCE_INTEL
 	set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
 #endif
 }
@@ -157,7 +157,7 @@
 	}
 
 /* lets not touch this if we didn't frob it */
-#ifdef CONFIG_X86_MCE_P4THERMAL
+#ifdef CONFIG_X86_MCE_INTEL
 	if (maxlvt >= 5) {
 		v = apic_read(APIC_LVTTHMR);
 		apic_write_around(APIC_LVTTHMR, v | APIC_LVT_MASKED);
@@ -174,7 +174,7 @@
 	if (maxlvt >= 4)
 		apic_write_around(APIC_LVTPC, APIC_LVT_MASKED);
 
-#ifdef CONFIG_X86_MCE_P4THERMAL
+#ifdef CONFIG_X86_MCE_INTEL
 	if (maxlvt >= 5)
 		apic_write_around(APIC_LVTTHMR, APIC_LVT_MASKED);
 #endif
arch/i386/kernel/cpu/common.c +2 -2
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/cpu/common.c 2.6.11.10-mce-impl/arch/i386/kernel/cpu/common.c
@@ -27,7 +27,7 @@
 
 struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
 
-extern void mcheck_init(struct cpuinfo_x86 *c);
+extern void machine_check_init(struct cpuinfo_x86 *c);
 
 extern int disable_pse;
 
@@ -423,7 +423,7 @@
 
 	/* Init Machine Check Exception if available. */
 #ifdef CONFIG_X86_MCE
-	mcheck_init(c);
+	machine_check_init(c);
 #endif
 }
 /*
arch/i386/kernel/cpu/mcheck/init.c +10 -30
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/init.c 2.6.11.10-mce-impl/arch/i386/kernel/cpu/mcheck/init.c
@@ -14,12 +14,12 @@
 #include <asm/processor.h> 
 #include <asm/system.h>
 
-#include "mce.h"
+extern int __init mce_dont_init;
+extern void __init intel_p5_mcheck_init(struct cpuinfo_x86 *c);
+void __init winchip_mcheck_init(struct cpuinfo_x86 *c);
+void __init mcheck_init(struct cpuinfo_x86 *c);
 
-int mce_disabled __initdata = 0;
-int nr_mce_banks;
-
-EXPORT_SYMBOL_GPL(nr_mce_banks);	/* non-fatal.o */
+fastcall void do_machine_check(struct pt_regs * regs, long error_code);
 
 /* Handle unconfigured int18 (should never happen) */
 static fastcall void unexpected_machine_check(struct pt_regs * regs, long error_code)
@@ -31,24 +31,16 @@
 void fastcall (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
 
 /* This has to be run for each processor */
-void __init mcheck_init(struct cpuinfo_x86 *c)
+void __init machine_check_init(struct cpuinfo_x86 *c)
 {
-	if (mce_disabled==1)
+	if (mce_dont_init)
 		return;
 
 	switch (c->x86_vendor) {
-		case X86_VENDOR_AMD:
-			if (c->x86==6 || c->x86==15)
-				amd_mcheck_init(c);
-			break;
 
 		case X86_VENDOR_INTEL:
 			if (c->x86==5)
 				intel_p5_mcheck_init(c);
-			if (c->x86==6)
-				intel_p6_mcheck_init(c);
-			if (c->x86==15)
-				intel_p4_mcheck_init(c);
 			break;
 
 		case X86_VENDOR_CENTAUR:
@@ -57,21 +49,9 @@
 			break;
 
 		default:
+			machine_check_vector = do_machine_check;
+			wmb();
+			mcheck_init(c);
 			break;
 	}
 }
-
-static int __init mcheck_disable(char *str)
-{
-	mce_disabled = 1;
-	return 0;
-}
-
-static int __init mcheck_enable(char *str)
-{
-	mce_disabled = -1;
-	return 0;
-}
-
-__setup("nomce", mcheck_disable);
-__setup("mce", mcheck_enable);
arch/i386/kernel/cpu/mcheck/Makefile +4 -2
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/Makefile 2.6.11.10-mce-impl/arch/i386/kernel/cpu/mcheck/Makefile
@@ -1,2 +1,4 @@
-obj-y	=	mce.o k7.o p4.o p5.o p6.o winchip.o
-obj-$(CONFIG_X86_MCE_NONFATAL)	+=	non-fatal.o
+obj-y				:= init.o mce.o p5.o winchip.o
+obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o
+mce-y				+= ../../../../x86_64/kernel/mce.o
+mce_intel-y			+= ../../../../x86_64/kernel/mce_intel.o
arch/i386/kernel/cpu/mcheck/p5.c +1 -4
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/p5.c 2.6.11.10-mce-impl/arch/i386/kernel/cpu/mcheck/p5.c
@@ -14,7 +14,7 @@
 #include <asm/system.h>
 #include <asm/msr.h>
 
-#include "mce.h"
+extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
 
 /* Machine check handler for Pentium class Intel */
 static fastcall void pentium_machine_check(struct pt_regs * regs, long error_code)
@@ -37,9 +37,6 @@
 	if( !cpu_has(c, X86_FEATURE_MCE) )
 		return;	
 
-	/* Default P5 to off as its often misconnected */
-	if(mce_disabled != -1)
-		return;
 	machine_check_vector = pentium_machine_check;
 	wmb();
 
arch/i386/kernel/cpu/mcheck/winchip.c +1 -1
diff -rNu 2.6.11.10-mce-prep/arch/i386/kernel/cpu/mcheck/winchip.c 2.6.11.10-mce-impl/arch/i386/kernel/cpu/mcheck/winchip.c
@@ -13,7 +13,7 @@
 #include <asm/system.h>
 #include <asm/msr.h>
 
-#include "mce.h"
+extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
 
 /* Machine check handler for WinChip C6 */
 static fastcall void winchip_machine_check(struct pt_regs * regs, long error_code)
arch/x86_64/kernel/mce.c +28 -14

115 lines not on this page · raw message

arch/x86_64/kernel/mce.h +19 -13
diff -rNu 2.6.11.10-mce-prep/arch/x86_64/kernel/mce.h 2.6.11.10-mce-impl/arch/x86_64/kernel/mce.h
@@ -8,19 +8,20 @@
  * Machine Check support for x86
  */
 
-#define MCG_CTL_P        (1UL<<8)   /* MCG_CAP register available */
+#define MCG_CTL_P        (1ULL<<8)   /* MCG_CAP register available */
+#define MCG_EXT_P        (1ULL<<9)   /* extended MSRs present */
 
-#define MCG_STATUS_RIPV  (1UL<<0)   /* restart ip valid */
-#define MCG_STATUS_EIPV  (1UL<<1)   /* eip points to correct instruction */
-#define MCG_STATUS_MCIP  (1UL<<2)   /* machine check in progress */
-
-#define MCI_STATUS_VAL   (1UL<<63)  /* valid error */
-#define MCI_STATUS_OVER  (1UL<<62)  /* previous errors lost */
-#define MCI_STATUS_UC    (1UL<<61)  /* uncorrected error */
-#define MCI_STATUS_EN    (1UL<<60)  /* error enabled */
-#define MCI_STATUS_MISCV (1UL<<59)  /* misc error reg. valid */
-#define MCI_STATUS_ADDRV (1UL<<58)  /* addr reg. valid */
-#define MCI_STATUS_PCC   (1UL<<57)  /* processor context corrupt */
+#define MCG_STATUS_RIPV  (1ULL<<0)   /* restart ip valid */
+#define MCG_STATUS_EIPV  (1ULL<<1)   /* eip points to correct instruction */
+#define MCG_STATUS_MCIP  (1ULL<<2)   /* machine check in progress */
+
+#define MCI_STATUS_VAL   (1ULL<<63)  /* valid error */
+#define MCI_STATUS_OVER  (1ULL<<62)  /* previous errors lost */
+#define MCI_STATUS_UC    (1ULL<<61)  /* uncorrected error */
+#define MCI_STATUS_EN    (1ULL<<60)  /* error enabled */
+#define MCI_STATUS_MISCV (1ULL<<59)  /* misc error reg. valid */
+#define MCI_STATUS_ADDRV (1ULL<<58)  /* addr reg. valid */
+#define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */
 
 /* Fields are zero when not available */
 struct mce {
@@ -52,7 +53,6 @@
 	unsigned len;  	    /* = MCE_LOG_LEN */ 
 	unsigned next;
 	unsigned flags;
-	unsigned pad0; 
 	struct mce entry[MCE_LOG_LEN];
 };
 
@@ -77,4 +77,10 @@
 }
 #endif
 
+/*Fix Me:copy from include/linux/jiffies.h and modify it*/
+#define time_after64(a,b)         \
+        (typecheck(__u64, a) && \
+         typecheck(__u64, b) && \
+         ((__s64)(b) - (__s64)(a) < 0))
+#define time_before64(a,b)        time_after64(b,a)
 #endif
arch/x86_64/kernel/mce_intel.c +2 -2
diff -rNu 2.6.11.10-mce-prep/arch/x86_64/kernel/mce_intel.c 2.6.11.10-mce-impl/arch/x86_64/kernel/mce_intel.c
@@ -8,12 +8,12 @@
 #include <linux/percpu.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
-#include <asm/mce.h>
 #include <asm/hw_irq.h>
+#include "mce.h"
 
 static DEFINE_PER_CPU(unsigned long, next_check);
 
-asmlinkage void smp_thermal_interrupt(void)
+fastcall void smp_thermal_interrupt(void)
 {
 	struct mce m;
 
include/asm-i386/mach-default/entry_arch.h +1 -1
diff -rNu 2.6.11.10-mce-prep/include/asm-i386/mach-default/entry_arch.h 2.6.11.10-mce-impl/include/asm-i386/mach-default/entry_arch.h
@@ -27,7 +27,7 @@
 BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
 BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
 
-#ifdef CONFIG_X86_MCE_P4THERMAL
+#ifdef CONFIG_X86_MCE_INTEL
 BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
 #endif
 
#2 lore raw
Quoted 2 lines · Guo Racing

Lockless MCE(machine check exception) is ported from x86-64 to i386. This patch is for implementation.

You seem to be missing most of the issues people raise:
perhaps your spamfilter is too eager.

Where is Brice Goglin's #include <asm/apic.h> in mce_intel.c?

i386 machine_check_init misses calling mcheck_init in Intel and Centaur cases, so a lot of the code is largely untested.

You need to avoid the P6 and AMD problems with bank0, as the replaced code did.

I fear there may be more.

Hugh