[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1473947349-14521-7-git-send-email-mark.rutland@arm.com>
Date: Thu, 15 Sep 2016 14:49:07 +0100
From: Mark Rutland <mark.rutland@....com>
To: linux-arm-kernel@...ts.infradead.org
Cc: akpm@...ux-foundation.org,
ard.biesheuvel@...aro.org,
catalin.marinas@....com,
james.morse@....com,
keescook@...omium.org,
linux-kernel@...r.kernel.org,
lorenzo.pieralisi@....com,
luto@...nel.org,
mark.rutland@....com,
suzuki.poulose@....com,
takahiro.akashi@...aro.org,
will.deacon@....com,
kernel-hardening@...ts.openwall.com
Subject: [RFC PATCH 6/8] arm64: traps: use task_struct instead of thread_info
In arm64's die and __die routines we pass around a thread_info, and
subsequently use this to determine either the relevant task_struct, or
the end of the thread's stack. This will shortly become problematic when
we move the thread_info out of the thread's stack.
Instead, pass around the task_struct, and use the new end_of_stack
helper, which will work regardless of where thread_info is located.
Signed-off-by: Mark Rutland <mark.rutland@....com>
Cc: Catalin Marinas <catalin.marinas@....com>
Cc: Will Deacon <will.deacon@....com>
---
arch/arm64/kernel/traps.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index e04f838..e9409a9 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -227,10 +227,9 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
#endif
#define S_SMP " SMP"
-static int __die(const char *str, int err, struct thread_info *thread,
+static int __die(const char *str, int err, struct task_struct *tsk,
struct pt_regs *regs)
{
- struct task_struct *tsk = thread->task;
static int die_counter;
int ret;
@@ -245,7 +244,8 @@ static int __die(const char *str, int err, struct thread_info *thread,
print_modules();
__show_regs(regs);
pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk),
+ end_of_stack(tsk));
if (!user_mode(regs)) {
dump_mem(KERN_EMERG, "Stack: ", regs->sp,
@@ -264,7 +264,7 @@ static DEFINE_RAW_SPINLOCK(die_lock);
*/
void die(const char *str, struct pt_regs *regs, int err)
{
- struct thread_info *thread = current_thread_info();
+ struct task_struct *tsk = current;
int ret;
oops_enter();
@@ -272,9 +272,9 @@ void die(const char *str, struct pt_regs *regs, int err)
raw_spin_lock_irq(&die_lock);
console_verbose();
bust_spinlocks(1);
- ret = __die(str, err, thread, regs);
+ ret = __die(str, err, tsk, regs);
- if (regs && kexec_should_crash(thread->task))
+ if (regs && kexec_should_crash(tsk))
crash_kexec(regs);
bust_spinlocks(0);
--
1.9.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
