Skip to content

Commit

Permalink
scs: Move DEFINE_SCS macro into core code
Browse files Browse the repository at this point in the history
Defining static shadow call stacks is not architecture-specific, so move
the DEFINE_SCS() macro into the core header file.

Tested-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
  • Loading branch information
Will Deacon committed May 18, 2020
1 parent aa7a65a commit 871e100
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 0 additions & 4 deletions arch/arm64/kernel/scs.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
#include <linux/percpu.h>
#include <linux/scs.h>

/* Allocate a static per-CPU shadow stack */
#define DEFINE_SCS(name) \
DEFINE_PER_CPU(unsigned long [SCS_SIZE/sizeof(long)], name) \

DEFINE_SCS(irq_shadow_call_stack);

#ifdef CONFIG_ARM_SDE_INTERFACE
Expand Down
4 changes: 4 additions & 0 deletions include/linux/scs.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
/* An illegal pointer value to mark the end of the shadow stack. */
#define SCS_END_MAGIC (0x5f6UL + POISON_POINTER_DELTA)

/* Allocate a static per-CPU shadow stack */
#define DEFINE_SCS(name) \
DEFINE_PER_CPU(unsigned long [SCS_SIZE/sizeof(long)], name) \

#define task_scs(tsk) (task_thread_info(tsk)->scs_base)
#define task_scs_sp(tsk) (task_thread_info(tsk)->scs_sp)

Expand Down

0 comments on commit 871e100

Please sign in to comment.