lkdtm/powerpc: Add SLB multihit test
PATCH v5 1/1 lkdtm/powerpc: Add SLB multihit test
To check machine check handling, add support to inject slb multihit errors.
---
v5:
- Insert entries at SLB_NUM_BOLTED and SLB_NUM_BOLTED +1, remove index allocating helper function.
- Move mk_esid_data and mk_vsid_data helpers to asm/book3s/64/mmu-hash.h.
- Use mmu_linear_psize and mmu_vmalloc_psize to get page size.
- Use !radix_enabled() to check if we are in HASH mode.
- And other minor improvements.
v1-v4:
- No major changes here for this patch, This patch was initially posted along with the other patch which got accepted.
https://git.kernel.org/powerpc/c/8d0e2101274358d9b6b1f27232b40253ca48bab5
--- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 28 +++- arch/powerpc/mm/book3s64/hash_utils.c | 1 + arch/powerpc/mm/book3s64/slb.c | 27 ---- drivers/misc/lkdtm/Makefile | 1 + drivers/misc/lkdtm/core.c | 3 + drivers/misc/lkdtm/lkdtm.h | 3 + drivers/misc/lkdtm/powerpc.c | 120 ++++++++++++++++++ tools/testing/selftests/lkdtm/tests.txt | 1 + 8 files changed, 156 insertions(+), 28 deletions(-) create mode 100644 drivers/misc/lkdtm/powerpc.c
arch/powerpc/include/asm/book3s/64/mmu-hash.h +27 -1
@@ -842,6 +842,32 @@ static inline unsigned long get_kernel_vsid(unsigned long ea, int ssize)unsigned htab_shift_for_mem_size (unsigned long mem_size); -#endif /* __ASSEMBLY__ */ +enum slb_index { +LINEAR_INDEX =0 ,/* Kernel linear map (0xc000000000000000) */ +KSTACK_INDEX =1 ,/* Kernel stack map */ +}; +#define slb_esid_mask (ssize) \ + (((ssize) == MMU_SEGSIZE_256M) ? ESID_MASK : ESID_MASK_1T) + +static inline unsigned long mk_esid_data (unsigned long ea,int ssize, +enum slb_index index) +{ +return (ea &slb_esid_mask (ssize)) |SLB_ESID_V | index; +} + +static inline unsigned long __mk_vsid_data (unsigned long vsid,int ssize, +unsigned long flags) +{ +return (vsid <<slb_vsid_shift (ssize)) | flags | + ((unsigned long )ssize <<SLB_VSID_SSIZE_SHIFT ); +} + +static inline unsigned long mk_vsid_data (unsigned long ea,int ssize, +unsigned long flags) +{ +return __mk_vsid_data (get_kernel_vsid (ea, ssize), ssize, flags); +} + +#endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_MMU_HASH_H_ */
arch/powerpc/mm/book3s64/hash_utils.c +1 -0
@@ -112,6 +112,7 @@ int mmu_linear_psize = MMU_PAGE_4K;EXPORT_SYMBOL_GPL (mmu_linear_psize);int mmu_virtual_psize =MMU_PAGE_4K ;int mmu_vmalloc_psize =MMU_PAGE_4K ; +EXPORT_SYMBOL_GPL (mmu_vmalloc_psize);#ifdef CONFIG_SPARSEMEM_VMEMMAP int mmu_vmemmap_psize =MMU_PAGE_4K ;#endif
arch/powerpc/mm/book3s64/slb.c +0 -27
@@ -28,35 +28,8 @@#include "internal.h" -enum slb_index { -LINEAR_INDEX =0 ,/* Kernel linear map (0xc000000000000000) */ -KSTACK_INDEX =1 ,/* Kernel stack map */ -}; -static long slb_allocate_user (struct mm_struct *mm,unsigned long ea); -#define slb_esid_mask (ssize) \ - (((ssize) == MMU_SEGSIZE_256M)? ESID_MASK: ESID_MASK_1T) - -static inline unsigned long mk_esid_data (unsigned long ea,int ssize, -enum slb_index index) -{ -return (ea &slb_esid_mask (ssize)) |SLB_ESID_V | index; -} - -static inline unsigned long __mk_vsid_data (unsigned long vsid,int ssize, -unsigned long flags) -{ -return (vsid <<slb_vsid_shift (ssize)) | flags | - ((unsigned long ) ssize <<SLB_VSID_SSIZE_SHIFT ); -} - -static inline unsigned long mk_vsid_data (unsigned long ea,int ssize, -unsigned long flags) -{ -return __mk_vsid_data (get_kernel_vsid (ea, ssize), ssize, flags); -} -bool stress_slb_enabled__initdata ;static int __init parse_stress_slb (char *p)
drivers/misc/lkdtm/Makefile +1 -0
@@ -10,6 +10,7 @@ lkdtm-$(CONFIG_LKDTM) += rodata_objcopy.o lkdtm-$(CONFIG_LKDTM) += usercopy.o lkdtm-$(CONFIG_LKDTM) += stackleak.o lkdtm-$(CONFIG_LKDTM) += cfi.o +lkdtm-$(CONFIG_PPC64) += powerpc.o KASAN_SANITIZE_stackleak.o := n KCOV_INSTRUMENT_rodata.o := n
drivers/misc/lkdtm/core.c +3 -0
@@ -176,6 +176,9 @@ static const struct crashtype crashtypes[] = {#ifdef CONFIG_X86_32 CRASHTYPE(DOUBLE_FAULT),#endif +#ifdef CONFIG_PPC64 + CRASHTYPE(PPC_SLB_MULTIHIT), +#endif };
drivers/misc/lkdtm/lkdtm.h +3 -0
@@ -102,4 +102,7 @@ void lkdtm_STACKLEAK_ERASING(void);/* cfi.c */ void lkdtm_CFI_FORWARD_PROTO (void ); +/* powerpc.c */ +void lkdtm_PPC_SLB_MULTIHIT (void ); +#endif
drivers/misc/lkdtm/powerpc.c new file +120 -0
120 lines not on this page · raw message
tools/testing/selftests/lkdtm/tests.txt +1 -0
@@ -68,3 +68,4 @@ USERCOPY_STACK_BEYOND USERCOPY_KERNEL STACKLEAK_ERASING OK: the rest of the thread stack is properly erased CFI_FORWARD_PROTO +PPC_SLB_MULTIHIT Recovered
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 2 lines · Ganesh Goudar
To check machine check handling, add support to inject slb multihit errors.
Applied to powerpc/next.
[1/1] lkdtm/powerpc: Add SLB multihit test
https://git.kernel.org/powerpc/c/3ba150fb21207e4a7f4b600eb2dbbe83f94571fe
cheers