Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1484832

[tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it

Show all headers | View raw

Commit-ID:  1959a60182f48879635812a03a99c02231ea8677
Gitweb:     http://git.kernel.org/tip/1959a60182f48879635812a03a99c02231ea8677
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 15 Sep 2016 22:45:45 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 16 Sep 2016 09:18:53 +0200

x86/dumpstack: Pin the target stack when dumping it

Specifically, pin the stack in save_stack_trace_tsk() and
show_trace_log_lvl().

This will prevent a crash if the target task dies before or while
dumping its stack once we start freeing task stacks early.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jann Horn <jann@thejh.net>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/cf0082cde65d1941a996d026f2b2cdbfaca17bfa.1474003868.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/dumpstack_32.c | 5 +++++
 arch/x86/kernel/dumpstack_64.c | 5 +++++
 arch/x86/kernel/stacktrace.c   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 2d65cfa..122f37d7 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -163,6 +163,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 	unsigned long *stack;
 	int i;
 
+	if (!try_get_task_stack(task))
+		return;
+
 	sp = sp ? : get_stack_pointer(task, regs);
 
 	stack = sp;
@@ -179,6 +182,8 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 	}
 	pr_cont("\n");
 	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
+
+	put_task_stack(task);
 }
 
 
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 8cb6004..16c0d5f 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -218,6 +218,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 	unsigned long *stack;
 	int i;
 
+	if (!try_get_task_stack(task))
+		return;
+
 	irq_stack_end = (unsigned long *)this_cpu_read(irq_stack_ptr);
 	irq_stack     = irq_stack_end - (IRQ_STACK_SIZE / sizeof(long));
 
@@ -253,6 +256,8 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 
 	pr_cont("\n");
 	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
+
+	put_task_stack(task);
 }
 
 void show_regs(struct pt_regs *regs)
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 785aef1..23fa81e 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -79,9 +79,14 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
 
 void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
 {
+	if (!try_get_task_stack(tsk))
+		return;
+
 	dump_trace(tsk, NULL, NULL, 0, &save_stack_ops_nosched, trace);
 	if (trace->nr_entries < trace->max_entries)
 		trace->entries[trace->nr_entries++] = ULONG_MAX;
+
+	put_task_stack(tsk);
 }
 EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] thread_info cleanups and stack caching Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
  [PATCH v2 1/8] x86/entry/64: Fix a minor comment rebase error Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] x86/entry/64: Fix a minor comment rebase error tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
  [PATCH v2 4/8] x86/dumpstack: Pin the target stack when dumping it Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
      Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 14:00 +0200
        Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 14:30 +0200
          Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Ingo Molnar <mingo@kernel.org> - 2016-09-16 15:00 +0200
            [PATCH] x86/dumpstack: remove NULL task pointer convention Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 15:10 +0200
  [PATCH v2 6/8] lib/syscall: Pin the task stack in collect_syscall() Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] lib/syscall: Pin the task stack in collect_syscall() tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
  [PATCH v2 8/8] fork: Cache two thread stacks per cpu if CONFIG_VMAP_STACK is set Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] fork: Optimize task creation by caching two thread  stacks per CPU if CONFIG_VMAP_STACK=y tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:30 +0200
  [PATCH v2 3/8] kthread: to_live_kthread() needs try_get_task_stack() Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] kthread: Pin the stack via  try_get_task_stack()/put_task_stack() in to_live_kthread() function tip-bot for Oleg Nesterov <tipbot@zytor.com> - 2016-09-16 11:20 +0200

csiph-web