Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b5e212a3051b65e426a513901d9c7001681c7215

Authored by Andy Lutomirski
Committed by Thomas Gleixner
1 parent 70b61e3621
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

x86, syscall: Fix _TIF_NOHZ handling in syscall_trace_enter_phase1 

TIF_NOHZ is 19 (i.e. _TIF_SYSCALL_TRACE | _TIF_NOTIFY_RESUME |
_TIF_SINGLESTEP), not (1<<19).

This code is involved in Dave's trinity lockup, but I don't see why
it would cause any of the problems he's seeing, except inadvertently
by causing a different path through entry_64.S's syscall handling.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/a6cd3b60a3f53afb6e1c8081b0ec30ff19003dd7.1416434075.git.luto@amacapital.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/kernel/ptrace.c
Diff comments   View file @ b5e212a
... ... @@ -1484,7 +1484,7 @@
1484 1484 */
1485 1485 if (work & _TIF_NOHZ) {
1486 1486 user_exit();
1487   - work &= ~TIF_NOHZ;
  1487 + work &= ~_TIF_NOHZ;
1488 1488 }
1489 1489  
1490 1490 #ifdef CONFIG_SECCOMP