Commit 3ba150fb authored by Ganesh Goudar's avatar Ganesh Goudar Committed by Michael Ellerman
Browse files

lkdtm/powerpc: Add SLB multihit test 



To check machine check handling, add support to inject slb
multihit errors.

Co-developed-by: default avatarMahesh Salgaonkar <mahesh@linux.ibm.com>
Signed-off-by: default avatarMahesh Salgaonkar <mahesh@linux.ibm.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@linux.ibm.com>
[mpe: Use CONFIG_PPC_BOOK3S_64 to fix compile errors reported by lkp@intel.com]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201130083057.135610-1-ganeshgr@linux.ibm.com
parent 6c58b1b4

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+27 −1
Original line number Diff line number Diff line
@@ -843,6 +843,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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_PPC_BOOK3S_64)	+= powerpc.o



KASAN_SANITIZE_stackleak.o	:= n

KCOV_INSTRUMENT_rodata.o	:= n

drivers/misc/lkdtm/core.c

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ static const struct crashtype crashtypes[] = { 
#ifdef CONFIG_X86_32

	CRASHTYPE(DOUBLE_FAULT),

#endif

#ifdef CONFIG_PPC_BOOK3S_64

	CRASHTYPE(PPC_SLB_MULTIHIT),

#endif

};