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

powerpc/32: Manage KUAP in C 



Move all KUAP management in C.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/199365ddb58d579daf724815f2d0acb91cc49d19.1615552867.git.christophe.leroy@csgroup.eu
parent 0b45359a

arch/powerpc/include/asm/book3s/32/kup.h

+1 −49
Original line number Diff line number Diff line
@@ -5,55 +5,7 @@ 
#include <asm/bug.h>

#include <asm/book3s/32/mmu-hash.h>



#ifdef __ASSEMBLY__



#ifdef CONFIG_PPC_KUAP



.macro kuap_update_sr	gpr1, gpr2, gpr3	/* NEVER use r0 as gpr2 due to addis */

101:	mtsrin	\gpr1, \gpr2

	addi	\gpr1, \gpr1, 0x111		/* next VSID */

	rlwinm	\gpr1, \gpr1, 0, 0xf0ffffff	/* clear VSID overflow */

	addis	\gpr2, \gpr2, 0x1000		/* address of next segment */

	cmplw	\gpr2, \gpr3

	blt-	101b

	isync

.endm



.macro kuap_save_and_lock	sp, thread, gpr1, gpr2, gpr3

	lwz	\gpr2, KUAP(\thread)

	rlwinm.	\gpr3, \gpr2, 28, 0xf0000000

	stw	\gpr2, STACK_REGS_KUAP(\sp)

	beq+	102f

	li	\gpr1, 0

	stw	\gpr1, KUAP(\thread)

	mfsrin	\gpr1, \gpr2

	oris	\gpr1, \gpr1, SR_KS@h	/* set Ks */

	kuap_update_sr	\gpr1, \gpr2, \gpr3

102:

.endm



.macro kuap_restore	sp, current, gpr1, gpr2, gpr3

	lwz	\gpr2, STACK_REGS_KUAP(\sp)

	rlwinm.	\gpr3, \gpr2, 28, 0xf0000000

	stw	\gpr2, THREAD + KUAP(\current)

	beq+	102f

	mfsrin	\gpr1, \gpr2

	rlwinm	\gpr1, \gpr1, 0, ~SR_KS	/* Clear Ks */

	kuap_update_sr	\gpr1, \gpr2, \gpr3

102:

.endm



.macro kuap_check	current, gpr

#ifdef CONFIG_PPC_KUAP_DEBUG

	lwz	\gpr, THREAD + KUAP(\current)

999:	twnei	\gpr, 0

	EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE)

#endif

.endm



#endif /* CONFIG_PPC_KUAP */



#else /* !__ASSEMBLY__ */

#ifndef __ASSEMBLY__



#ifdef CONFIG_PPC_KUAP

arch/powerpc/include/asm/interrupt.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup 
	if (user_mode(regs)) {

		kuep_lock();

		account_cpu_user_entry();

	} else {

		kuap_save_and_lock(regs);

	}

#endif

	/*

arch/powerpc/include/asm/kup.h

+0 −9
Original line number Diff line number Diff line
@@ -28,15 +28,6 @@ 


#ifdef __ASSEMBLY__

#ifndef CONFIG_PPC_KUAP

.macro kuap_save_and_lock	sp, thread, gpr1, gpr2, gpr3

.endm



.macro kuap_restore	sp, current, gpr1, gpr2, gpr3

.endm



.macro kuap_check	current, gpr

.endm



.macro kuap_check_amr	gpr1, gpr2

.endm

arch/powerpc/include/asm/nohash/32/kup-8xx.h

+1 −24
Original line number Diff line number Diff line
@@ -7,30 +7,7 @@ 


#ifdef CONFIG_PPC_KUAP



#ifdef __ASSEMBLY__



.macro kuap_save_and_lock	sp, thread, gpr1, gpr2, gpr3

	lis	\gpr2, MD_APG_KUAP@h	/* only APG0 and APG1 are used */

	mfspr	\gpr1, SPRN_MD_AP

	mtspr	SPRN_MD_AP, \gpr2

	stw	\gpr1, STACK_REGS_KUAP(\sp)

.endm



.macro kuap_restore	sp, current, gpr1, gpr2, gpr3

	lwz	\gpr1, STACK_REGS_KUAP(\sp)

	mtspr	SPRN_MD_AP, \gpr1

.endm



.macro kuap_check	current, gpr

#ifdef CONFIG_PPC_KUAP_DEBUG

	mfspr	\gpr, SPRN_MD_AP

	rlwinm	\gpr, \gpr, 16, 0xffff

999:	twnei	\gpr, MD_APG_KUAP@h

	EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE)

#endif

.endm



#else /* !__ASSEMBLY__ */

#ifndef __ASSEMBLY__



#include <asm/reg.h>

arch/powerpc/kernel/entry_32.S

+0 −8
Original line number Diff line number Diff line
@@ -51,10 +51,7 @@ 
#if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)

	.globl	prepare_transfer_to_handler

prepare_transfer_to_handler:

	addi	r12,r2,THREAD



	/* if from kernel, check interrupted DOZE/NAP mode */

	kuap_save_and_lock r11, r12, r9, r5, r6

	lwz	r12,TI_LOCAL_FLAGS(r2)

	mtcrf	0x01,r12

	bt-	31-TLF_NAPPING,4f
@@ -70,7 +67,6 @@ prepare_transfer_to_handler: 
	lwz	r9,_MSR(r11)		/* if sleeping, clear MSR.EE */

	rlwinm	r9,r9,0,~MSR_EE

	lwz	r12,_LINK(r11)		/* and return to address in LR */

	kuap_restore r11, r2, r3, r4, r5

	lwz	r2, GPR2(r11)

	b	fast_exception_return

_ASM_NOKPROBE_SYMBOL(prepare_transfer_to_handler)
@@ -95,7 +91,6 @@ ret_from_syscall: 
	cmplwi	cr0,r5,0

	bne-	2f

#endif /* CONFIG_PPC_47x */

	kuap_check r2, r4

	lwz	r4,_LINK(r1)

	lwz	r5,_CCR(r1)

	mtlr	r4
@@ -207,7 +202,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_SPE) 
	stw	r10,_CCR(r1)

	stw	r1,KSP(r3)	/* Set old stack pointer */



	kuap_check r2, r0

#ifdef CONFIG_SMP

	/* We need a sync somewhere here to make sure that if the

	 * previous task gets rescheduled on another CPU, it sees all
@@ -298,7 +292,6 @@ interrupt_return: 
	bne-	.Lrestore_nvgprs



.Lfast_user_interrupt_return:

	kuap_check r2, r4

	lwz	r11,_NIP(r1)

	lwz	r12,_MSR(r1)

	mtspr	SPRN_SRR0,r11
@@ -347,7 +340,6 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_STCX_CHECKS_ADDRESS) 


.Lfast_kernel_interrupt_return:

	cmpwi	cr1,r3,0

	kuap_restore r1, r2, r3, r4, r5

	lwz	r11,_NIP(r1)

	lwz	r12,_MSR(r1)

	mtspr	SPRN_SRR0,r11