Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33636535 authored by Matt Redfearn's avatar Matt Redfearn Committed by Greg Kroah-Hartman
Browse files

MIPS: Stack unwinding while on IRQ stack 



commit d42d8d106b0275b027c1e8992c42aecf933436ea upstream.

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: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Acked-by: default avatarJason A. Donenfeld <jason@zx2c4.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
Cc: Maciej W. Rozycki <macro@imgtec.com>
Cc: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14741/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8b8b552

arch/mips/kernel/process.c

+14 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/cpu.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>
@@ -552,7 +553,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