Skip to contentSkip to conversation

MIPS: Build uasm-generated code only once to avoid CPU Hotplug problem

PATCH In review Huacai Chen 2 participants 4 messages Mar 17, 2013 – Mar 22, 2013 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 MIPS: Build uasm-generated code only once to avoid CPU Hotplug problem

This and the next patch resolve memory corruption problems while CPU hotplug. Without these patches, memory corruption can triggered easily as below:

On a quad-core MIPS platform, use "spawn" of UnixBench-5.1.3 (http://
code.google.com/p/byte-unixbench/) and a CPU hotplug script like this (hotplug.sh):
while true; do
echo 0 >/sys/devices/system/cpu/cpu1/online
echo 0 >/sys/devices/system/cpu/cpu2/online
echo 0 >/sys/devices/system/cpu/cpu3/online
sleep 1
echo 1 >/sys/devices/system/cpu/cpu1/online
echo 1 >/sys/devices/system/cpu/cpu2/online
echo 1 >/sys/devices/system/cpu/cpu3/online
sleep 1
done

Run "hotplug.sh" and then run "spawn 10000", spawn will get segfault after a few minutes.

This patch:
Currently, clear_page()/copy_page() are generated by Micro-assembler dynamically. But they are unavailable until uasm_resolve_relocs() has finished because jump labels are illegal before that. Since these functions are shared by every CPU, we only call build_clear_page()/ build_copy_page() only once at boot time. Without this patch, programs will get random memory corruption (segmentation fault, bus error, etc.) while CPU Hotplug (e.g. one CPU is using clear_page() while another is generating it in cpu_cache_init()).

For similar reasons we modify build_tlb_refill_handler()'s invocation.

V2:
1, Rework the code to make CPU#0 can be online/offline.
2, Introduce cpu_has_local_ebase feature since some types of MIPS CPU
need a per-CPU tlb_refill_handler().

---
 arch/mips/include/asm/cpu-features.h               |    3 +++
 .../asm/mach-loongson/cpu-feature-overrides.h      |    1 +
 arch/mips/mm/page.c                                |   10 ++++++++++
 arch/mips/mm/tlbex.c                               |   10 ++++++++--
 4 files changed, 22 insertions(+), 2 deletions(-)
arch/mips/include/asm/cpu-features.h +3 -0
index 1a57e8b..e5ec8fc 100644
@@ -113,6 +113,9 @@
 #ifndef cpu_has_pindexed_dcache
 #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
 #endif
+#ifndef cpu_has_local_ebase
+#define cpu_has_local_ebase	1
+#endif
 
 /*
  * I-Cache snoops remote store.	 This only matters on SMP.  Some multiprocessors
arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +1 -0
index 75fd8c0..c0f3ef4 100644
@@ -57,5 +57,6 @@
 #define cpu_has_vint		0
 #define cpu_has_vtag_icache	0
 #define cpu_has_watch		1
+#define cpu_has_local_ebase	0
 
 #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */
arch/mips/mm/page.c +10 -0
index a29fba5..4eb8dcf 100644
@@ -247,6 +247,11 @@ void __cpuinit build_clear_page(void)
 	struct uasm_label *l = labels;
 	struct uasm_reloc *r = relocs;
 	int i;
+	static atomic_t run_once = ATOMIC_INIT(0);
+
+	if (atomic_xchg(&run_once, 1)) {
+		return;
+	}
 
 	memset(labels, 0, sizeof(labels));
 	memset(relocs, 0, sizeof(relocs));
@@ -389,6 +394,11 @@ void __cpuinit build_copy_page(void)
 	struct uasm_label *l = labels;
 	struct uasm_reloc *r = relocs;
 	int i;
+	static atomic_t run_once = ATOMIC_INIT(0);
+
+	if (atomic_xchg(&run_once, 1)) {
+		return;
+	}
 
 	memset(labels, 0, sizeof(labels));
 	memset(relocs, 0, sizeof(relocs));
arch/mips/mm/tlbex.c +8 -2
index 820e661..6bc28b4 100644
@@ -2162,8 +2162,11 @@ void __cpuinit build_tlb_refill_handler(void)
 	case CPU_TX3922:
 	case CPU_TX3927:
 #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
-		build_r3000_tlb_refill_handler();
+		if (cpu_has_local_ebase)
+			build_r3000_tlb_refill_handler();
 		if (!run_once) {
+			if (!cpu_has_local_ebase)
+				build_r3000_tlb_refill_handler();
 			build_r3000_tlb_load_handler();
 			build_r3000_tlb_store_handler();
 			build_r3000_tlb_modify_handler();
@@ -2192,9 +2195,12 @@ void __cpuinit build_tlb_refill_handler(void)
 			build_r4000_tlb_load_handler();
 			build_r4000_tlb_store_handler();
 			build_r4000_tlb_modify_handler();
+			if (!cpu_has_local_ebase)
+				build_r4000_tlb_refill_handler();
 			run_once++;
 		}
-		build_r4000_tlb_refill_handler();
+		if (cpu_has_local_ebase)
+			build_r4000_tlb_refill_handler();
 	}
 }
 
Signature · 1 line
1.7.7.3
Acked-by on v2 1/2
#1 lore raw
Quoted 33 lines · Huacai Chen

This and the next patch resolve memory corruption problems while CPU hotplug. Without these patches, memory corruption can triggered easily as below:

On a quad-core MIPS platform, use "spawn" of UnixBench-5.1.3 (http://
code.google.com/p/byte-unixbench/) and a CPU hotplug script like this (hotplug.sh):
while true; do
echo 0 >/sys/devices/system/cpu/cpu1/online
echo 0 >/sys/devices/system/cpu/cpu2/online
echo 0 >/sys/devices/system/cpu/cpu3/online
sleep 1
echo 1 >/sys/devices/system/cpu/cpu1/online
echo 1 >/sys/devices/system/cpu/cpu2/online
echo 1 >/sys/devices/system/cpu/cpu3/online
sleep 1
done

Run "hotplug.sh" and then run "spawn 10000", spawn will get segfault after a few minutes.

This patch:
Currently, clear_page()/copy_page() are generated by Micro-assembler dynamically. But they are unavailable until uasm_resolve_relocs() has finished because jump labels are illegal before that. Since these functions are shared by every CPU, we only call build_clear_page()/ build_copy_page() only once at boot time. Without this patch, programs will get random memory corruption (segmentation fault, bus error, etc.) while CPU Hotplug (e.g. one CPU is using clear_page() while another is generating it in cpu_cache_init()).

For similar reasons we modify build_tlb_refill_handler()'s invocation.

Quoted 7 lines

V2:
1, Rework the code to make CPU#0 can be online/offline.
2, Introduce cpu_has_local_ebase feature since some types of MIPS CPU
need a per-CPU tlb_refill_handler().

We were seeing the same crashes, this patch set seems to fix the problem.

Quoted 92 lines
---
  arch/mips/include/asm/cpu-features.h               |    3 +++
  .../asm/mach-loongson/cpu-feature-overrides.h      |    1 +
  arch/mips/mm/page.c                                |   10 ++++++++++
  arch/mips/mm/tlbex.c                               |   10 ++++++++--
  4 files changed, 22 insertions(+), 2 deletions(-)
arch/mips/include/asm/cpu-features.h +3 -0
index 1a57e8b..e5ec8fc 100644
@@ -113,6 +113,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
  #endif
+#ifndef cpu_has_local_ebase
+#define cpu_has_local_ebase	1
+#endif
 
  /*
   * I-Cache snoops remote store.	 This only matters on SMP.  Some multiprocessors
arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +1 -0
index 75fd8c0..c0f3ef4 100644
@@ -57,5 +57,6 @@
  #define cpu_has_vint		0
  #define cpu_has_vtag_icache	0
  #define cpu_has_watch		1
+#define cpu_has_local_ebase	0
 
  #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */
arch/mips/mm/page.c +10 -0
index a29fba5..4eb8dcf 100644
@@ -247,6 +247,11 @@ void __cpuinit build_clear_page(void)
  	struct uasm_label *l = labels;
  	struct uasm_reloc *r = relocs;
  	int i;
+	static atomic_t run_once = ATOMIC_INIT(0);
+
+	if (atomic_xchg(&run_once, 1)) {
+		return;
+	}
 
  	memset(labels, 0, sizeof(labels));
  	memset(relocs, 0, sizeof(relocs));
@@ -389,6 +394,11 @@ void __cpuinit build_copy_page(void)
  	struct uasm_label *l = labels;
  	struct uasm_reloc *r = relocs;
  	int i;
+	static atomic_t run_once = ATOMIC_INIT(0);
+
+	if (atomic_xchg(&run_once, 1)) {
+		return;
+	}
 
  	memset(labels, 0, sizeof(labels));
  	memset(relocs, 0, sizeof(relocs));
arch/mips/mm/tlbex.c +8 -2
index 820e661..6bc28b4 100644
@@ -2162,8 +2162,11 @@ void __cpuinit build_tlb_refill_handler(void)
  	case CPU_TX3922:
  	case CPU_TX3927:
  #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
-		build_r3000_tlb_refill_handler();
+		if (cpu_has_local_ebase)
+			build_r3000_tlb_refill_handler();
  		if (!run_once) {
+			if (!cpu_has_local_ebase)
+				build_r3000_tlb_refill_handler();
  			build_r3000_tlb_load_handler();
  			build_r3000_tlb_store_handler();
  			build_r3000_tlb_modify_handler();
@@ -2192,9 +2195,12 @@ void __cpuinit build_tlb_refill_handler(void)
  			build_r4000_tlb_load_handler();
  			build_r4000_tlb_store_handler();
  			build_r4000_tlb_modify_handler();
+			if (!cpu_has_local_ebase)
+				build_r4000_tlb_refill_handler();
  			run_once++;
  		}
-		build_r4000_tlb_refill_handler();
+		if (cpu_has_local_ebase)
+			build_r4000_tlb_refill_handler();
  	}
  }
 
#2 lore raw
Quoted 5 lines · David Daney
Quoted 4 lines · Huacai Chen

This and the next patch resolve memory corruption problems while CPU hotplug. Without these patches, memory corruption can triggered easily as below:

[...]

Quoted 4 lines

We were seeing the same crashes, this patch set seems to fix the problem.

On second thought...

Quoted 8 lines
Quoted 8 lines
---
  arch/mips/include/asm/cpu-features.h               |    3 +++
  .../asm/mach-loongson/cpu-feature-overrides.h      |    1 +
  arch/mips/mm/page.c                                |   10 ++++++++++
  arch/mips/mm/tlbex.c                               |   10 ++++++++--
  4 files changed, 22 insertions(+), 2 deletions(-)
Quoted 12 lines

arch/mips/include/asm/cpu-features.h line 118

Quoted 12 lines
arch/mips/include/asm/cpu-features.h +2 -0
index 1a57e8b..e5ec8fc 100644
@@ -113,6 +113,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags &
 MIPS_CACHE_PINDEX)
  #endif
+#ifndef cpu_has_local_ebase
+#define cpu_has_local_ebase    1

This really should default to 0 and only be set for (??who knows what??).

David Daney

Quoted 79 lines
Quoted 78 lines
arch/mips/include/asm/cpu-features.h +1 -0
+#endif
 
  /*

* I-Cache snoops remote store. This only matters on SMP. Some
multiprocessors
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h index 75fd8c0..c0f3ef4 100644

arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +1 -0
@@ -57,5 +57,6 @@
  #define cpu_has_vint        0
  #define cpu_has_vtag_icache    0
  #define cpu_has_watch        1
+#define cpu_has_local_ebase    0
 
  #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */
arch/mips/mm/page.c +10 -0
index a29fba5..4eb8dcf 100644
@@ -247,6 +247,11 @@ void __cpuinit build_clear_page(void)
      struct uasm_label *l = labels;
      struct uasm_reloc *r = relocs;
      int i;
+    static atomic_t run_once = ATOMIC_INIT(0);
+
+    if (atomic_xchg(&run_once, 1)) {
+        return;
+    }
 
      memset(labels, 0, sizeof(labels));
      memset(relocs, 0, sizeof(relocs));
@@ -389,6 +394,11 @@ void __cpuinit build_copy_page(void)
      struct uasm_label *l = labels;
      struct uasm_reloc *r = relocs;
      int i;
+    static atomic_t run_once = ATOMIC_INIT(0);
+
+    if (atomic_xchg(&run_once, 1)) {
+        return;
+    }
 
      memset(labels, 0, sizeof(labels));
      memset(relocs, 0, sizeof(relocs));
arch/mips/mm/tlbex.c +8 -2
index 820e661..6bc28b4 100644
@@ -2162,8 +2162,11 @@ void __cpuinit build_tlb_refill_handler(void)
      case CPU_TX3922:
      case CPU_TX3927:
  #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
-        build_r3000_tlb_refill_handler();
+        if (cpu_has_local_ebase)
+            build_r3000_tlb_refill_handler();
          if (!run_once) {
+            if (!cpu_has_local_ebase)
+                build_r3000_tlb_refill_handler();
              build_r3000_tlb_load_handler();
              build_r3000_tlb_store_handler();
              build_r3000_tlb_modify_handler();
@@ -2192,9 +2195,12 @@ void __cpuinit build_tlb_refill_handler(void)
              build_r4000_tlb_load_handler();
              build_r4000_tlb_store_handler();
              build_r4000_tlb_modify_handler();
+            if (!cpu_has_local_ebase)
+                build_r4000_tlb_refill_handler();
              run_once++;
          }
-        build_r4000_tlb_refill_handler();
+        if (cpu_has_local_ebase)
+            build_r4000_tlb_refill_handler();
      }
  }
 
#3 lore raw
Quoted 28 lines · David Daney
Quoted 7 lines · David Daney
Quoted 5 lines · Huacai Chen

This and the next patch resolve memory corruption problems while CPU hotplug. Without these patches, memory corruption can triggered easily as below:

[...]

Quoted 4 lines

We were seeing the same crashes, this patch set seems to fix the problem.

On second thought...

Quoted 8 lines
Quoted 8 lines
---
  arch/mips/include/asm/cpu-features.h               |    3 +++
  .../asm/mach-loongson/cpu-feature-overrides.h      |    1 +
  arch/mips/mm/page.c                                |   10 ++++++++++
  arch/mips/mm/tlbex.c                               |   10 ++++++++--
  4 files changed, 22 insertions(+), 2 deletions(-)
Quoted 16 lines
Quoted 4 lines
Quoted 4 lines
arch/mips/include/asm/cpu-features.h +0 -1
index 1a57e8b..e5ec8fc 100644
--- a/arch/mips/include/asm/cpu-features.h
Quoted 8 lines

arch/mips/include/asm/cpu-features.h line 118

Quoted 8 lines

+++ b/arch/mips/include/asm/cpu-features.h

arch/mips/include/asm/cpu-features.h +2 -0
@@ -113,6 +113,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags &
 MIPS_CACHE_PINDEX)
  #endif
+#ifndef cpu_has_local_ebase
+#define cpu_has_local_ebase    1

This really should default to 0 and only be set for (??who knows what??).

The original code before this patch assume all MIPS has a local ebase. To minimize the modification, we default it to 1 (but I don't know which CPU has local ebase).

Quoted 86 lines

David Daney

Quoted 79 lines
Quoted 78 lines
arch/mips/include/asm/cpu-features.h +1 -0
+#endif
 
  /*

* I-Cache snoops remote store. This only matters on SMP. Some
multiprocessors
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h index 75fd8c0..c0f3ef4 100644

arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +1 -0
@@ -57,5 +57,6 @@
  #define cpu_has_vint        0
  #define cpu_has_vtag_icache    0
  #define cpu_has_watch        1
+#define cpu_has_local_ebase    0
 
  #endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */
arch/mips/mm/page.c +10 -0
index a29fba5..4eb8dcf 100644
@@ -247,6 +247,11 @@ void __cpuinit build_clear_page(void)
      struct uasm_label *l = labels;
      struct uasm_reloc *r = relocs;
      int i;
+    static atomic_t run_once = ATOMIC_INIT(0);
+
+    if (atomic_xchg(&run_once, 1)) {
+        return;
+    }
 
      memset(labels, 0, sizeof(labels));
      memset(relocs, 0, sizeof(relocs));
@@ -389,6 +394,11 @@ void __cpuinit build_copy_page(void)
      struct uasm_label *l = labels;
      struct uasm_reloc *r = relocs;
      int i;
+    static atomic_t run_once = ATOMIC_INIT(0);
+
+    if (atomic_xchg(&run_once, 1)) {
+        return;
+    }
 
      memset(labels, 0, sizeof(labels));
      memset(relocs, 0, sizeof(relocs));
arch/mips/mm/tlbex.c +8 -2
index 820e661..6bc28b4 100644
@@ -2162,8 +2162,11 @@ void __cpuinit build_tlb_refill_handler(void)
      case CPU_TX3922:
      case CPU_TX3927:
  #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
-        build_r3000_tlb_refill_handler();
+        if (cpu_has_local_ebase)
+            build_r3000_tlb_refill_handler();
          if (!run_once) {
+            if (!cpu_has_local_ebase)
+                build_r3000_tlb_refill_handler();
              build_r3000_tlb_load_handler();
              build_r3000_tlb_store_handler();
              build_r3000_tlb_modify_handler();
@@ -2192,9 +2195,12 @@ void __cpuinit build_tlb_refill_handler(void)
              build_r4000_tlb_load_handler();
              build_r4000_tlb_store_handler();
              build_r4000_tlb_modify_handler();
+            if (!cpu_has_local_ebase)
+                build_r4000_tlb_refill_handler();
              run_once++;
          }
-        build_r4000_tlb_refill_handler();
+        if (cpu_has_local_ebase)
+            build_r4000_tlb_refill_handler();
      }
  }