Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1461650
| From | Brian Gerst <brgerst@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 3/7] x86: Add struct inactive_task_frame |
| Date | 2016-08-13 18:40 +0200 |
| Message-ID | <s5K8y-3J2-35@gated-at.bofh.it> (permalink) |
| References | <s5K8x-3J2-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Add struct inactive_task_frame, which defines the layout of the stack for
a sleeping process. For now, the only defined field is the BP register
(frame pointer).
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/stacktrace.h | 4 ++--
arch/x86/include/asm/switch_to.h | 5 +++++
arch/x86/kernel/kgdb.c | 3 ++-
arch/x86/kernel/process.c | 3 ++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index 0944218..7646fb2 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -8,6 +8,7 @@
#include <linux/uaccess.h>
#include <linux/ptrace.h>
+#include <asm/switch_to.h>
extern int kstack_depth_to_print;
@@ -70,8 +71,7 @@ stack_frame(struct task_struct *task, struct pt_regs *regs)
return bp;
}
- /* bp is the last reg pushed by switch_to */
- return *(unsigned long *)task->thread.sp;
+ return ((struct inactive_task_frame *)task->thread.sp)->bp;
}
#else
static inline unsigned long
diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
index 8f321a1..02de86e 100644
--- a/arch/x86/include/asm/switch_to.h
+++ b/arch/x86/include/asm/switch_to.h
@@ -8,6 +8,11 @@ struct tss_struct;
void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,
struct tss_struct *tss);
+/* data that is pointed to by thread.sp */
+struct inactive_task_frame {
+ unsigned long bp;
+};
+
#ifdef CONFIG_X86_32
#ifdef CONFIG_CC_STACKPROTECTOR
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 5e3f294..8e36f24 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -50,6 +50,7 @@
#include <asm/apicdef.h>
#include <asm/apic.h>
#include <asm/nmi.h>
+#include <asm/switch_to.h>
struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =
{
@@ -166,7 +167,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
gdb_regs[GDB_DX] = 0;
gdb_regs[GDB_SI] = 0;
gdb_regs[GDB_DI] = 0;
- gdb_regs[GDB_BP] = *(unsigned long *)p->thread.sp;
+ gdb_regs[GDB_BP] = ((struct inactive_task_frame *)p->thread.sp)->bp;
#ifdef CONFIG_X86_32
gdb_regs[GDB_DS] = __KERNEL_DS;
gdb_regs[GDB_ES] = __KERNEL_DS;
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 62c0b0e..0115a4a 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -32,6 +32,7 @@
#include <asm/tlbflush.h>
#include <asm/mce.h>
#include <asm/vm86.h>
+#include <asm/switch_to.h>
/*
* per-CPU TSS segments. Threads are completely 'soft' on Linux,
@@ -556,7 +557,7 @@ unsigned long get_wchan(struct task_struct *p)
if (sp < bottom || sp > top)
return 0;
- fp = READ_ONCE_NOCHECK(*(unsigned long *)sp);
+ fp = READ_ONCE_NOCHECK(((struct inactive_task_frame *)sp)->bp);
do {
if (fp < bottom || fp > top)
return 0;
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/7] x86: Rewrite switch_to() Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:40 +0200
[PATCH v3 1/7] x86-32, kgdb: Don't use thread.ip in sleeping_thread_to_gdb_regs() Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:40 +0200
[tip:x86/asm] sched/x86/32, kgdb: Don't use thread.ip in sleeping_thread_to_gdb_regs() tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:50 +0200
[PATCH v3 7/7] Revert "sched: Mark __schedule() stack frame as non-standard" Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:40 +0200
[tip:x86/asm] sched: Remove __schedule() non-standard frame annotation tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:50 +0200
[PATCH v3 2/7] x86-64, kgdb: clear GDB_PS on 64-bit Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:40 +0200
[tip:x86/asm] sched/x86/64, kgdb: Clear GDB_PS on 64-bit tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:50 +0200
[PATCH v3 3/7] x86: Add struct inactive_task_frame Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:40 +0200
[tip:x86/asm] sched/x86: Add 'struct inactive_task_frame' to better document the sleeping task stack frame tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:20 +0200
[PATCH v3 4/7] x86: Rewrite switch_to() code Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:50 +0200
[tip:x86/asm] sched/x86: Rewrite the switch_to() code tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:20 +0200
[PATCH v3 6/7] x86: Fix thread_saved_pc() Brian Gerst <brgerst@gmail.com> - 2016-08-13 18:50 +0200
[tip:x86/asm] sched/x86: Fix thread_saved_pc() tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-08-24 15:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-13 19:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Ingo Molnar <mingo@kernel.org> - 2016-08-14 10:30 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Andy Lutomirski <luto@amacapital.net> - 2016-08-14 13:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Herbert Xu <herbert@gondor.apana.org.au> - 2016-08-17 07:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Brian Gerst <brgerst@gmail.com> - 2016-08-14 16:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Ingo Molnar <mingo@kernel.org> - 2016-08-15 07:20 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Brian Gerst <brgerst@gmail.com> - 2016-08-15 13:50 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Andy Lutomirski <luto@amacapital.net> - 2016-08-17 23:30 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Brian Gerst <brgerst@gmail.com> - 2016-08-14 12:30 +0200
Re: [PATCH v3 0/7] x86: Rewrite switch_to() Josh Poimboeuf <jpoimboe@redhat.com> - 2016-08-17 23:30 +0200
csiph-web