x86/mm, tracing: Fix CR2 corruption
Despite the current efforts to read CR2 before tracing happens there still exist a number of possible holes: idtentry page_fault do_page_fault has_error_code=1 call error_entry TRACE_IRQS_OFF call trace_hardirqs_off* #PF // modifies CR2 CALL_enter_from_user_mode __context_tracking_exit() trace_user_exit(0) #PF // modifies CR2 call do_page_fault address = read_cr2(); /* whoopsie */ And similar for i386. Fix it by pulling the CR2 read into the entry code, before any of that stuff gets a chance to run and ruin things. Reported-by:He Zhe <zhe.he@windriver.com> Reported-by:
Eiichi Tsukata <devel@etsukata.com> Signed-off-by:
Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by:
Thomas Gleixner <tglx@linutronix.de> Reviewed-by:
Andy Lutomirski <luto@kernel.org> Cc: bp@alien8.de Cc: rostedt@goodmis.org Cc: torvalds@linux-foundation.org Cc: hpa@zytor.com Cc: dave.hansen@linux.intel.com Cc: jgross@suse.com Cc: joel@joelfernandes.org Link: https://lkml.kernel.org/r/20190711114336.116812491@infradead.org Debugged-by:
Steven Rostedt <rostedt@goodmis.org>
Showing
- arch/x86/entry/entry_32.S 22 additions, 3 deletionsarch/x86/entry/entry_32.S
- arch/x86/entry/entry_64.S 18 additions, 17 deletionsarch/x86/entry/entry_64.S
- arch/x86/include/asm/kvm_para.h 1 addition, 1 deletionarch/x86/include/asm/kvm_para.h
- arch/x86/include/asm/traps.h 2 additions, 2 deletionsarch/x86/include/asm/traps.h
- arch/x86/kernel/kvm.c 4 additions, 4 deletionsarch/x86/kernel/kvm.c
- arch/x86/kernel/traps.c 1 addition, 5 deletionsarch/x86/kernel/traps.c
- arch/x86/mm/fault.c 11 additions, 19 deletionsarch/x86/mm/fault.c
Loading
Please register or sign in to comment