Commit f60ad4ed authored by Mark Rutland's avatar Mark Rutland
Browse files

arm64: clean up irq stack definitions 



Before we add yet another stack to the kernel, it would be nice to
ensure that we consistently organise stack definitions and related
helper functions.

This patch moves the basic IRQ stack defintions to <asm/memory.h> to
live with their task stack counterparts. Helpers used for unwinding are
moved into <asm/stacktrace.h>, where subsequent patches will add helpers
for other stacks. Includes are fixed up accordingly.

This patch is a pure refactoring -- there should be no functional
changes as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
parent dbc9344a

arch/arm64/include/asm/irq.h

+0 −24
Original line number Diff line number Diff line 
#ifndef __ASM_IRQ_H

#define __ASM_IRQ_H



#define IRQ_STACK_SIZE			THREAD_SIZE



#ifndef __ASSEMBLER__



#include <linux/percpu.h>

#include <linux/sched/task_stack.h>



#include <asm-generic/irq.h>

#include <asm/thread_info.h>



struct pt_regs;



DECLARE_PER_CPU(unsigned long [IRQ_STACK_SIZE/sizeof(long)], irq_stack);



extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));



static inline int nr_legacy_irqs(void)
@@ -22,21 +14,5 @@ static inline int nr_legacy_irqs(void) 
	return 0;

}



static inline bool on_irq_stack(unsigned long sp)

{

	unsigned long low = (unsigned long)raw_cpu_ptr(irq_stack);

	unsigned long high = low + IRQ_STACK_SIZE;



	return (low <= sp && sp < high);

}



static inline bool on_task_stack(struct task_struct *tsk, unsigned long sp)

{

	unsigned long low = (unsigned long)task_stack_page(tsk);

	unsigned long high = low + THREAD_SIZE;



	return (low <= sp && sp < high);

}



#endif /* !__ASSEMBLER__ */

#endif

arch/arm64/include/asm/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ 


#define THREAD_SIZE		(UL(1) << THREAD_SHIFT)



#define IRQ_STACK_SIZE		THREAD_SIZE



/*

 * Memory types available.

 */

arch/arm64/include/asm/stacktrace.h

+24 −1
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 
#ifndef __ASM_STACKTRACE_H

#define __ASM_STACKTRACE_H



struct task_struct;

#include <linux/percpu.h>

#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#include <asm/memory.h>

#include <asm/ptrace.h>



struct stackframe {

	unsigned long fp;
@@ -31,4 +36,22 @@ extern void walk_stackframe(struct task_struct *tsk, struct stackframe *frame, 
			    int (*fn)(struct stackframe *, void *), void *data);

extern void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk);



DECLARE_PER_CPU(unsigned long [IRQ_STACK_SIZE/sizeof(long)], irq_stack);



static inline bool on_irq_stack(unsigned long sp)

{

	unsigned long low = (unsigned long)raw_cpu_ptr(irq_stack);

	unsigned long high = low + IRQ_STACK_SIZE;



	return (low <= sp && sp < high);

}



static inline bool on_task_stack(struct task_struct *tsk, unsigned long sp)

{

	unsigned long low = (unsigned long)task_stack_page(tsk);

	unsigned long high = low + THREAD_SIZE;



	return (low <= sp && sp < high);

}



#endif	/* __ASM_STACKTRACE_H */

arch/arm64/kernel/ptrace.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <asm/compat.h>

#include <asm/debug-monitors.h>

#include <asm/pgtable.h>

#include <asm/stacktrace.h>

#include <asm/syscall.h>

#include <asm/traps.h>

#include <asm/system_misc.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE