瀏覽代碼

x86: clean up stack overflow debug check

Impact: cleanup

Simplify the irq-sampled stack overflow debug check:

 - eliminate an #idef

 - use WARN_ONCE() to emit a single warning (all bets are off
   after the first such warning anyway)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 16 年之前
父節點
當前提交
f377fa123d
共有 1 個文件被更改,包括 10 次插入15 次删除
  1. 10 15
      arch/x86/kernel/irq_64.c

+ 10 - 15
arch/x86/kernel/irq_64.c

@@ -18,7 +18,6 @@
 #include <asm/idle.h>
 #include <asm/idle.h>
 #include <asm/smp.h>
 #include <asm/smp.h>
 
 
-#ifdef CONFIG_DEBUG_STACKOVERFLOW
 /*
 /*
  * Probabilistic stack overflow check:
  * Probabilistic stack overflow check:
  *
  *
@@ -28,20 +27,18 @@
  */
  */
 static inline void stack_overflow_check(struct pt_regs *regs)
 static inline void stack_overflow_check(struct pt_regs *regs)
 {
 {
+#ifdef CONFIG_DEBUG_STACKOVERFLOW
 	u64 curbase = (u64)task_stack_page(current);
 	u64 curbase = (u64)task_stack_page(current);
-	static unsigned long warned = INITIAL_JIFFIES - 60*HZ;
-
-	if (regs->sp >= curbase && regs->sp <= curbase + THREAD_SIZE &&
-			regs->sp < curbase + sizeof(struct thread_info) +
-			sizeof(struct pt_regs) + 128 &&
-			time_after(jiffies, warned + 60*HZ)) {
-		printk("do_IRQ: %s near stack overflow (cur:%Lx,sp:%lx)\n",
-		       current->comm, curbase, regs->sp);
-		show_stack(NULL,NULL);
-		warned = jiffies;
-	}
-}
+
+	WARN_ONCE(regs->sp >= curbase &&
+		  regs->sp <= curbase + THREAD_SIZE &&
+		  regs->sp <  curbase + sizeof(struct thread_info) +
+					sizeof(struct pt_regs) + 128,
+
+		  "do_IRQ: %s near stack overflow (cur:%Lx,sp:%lx)\n",
+			current->comm, curbase, regs->sp);
 #endif
 #endif
+}
 
 
 /*
 /*
  * do_IRQ handles all normal device IRQ's (the special
  * do_IRQ handles all normal device IRQ's (the special
@@ -61,9 +58,7 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
 	irq_enter();
 	irq_enter();
 	irq = __get_cpu_var(vector_irq)[vector];
 	irq = __get_cpu_var(vector_irq)[vector];
 
 
-#ifdef CONFIG_DEBUG_STACKOVERFLOW
 	stack_overflow_check(regs);
 	stack_overflow_check(regs);
-#endif
 
 
 	desc = irq_to_desc(irq);
 	desc = irq_to_desc(irq);
 	if (likely(desc))
 	if (likely(desc))