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

Commit 2edb16ef authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32: Add KASAN support 



This patch adds KASAN support for PPC32. The following patch
will add an early activation of hash table for book3s. Until
then, a warning will be raised if trying to use KASAN on an
hash 6xx.

To support KASAN, this patch initialises that MMU mapings for
accessing to the KASAN shadow area defined in a previous patch.

An early mapping is set as soon as the kernel code has been
relocated at its definitive place.

Then the definitive mapping is set once paging is initialised.

For modules, the shadow area is allocated at module_alloc().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f072015c

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ config PPC 
	select GENERIC_TIME_VSYSCALL

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_KASAN			if PPC32

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT

arch/powerpc/include/asm/kasan.h

+9 −0
Original line number Diff line number Diff line
@@ -27,5 +27,14 @@ 


#define KASAN_SHADOW_SIZE	(KASAN_SHADOW_END - KASAN_SHADOW_START)



#ifdef CONFIG_KASAN

void kasan_early_init(void);

void kasan_mmu_init(void);

void kasan_init(void);

#else

static inline void kasan_init(void) { }

static inline void kasan_mmu_init(void) { }

#endif



#endif /* __ASSEMBLY */

#endif

arch/powerpc/kernel/head_32.S

+3 −0
Original line number Diff line number Diff line
@@ -969,6 +969,9 @@ start_here: 
 * Do early platform-specific initialization,

 * and set up the MMU.

 */

#ifdef CONFIG_KASAN

	bl	kasan_early_init

#endif

	li	r3,0

	mr	r4,r31

	bl	machine_init

arch/powerpc/kernel/head_40x.S

+3 −0
Original line number Diff line number Diff line
@@ -848,6 +848,9 @@ start_here: 
/*

 * Decide what sort of machine this is and initialize the MMU.

 */

#ifdef CONFIG_KASAN

	bl	kasan_early_init

#endif

	li	r3,0

	mr	r4,r31

	bl	machine_init

arch/powerpc/kernel/head_44x.S

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ _ENTRY(_start); 
/*

 * Decide what sort of machine this is and initialize the MMU.

 */

#ifdef CONFIG_KASAN

	bl	kasan_early_init

#endif

	li	r3,0

	mr	r4,r31

	bl	machine_init