Commit 8ae06d22 authored Mar 05, 2010 by Shaohua Li Committed by H. Peter Anvin Mar 30, 2010

x86-32, resume: do a global tlb flush in S4 resume



Colin King reported a strange oops in S4 resume code path (see below). The test
system has i5/i7 CPU. The kernel doesn't open PAE, so 4M page table is used.
The oops always happen a virtual address 0xc03ff000, which is mapped to the
last 4k of first 4M memory. Doing a global tlb flush fixes the issue.

EIP: 0060:[<c0493a01>] EFLAGS: 00010086 CPU: 0
EIP is at copy_loop+0xe/0x15
EAX: 36aeb000 EBX: 00000000 ECX: 00000400 EDX: f55ad46c
ESI: 0f800000 EDI: c03ff000 EBP: f67fbec4 ESP: f67fbea8
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
...
...
CR2: 00000000c03ff000

Tested-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
LKML-Reference: <20100305005932.GA22675@sli10-desk.sh.intel.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: <stable@kernel.org>

parent eed63519

arch/x86/power/hibernate_asm_32.S

+7 −8

Original line number	Diff line number	Diff line
		@@ -27,10 +27,17 @@ ENTRY(swsusp_arch_suspend)
		ret

		ENTRY(restore_image)
		movl mmu_cr4_features, %ecx
		movl resume_pg_dir, %eax
		subl $__PAGE_OFFSET, %eax
		movl %eax, %cr3

		jecxz 1f # cr4 Pentium and higher, skip if zero
		andl $~(X86_CR4_PGE), %ecx
		movl %ecx, %cr4; # turn off PGE
		movl %cr3, %eax; # flush TLB
		movl %eax, %cr3
		1:
		movl restore_pblist, %edx
		.p2align 4,,7

		@@ -54,16 +61,8 @@ done:
		movl $swapper_pg_dir, %eax
		subl $__PAGE_OFFSET, %eax
		movl %eax, %cr3
		/* Flush TLB, including "global" things (vmalloc) */
		movl mmu_cr4_features, %ecx
		jecxz 1f # cr4 Pentium and higher, skip if zero
		movl %ecx, %edx
		andl $~(X86_CR4_PGE), %edx
		movl %edx, %cr4; # turn off PGE
		1:
		movl %cr3, %eax; # flush TLB
		movl %eax, %cr3
		jecxz 1f # cr4 Pentium and higher, skip if zero
		movl %ecx, %cr4; # turn PGE back on
		1: