KASAN for nohash PPC32
v2 cover KASAN for nohash PPC32
This serie adds KASAN support to nohash PPC32
Tested on 8xx
Changes in v2:
- Rebased.
- Using __set_pte_at() to build the early table.
- Worked around and got rid of the patch adding asm/page.h in asm/pgtable-types.h
==> might be fixed independently but needed for this serie.
In principle, this should also work on the 603. For now I have not been able to boot, it stops before early console is active, so I'm quite blind at the moment and don't really know what's wrong. Any idea ?
For hash32 (not 603), it cannot work as is because due to HASHPTE flag, we can't use the same pagetable for several PGD entries.
Christophe Leroy (3):
powerpc/mm: prepare kernel for KAsan on PPC32 powerpc/32: Move early_init() in a separate file powerpc/nohash32: Add KASAN support
arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/kasan.h | 22 +++++++++ arch/powerpc/include/asm/nohash/32/pgtable.h | 2 + arch/powerpc/include/asm/ppc_asm.h | 5 ++ arch/powerpc/include/asm/setup.h | 5 ++ arch/powerpc/include/asm/string.h | 14 ++++++ arch/powerpc/kernel/Makefile | 5 +- arch/powerpc/kernel/cputable.c | 4 +- arch/powerpc/kernel/early_32.c | 35 +++++++++++++ arch/powerpc/kernel/setup-common.c | 2 + arch/powerpc/kernel/setup_32.c | 31 ++---------- arch/powerpc/lib/Makefile | 2 + arch/powerpc/lib/copy_32.S | 9 ++-- arch/powerpc/mm/Makefile | 3 ++ arch/powerpc/mm/dump_linuxpagetables.c | 8 +++ arch/powerpc/mm/kasan_init.c | 73 ++++++++++++++++++++++++++++ arch/powerpc/mm/mem.c | 4 ++ 17 files changed, 191 insertions(+), 34 deletions(-) create mode 100644 arch/powerpc/include/asm/kasan.h create mode 100644 arch/powerpc/kernel/early_32.c create mode 100644 arch/powerpc/mm/kasan_init.c
Signature · 1 line
2.13.3
RFC PATCH v2 1/3 powerpc/mm: prepare kernel for KAsan on PPC32
In kernel/cputable.c, explicitly use memcpy() in order to allow GCC to replace it with __memcpy() when KASAN is selected.
Since commit 400c47d81ca38 ("powerpc32: memset: only use dcbz once cache is enabled"), memset() can be used before activation of the cache, so no need to use memset_io() for zeroing the BSS.
--- arch/powerpc/kernel/cputable.c | 4 ++-- arch/powerpc/kernel/setup_32.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)
arch/powerpc/kernel/cputable.c +2 -2
@@ -2145,7 +2145,7 @@ void __init set_cur_cpu_spec(struct cpu_spec *s)struct cpu_spec *t = &the_cpu_spec; t =PTRRELOC (t); - *t = *s; +memcpy (t, s,sizeof (*t)); *PTRRELOC (&cur_cpu_spec) = &the_cpu_spec; }
@@ -2160,7 +2160,7 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset, old = *t;/* Copy everything, then do fixups */ - *t = *s; +memcpy (t, s,sizeof (*t));/* * If we are overriding a previous value derived from the real
arch/powerpc/kernel/setup_32.c +2 -4
@@ -74,10 +74,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr) {unsigned long offset =reloc_offset (); -/* First zero the BSS -- use memset_io, some platforms don't have -* caches on yet */ -memset_io ((void __iomem *)PTRRELOC (&__bss_start),0 , - __bss_stop - __bss_start); +/* First zero the BSS */ +memset (PTRRELOC (&__bss_start),0 , __bss_stop - __bss_start);/* * Identify the CPU type and fix up code sections
Signature · 1 line
2.13.3
RFC PATCH v2 2/3 powerpc/32: Move early_init() in a separate file
In reply to Christophe LeroyIn preparation of KASAN, move early_init() into a separate file in order to allow deactivation of KASAN for that function.
--- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/early_32.c | 35 +++++++++++++++++++++++++++++++++++ arch/powerpc/kernel/setup_32.c | 26 -------------------------- 3 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 arch/powerpc/kernel/early_32.c
arch/powerpc/kernel/Makefile +1 -1
@@ -93,7 +93,7 @@ extra-y += vmlinux.lds obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o -obj-$(CONFIG_PPC32) += entry_32.o setup_32.o +obj-$(CONFIG_PPC32) += entry_32.o setup_32.o early_32.o obj-$(CONFIG_PPC64) += dma-iommu.o iommu.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_BOOTX_TEXT) += btext.o
arch/powerpc/kernel/early_32.c new file +35 -0
@@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* +* Early init before relocation +*/ + +#include <linux/init.h> +#include <linux/kernel.h> +#include <asm/setup.h> +#include <asm/sections.h> + +/* +* We're called here very early in the boot. +* +* Note that the kernel may be running at an address which is different +* from the address that it was linked at, so we must use RELOC/PTRRELOC +* to access static data (including strings). -- paulus +*/ +notrace unsigned long __init early_init (unsigned long dt_ptr) +{ +unsigned long offset =reloc_offset (); + +/* First zero the BSS */ +memset (PTRRELOC (&__bss_start),0 , __bss_stop - __bss_start); + +/* +* Identify the CPU type and fix up code sections +* that depend on which cpu we have. +*/ +identify_cpu (offset,mfspr (SPRN_PVR )); + +apply_feature_fixups (); + +return KERNELBASE + offset; +}
arch/powerpc/kernel/setup_32.c +0 -26
@@ -64,32 +64,6 @@ EXPORT_SYMBOL(DMA_MODE_READ);EXPORT_SYMBOL (DMA_MODE_WRITE );/* -* We're called here very early in the boot. -* -* Note that the kernel may be running at an address which is different -* from the address that it was linked at, so we must use RELOC/PTRRELOC -* to access static data (including strings). -- paulus -*/ -notrace unsigned long __init early_init (unsigned long dt_ptr) -{ -unsigned long offset =reloc_offset (); - -/* First zero the BSS */ -memset (PTRRELOC (&__bss_start),0 , __bss_stop - __bss_start); - -/* -* Identify the CPU type and fix up code sections -* that depend on which cpu we have. -*/ -identify_cpu (offset,mfspr (SPRN_PVR )); - -apply_feature_fixups (); - -return KERNELBASE + offset; -} - - -/* * This is run before start_kernel(), the kernel has been relocated * and we are running with enough of the MMU enabled to have our * proper kernel virtual addresses
Signature · 1 line
2.13.3
RFC PATCH v2 3/3 powerpc/nohash32: Add KASAN support
In reply to Christophe LeroyThis patch adds KASAN support for nohash PPC32.
--- arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/kasan.h | 22 +++++++++ arch/powerpc/include/asm/nohash/32/pgtable.h | 2 + arch/powerpc/include/asm/ppc_asm.h | 5 ++ arch/powerpc/include/asm/setup.h | 5 ++ arch/powerpc/include/asm/string.h | 14 ++++++ arch/powerpc/kernel/Makefile | 3 ++ arch/powerpc/kernel/setup-common.c | 2 + arch/powerpc/kernel/setup_32.c | 3 ++ arch/powerpc/lib/Makefile | 2 + arch/powerpc/lib/copy_32.S | 9 ++-- arch/powerpc/mm/Makefile | 3 ++ arch/powerpc/mm/dump_linuxpagetables.c | 8 +++ arch/powerpc/mm/kasan_init.c | 73 ++++++++++++++++++++++++++++ arch/powerpc/mm/mem.c | 4 ++ 15 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 arch/powerpc/include/asm/kasan.h create mode 100644 arch/powerpc/mm/kasan_init.c
arch/powerpc/Kconfig +1 -0
@@ -174,6 +174,7 @@ config PPC select GENERIC_TIME_VSYSCALL select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_KASAN if PPC32 && PPC_MMU_NOHASH 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 new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_H +#define __ASM_KASAN_H + +#ifndef __ASSEMBLY__ + +#include <asm/page.h> +#include <asm/pgtable-types.h> +#include <asm/fixmap.h> + +#define KASAN_SHADOW_SCALE_SHIFT 3 +#define KASAN_SHADOW_SIZE ((~0UL - PAGE_OFFSET + 1) >> KASAN_SHADOW_SCALE_SHIFT) + +#define KASAN_SHADOW_START (ALIGN_DOWN(FIXADDR_START - KASAN_SHADOW_SIZE, PGDIR_SIZE)) +#define KASAN_SHADOW_END (KASAN_SHADOW_START + KASAN_SHADOW_SIZE) +#define KASAN_SHADOW_OFFSET (KASAN_SHADOW_START - (PAGE_OFFSET >> KASAN_SHADOW_SCALE_SHIFT)) + +void kasan_early_init (void ); +void kasan_init (void ); + +#endif +#endif
arch/powerpc/include/asm/nohash/32/pgtable.h +2 -0
@@ -71,6 +71,8 @@ extern int icache_44x_need_flush;*/ #ifdef CONFIG_HIGHMEM #define KVIRT_TOP PKMAP_BASE +#elif defined(CONFIG_KASAN ) +#define KVIRT_TOP KASAN_SHADOW_START#else #define KVIRT_TOP (0xfe000000UL)/* for now, could be FIXMAP_BASE ? */ #endif
arch/powerpc/include/asm/ppc_asm.h +5 -0
@@ -251,6 +251,11 @@ GLUE(.,name):#define _GLOBAL_TOC (name) _GLOBAL(name) +#define KASAN_OVERRIDE (x, y) \ + .weak x; \ + .set x, y + +#endif /*
arch/powerpc/include/asm/setup.h +5 -0
@@ -67,6 +67,11 @@ void do_barrier_nospec_fixups_range(bool enable, void *start, void *end);static inline void do_barrier_nospec_fixups_range (bool enable,void *start,void *end) { };#endif +#ifndef CONFIG_KASAN +static inline void kasan_early_init (void ) { } +static inline void kasan_init (void ) { } +#endif +#endif /* !__ASSEMBLY__ */ #endif /* _ASM_POWERPC_SETUP_H */
arch/powerpc/include/asm/string.h +14 -0
@@ -27,6 +27,20 @@ extern int memcmp(const void *,const void *,__kernel_size_t);extern void *memchr (const void *,int ,__kernel_size_t );extern void *memcpy_flushcache (void *,const void *,__kernel_size_t ); +void *__memset (void *,int ,__kernel_size_t ); +void *__memcpy (void *,const void *,__kernel_size_t ); +void *__memmove (void *,const void *,__kernel_size_t ); + +#if defined(CONFIG_KASAN ) && !defined(__SANITIZE_ADDRESS__) +/* +* For files that are not instrumented (e.g. mm/slub.c) we +* should use not instrumented version of mem* functions. +*/ +#define memcpy (dst, src, len) __memcpy(dst, src, len) +#define memmove (dst, src, len) __memmove(dst, src, len) +#define memset (s, c, n) __memset(s, c, n) +#endif +#ifdef CONFIG_PPC64 #define __HAVE_ARCH_MEMSET32#define __HAVE_ARCH_MEMSET64
arch/powerpc/kernel/Makefile +3 -0
@@ -31,6 +31,9 @@ CFLAGS_REMOVE_btext.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_prom.o = $(CC_FLAGS_FTRACE) endif +KASAN_SANITIZE_early_32.o := n +KASAN_SANITIZE_cputable.o := n + obj-y := cputable.o ptrace.o syscalls.o \ irq.o align.o signal_32.o pmc.o vdso.o \ process.o systbl.o idle.o \
arch/powerpc/kernel/setup-common.c +2 -0
@@ -977,6 +977,8 @@ void __init setup_arch(char **cmdline_p)paging_init (); +kasan_init (); +/* Initialize the MMU context management stuff. */ mmu_context_init ();
arch/powerpc/kernel/setup_32.c +3 -0
@@ -17,6 +17,7 @@#include <linux/console.h> #include <linux/memblock.h> #include <linux/export.h> +#include <linux/kasan.h> #include <asm/io.h> #include <asm/prom.h>
@@ -77,6 +78,8 @@ notrace void __init machine_init(u64 dt_ptr) patch__memset_nocache);unsigned long insn; +kasan_early_init (); +/* Configure static keys first, now that we're relocated. */ setup_feature_keys ();
arch/powerpc/lib/Makefile +2 -0
@@ -8,6 +8,8 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) CFLAGS_REMOVE_code-patching.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_feature-fixups.o = $(CC_FLAGS_FTRACE) +KASAN_SANITIZE_feature-fixups.o := n + obj-y += string.o alloc.o code-patching.o feature-fixups.o obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o strlen_32.o
arch/powerpc/lib/copy_32.S +6 -3
@@ -91,7 +91,8 @@ EXPORT_SYMBOL(memset16) * We therefore skip the optimised bloc that uses dcbz. This jump is * replaced by a nop once cache is active. This is done in machine_init() */ -_GLOBAL(memset) +_GLOBAL(__memset) +KASAN_OVERRIDE(memset, __memset) cmplwi 0,r5,4 blt 7f
@@ -163,12 +164,14 @@ EXPORT_SYMBOL(memset) * We therefore jump to generic_memcpy which doesn't use dcbz. This jump is * replaced by a nop once cache is active. This is done in machine_init() */ -_GLOBAL(memmove) +_GLOBAL(__memmove) +KASAN_OVERRIDE(memmove, __memmove) cmplw 0,r3,r4 bgt backwards_memcpy /* fall through */ -_GLOBAL(memcpy) +_GLOBAL(__memcpy) +KASAN_OVERRIDE(memcpy, __memcpy) 1: b generic_memcpy patch_site 1b, patch__memcpy_nocache
arch/powerpc/mm/Makefile +3 -0
@@ -7,6 +7,8 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) +KASAN_SANITIZE_kasan_init.o := n + obj-y := fault.o mem.o pgtable.o mmap.o \ init_$(BITS).o pgtable_$(BITS).o \ init-common.o mmu_context.o drmem.o
@@ -55,3 +57,4 @@ obj-$(CONFIG_PPC_BOOK3S_64) += dump_linuxpagetables-book3s64.o endif obj-$(CONFIG_PPC_HTDUMP) += dump_hashpagetable.o obj-$(CONFIG_PPC_MEM_KEYS) += pkeys.o +obj-$(CONFIG_KASAN) += kasan_init.o
arch/powerpc/mm/dump_linuxpagetables.c +8 -0
@@ -94,6 +94,10 @@ static struct addr_marker address_markers[] = { { 0, "Consistent mem start" }, { 0, "Consistent mem end" }, #endif +#ifdef CONFIG_KASAN + { 0, "kasan shadow mem start" }, + { 0, "kasan shadow mem end" }, +#endif #ifdef CONFIG_HIGHMEM { 0, "Highmem PTEs start" }, { 0, "Highmem PTEs end" },
@@ -310,6 +314,10 @@ static void populate_markers(void) address_markers[i++].start_address =IOREMAP_TOP +CONFIG_CONSISTENT_SIZE ;#endif +#ifdef CONFIG_KASAN + address_markers[i++].start_address =KASAN_SHADOW_START ; + address_markers[i++].start_address =KASAN_SHADOW_END ; +#endif #ifdef CONFIG_HIGHMEM address_markers[i++].start_address =PKMAP_BASE ; address_markers[i++].start_address =PKMAP_ADDR (LAST_PKMAP );
arch/powerpc/mm/kasan_init.c new file +73 -0
73 lines not on this page · raw message
arch/powerpc/mm/mem.c +4 -0
@@ -381,6 +381,10 @@ void __init mem_init(void)pr_info (" * 0x%08lx..0x%08lx : highmem PTEs\n" ,PKMAP_BASE ,PKMAP_ADDR (LAST_PKMAP ));#endif /* CONFIG_HIGHMEM */ +#ifdef CONFIG_KASAN +pr_info (" * 0x%08lx..0x%08lx : kasan shadow mem\n" , +KASAN_SHADOW_START ,KASAN_SHADOW_END ); +#endif #ifdef CONFIG_NOT_COHERENT_CACHE pr_info (" * 0x%08lx..0x%08lx : consistent mem\n" ,IOREMAP_TOP ,IOREMAP_TOP +CONFIG_CONSISTENT_SIZE );
Signature · 1 line
2.13.3