浏览代码

[PATCH] kdump: NMI handler segment selector, stack pointer fix

CPU does not save ss and esp on stack if execution was already in kernel mode
at the time of NMI occurrence.  This leads to saving of erractic values for ss
and esp.  This patch fixes the issue.

Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Vivek Goyal 20 年之前
父节点
当前提交
4d55476c3f
共有 1 个文件被更改,包括 13 次插入0 次删除
  1. 13 0
      arch/i386/kernel/crash.c

+ 13 - 0
arch/i386/kernel/crash.c

@@ -112,7 +112,20 @@ static atomic_t waiting_for_crash_ipi;
 
 
 static int crash_nmi_callback(struct pt_regs *regs, int cpu)
 static int crash_nmi_callback(struct pt_regs *regs, int cpu)
 {
 {
+	struct pt_regs fixed_regs;
 	local_irq_disable();
 	local_irq_disable();
+
+	/* CPU does not save ss and esp on stack if execution is already
+	 * running in kernel mode at the time of NMI occurrence. This code
+	 * fixes it.
+	 */
+	if (!user_mode(regs)) {
+		memcpy(&fixed_regs, regs, sizeof(*regs));
+		fixed_regs.esp = (unsigned long)&(regs->esp);
+		__asm__ __volatile__("xorl %eax, %eax;");
+		__asm__ __volatile__ ("movw %%ss, %%ax;" :"=a"(fixed_regs.xss));
+		regs = &fixed_regs;
+	}
 	crash_save_this_cpu(regs, cpu);
 	crash_save_this_cpu(regs, cpu);
 	disable_local_APIC();
 	disable_local_APIC();
 	atomic_dec(&waiting_for_crash_ipi);
 	atomic_dec(&waiting_for_crash_ipi);