x86: Reset the debug_stack update counter

Steven Rostedt · rostedt · commit c0525a6972d3 · 2012-05-31T23:12:20.000-04:00
When an NMI goes off and it sees that it preempted the debug stack,
to keep the debug stack safe, it changes the IDT to point to one that
does not modify the stack on breakpoint (to allow breakpoints in NMIs).

But the variable that gets set to know to undo it on exit never gets
cleared on exit. Thus every NMI will reset it on exit the first time
it is done even if it does not need to be reset.

[ Added H. Peter Anvin's suggestion to use this_cpu_read/write ]

Cc: &lt;stable@vger.kernel.org&gt; # v3.3
Signed-off-by: Steven Rostedt &lt;rostedt@goodmis.org&gt;
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
@@ -444,14 +444,16 @@ static inline void nmi_nesting_preprocess(struct pt_regs *regs)
 	 */
 	if (unlikely(is_debug_stack(regs->sp))) {
 		debug_stack_set_zero();
-		__get_cpu_var(update_debug_stack) = 1;
+		this_cpu_write(update_debug_stack, 1);
 	}
 }
 
 static inline void nmi_nesting_postprocess(void)
 {
-	if (unlikely(__get_cpu_var(update_debug_stack)))
+	if (unlikely(this_cpu_read(update_debug_stack))) {
 		debug_stack_reset();
+		this_cpu_write(update_debug_stack, 0);
+	}
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -444,14 +444,16 @@ static inline void nmi_nesting_preprocess(struct pt_regs *regs)`
`444`	`444`	`*/`
`445`	`445`	`if (unlikely(is_debug_stack(regs->sp))) {`
`446`	`446`	`debug_stack_set_zero();`
`447`		`- __get_cpu_var(update_debug_stack) = 1;`
	`447`	`+ this_cpu_write(update_debug_stack, 1);`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`static inline void nmi_nesting_postprocess(void)`
`452`	`452`	`{`
`453`		`- if (unlikely(__get_cpu_var(update_debug_stack)))`
	`453`	`+ if (unlikely(this_cpu_read(update_debug_stack))) {`
`454`	`454`	`debug_stack_reset();`
	`455`	`+ this_cpu_write(update_debug_stack, 0);`
	`456`	`+ }`
`455`	`457`	`}`
`456`	`458`	`#endif`
`457`	`459`