| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Dave Hansen <dave.hansen@linux.intel.com> |
| Date: Wed, 9 May 2018 10:13:42 -0700 |
| Subject: x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal |
| |
| From: Dave Hansen <dave.hansen@linux.intel.com> |
| |
| [ Upstream commit a50093d60464dd51d1ae0c2267b0abe9e1de77f3 ] |
| |
| There is some noisy debug code at the end of the signal handler. It was |
| disabled by an early, unconditional "return". However, that return also |
| hid a dprint_in_signal=0, which kept dprint_in_signal=1 and effectively |
| locked us into permanent dprint_in_signal=1 behavior. |
| |
| Remove the return and the dead code, fixing dprint_in_signal. |
| |
| Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> |
| Cc: Andrew Morton <akpm@linux-foundation.org> |
| Cc: Dave Hansen <dave.hansen@intel.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Michael Ellermen <mpe@ellerman.id.au> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Ram Pai <linuxram@us.ibm.com> |
| Cc: Shuah Khan <shuah@kernel.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: linux-mm@kvack.org |
| Link: http://lkml.kernel.org/r/20180509171342.846B9B2E@viggo.jf.intel.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/x86/protection_keys.c | 16 ---------------- |
| 1 file changed, 16 deletions(-) |
| |
| --- a/tools/testing/selftests/x86/protection_keys.c |
| +++ b/tools/testing/selftests/x86/protection_keys.c |
| @@ -325,22 +325,6 @@ void signal_handler(int signum, siginfo_ |
| dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n"); |
| pkru_faults++; |
| dprintf1("<<<<==================================================\n"); |
| - return; |
| - if (trapno == 14) { |
| - fprintf(stderr, |
| - "ERROR: In signal handler, page fault, trapno = %d, ip = %016lx\n", |
| - trapno, ip); |
| - fprintf(stderr, "si_addr %p\n", si->si_addr); |
| - fprintf(stderr, "REG_ERR: %lx\n", |
| - (unsigned long)uctxt->uc_mcontext.gregs[REG_ERR]); |
| - exit(1); |
| - } else { |
| - fprintf(stderr, "unexpected trap %d! at 0x%lx\n", trapno, ip); |
| - fprintf(stderr, "si_addr %p\n", si->si_addr); |
| - fprintf(stderr, "REG_ERR: %lx\n", |
| - (unsigned long)uctxt->uc_mcontext.gregs[REG_ERR]); |
| - exit(2); |
| - } |
| dprint_in_signal = 0; |
| } |
| |