[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1480685957-18809-3-git-send-email-matt.redfearn@imgtec.com>
Date: Fri, 2 Dec 2016 13:39:14 +0000
From: Matt Redfearn <matt.redfearn@...tec.com>
To: Ralf Baechle <ralf@...ux-mips.org>
CC: <linux-mips@...ux-mips.org>,
"Jason A . Donenfeld" <Jason@...c4.com>,
Thomas Gleixner <tglx@...utronix.de>,
Matt Redfearn <matt.redfearn@...tec.com>,
Marcin Nowakowski <marcin.nowakowski@...tec.com>,
"Maciej W. Rozycki" <macro@...tec.com>,
Jiri Slaby <jslaby@...e.cz>,
Chris Metcalf <cmetcalf@...lanox.com>,
<linux-kernel@...r.kernel.org>,
Andrea Gelmini <andrea.gelmini@...ma.net>,
James Hogan <james.hogan@...tec.com>,
Paul Burton <paul.burton@...tec.com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH 2/5] MIPS: Stack unwinding while on IRQ stack
Within unwind stack, check if the stack pointer being unwound is within
the CPU's irq_stack and if so use that page rather than the task's stack
page.
Signed-off-by: Matt Redfearn <matt.redfearn@...tec.com>
---
arch/mips/kernel/process.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 9514e5f2209f..4fdbf7078071 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -33,6 +33,7 @@
#include <asm/dsemul.h>
#include <asm/dsp.h>
#include <asm/fpu.h>
+#include <asm/irq.h>
#include <asm/msa.h>
#include <asm/pgtable.h>
#include <asm/mipsregs.h>
@@ -511,7 +512,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);
unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
unsigned long pc, unsigned long *ra)
{
- unsigned long stack_page = (unsigned long)task_stack_page(task);
+ unsigned long stack_page = 0;
+ int cpu;
+
+ for_each_possible_cpu(cpu) {
+ if (on_irq_stack(cpu, *sp)) {
+ stack_page = (unsigned long)irq_stack[cpu];
+ break;
+ }
+ }
+
+ if (!stack_page)
+ stack_page = (unsigned long)task_stack_page(task);
+
return unwind_stack_by_address(stack_page, sp, pc, ra);
}
#endif
--
2.7.4
Powered by blists - more mailing lists