From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, npiggin@gmail.com, msuchanek@suse.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 15/22] powerpc/32: Remove verification of MSR_PR on syscall in the ASM entry Date: Mon, 8 Feb 2021 15:10:34 +0000 (UTC) [thread overview] Message-ID: <1eddb42cb12092b1e3d72608d182c365db3da41d.1612796617.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1612796617.git.christophe.leroy@csgroup.eu> system_call_exception() checks MSR_PR and BUGs if a syscall is issued from kernel mode. No need to handle it anymore from the ASM entry code. null_syscall reduction 2 cycles (348 => 346 cycles) Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/entry_32.S | 30 ------------------------------ arch/powerpc/kernel/head_32.h | 3 --- arch/powerpc/kernel/head_booke.h | 3 --- 3 files changed, 36 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index bbf7ecea6fe0..cffe58e63356 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -421,36 +421,6 @@ ret_from_kernel_thread: li r3,0 b ret_from_syscall - /* - * System call was called from kernel. We get here with SRR1 in r9. - * Mark the exception as recoverable once we have retrieved SRR0, - * trap a warning and return ENOSYS with CR[SO] set. - */ - .globl ret_from_kernel_syscall -ret_from_kernel_syscall: - mfspr r9, SPRN_SRR0 - mfspr r10, SPRN_SRR1 -#if !defined(CONFIG_4xx) && !defined(CONFIG_BOOKE) - LOAD_REG_IMMEDIATE(r11, MSR_KERNEL & ~(MSR_IR|MSR_DR)) - mtmsr r11 -#endif - -0: trap - EMIT_BUG_ENTRY 0b,__FILE__,__LINE__, BUGFLAG_WARNING - - li r3, ENOSYS - crset so -#if defined(CONFIG_PPC_8xx) && defined(CONFIG_PERF_EVENTS) - mtspr SPRN_NRI, r0 -#endif - mtspr SPRN_SRR0, r9 - mtspr SPRN_SRR1, r10 - rfi -#ifdef CONFIG_40x - b . /* Prevent prefetch past rfi */ -#endif -_ASM_NOKPROBE_SYMBOL(ret_from_kernel_syscall) - /* * Top-level page fault handling. * This is in assembler because if do_page_fault tells us that diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h index fea7fe00a690..282d8fd443a9 100644 --- a/arch/powerpc/kernel/head_32.h +++ b/arch/powerpc/kernel/head_32.h @@ -118,8 +118,6 @@ .macro SYSCALL_ENTRY trapno mfspr r9, SPRN_SRR1 mfspr r10, SPRN_SRR0 - andi. r11, r9, MSR_PR - beq- 99f LOAD_REG_IMMEDIATE(r11, MSR_KERNEL) /* can take exceptions */ lis r12, 1f@h ori r12, r12, 1f@l @@ -174,7 +172,6 @@ 3: #endif b transfer_to_syscall /* jump to handler */ -99: b ret_from_kernel_syscall .endm .macro save_dar_dsisr_on_stack reg1, reg2, sp diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index db931f1167aa..bfbd240cc8a2 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -106,10 +106,8 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) #endif mfspr r9, SPRN_SRR1 BOOKE_CLEAR_BTB(r11) - andi. r11, r9, MSR_PR lwz r11, TASK_STACK - THREAD(r10) rlwinm r12,r12,0,4,2 /* Clear SO bit in CR */ - beq- 99f ALLOC_STACK_FRAME(r11, THREAD_SIZE - INT_FRAME_SIZE) stw r12, _CCR(r11) /* save various registers */ mflr r12 @@ -155,7 +153,6 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) 3: b transfer_to_syscall /* jump to handler */ -99: b ret_from_kernel_syscall .endm /* To handle the additional exception priority levels on 40x and Book-E -- 2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, npiggin@gmail.com, msuchanek@suse.de Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 15/22] powerpc/32: Remove verification of MSR_PR on syscall in the ASM entry Date: Mon, 8 Feb 2021 15:10:34 +0000 (UTC) [thread overview] Message-ID: <1eddb42cb12092b1e3d72608d182c365db3da41d.1612796617.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1612796617.git.christophe.leroy@csgroup.eu> system_call_exception() checks MSR_PR and BUGs if a syscall is issued from kernel mode. No need to handle it anymore from the ASM entry code. null_syscall reduction 2 cycles (348 => 346 cycles) Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/entry_32.S | 30 ------------------------------ arch/powerpc/kernel/head_32.h | 3 --- arch/powerpc/kernel/head_booke.h | 3 --- 3 files changed, 36 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index bbf7ecea6fe0..cffe58e63356 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -421,36 +421,6 @@ ret_from_kernel_thread: li r3,0 b ret_from_syscall - /* - * System call was called from kernel. We get here with SRR1 in r9. - * Mark the exception as recoverable once we have retrieved SRR0, - * trap a warning and return ENOSYS with CR[SO] set. - */ - .globl ret_from_kernel_syscall -ret_from_kernel_syscall: - mfspr r9, SPRN_SRR0 - mfspr r10, SPRN_SRR1 -#if !defined(CONFIG_4xx) && !defined(CONFIG_BOOKE) - LOAD_REG_IMMEDIATE(r11, MSR_KERNEL & ~(MSR_IR|MSR_DR)) - mtmsr r11 -#endif - -0: trap - EMIT_BUG_ENTRY 0b,__FILE__,__LINE__, BUGFLAG_WARNING - - li r3, ENOSYS - crset so -#if defined(CONFIG_PPC_8xx) && defined(CONFIG_PERF_EVENTS) - mtspr SPRN_NRI, r0 -#endif - mtspr SPRN_SRR0, r9 - mtspr SPRN_SRR1, r10 - rfi -#ifdef CONFIG_40x - b . /* Prevent prefetch past rfi */ -#endif -_ASM_NOKPROBE_SYMBOL(ret_from_kernel_syscall) - /* * Top-level page fault handling. * This is in assembler because if do_page_fault tells us that diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h index fea7fe00a690..282d8fd443a9 100644 --- a/arch/powerpc/kernel/head_32.h +++ b/arch/powerpc/kernel/head_32.h @@ -118,8 +118,6 @@ .macro SYSCALL_ENTRY trapno mfspr r9, SPRN_SRR1 mfspr r10, SPRN_SRR0 - andi. r11, r9, MSR_PR - beq- 99f LOAD_REG_IMMEDIATE(r11, MSR_KERNEL) /* can take exceptions */ lis r12, 1f@h ori r12, r12, 1f@l @@ -174,7 +172,6 @@ 3: #endif b transfer_to_syscall /* jump to handler */ -99: b ret_from_kernel_syscall .endm .macro save_dar_dsisr_on_stack reg1, reg2, sp diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index db931f1167aa..bfbd240cc8a2 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -106,10 +106,8 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) #endif mfspr r9, SPRN_SRR1 BOOKE_CLEAR_BTB(r11) - andi. r11, r9, MSR_PR lwz r11, TASK_STACK - THREAD(r10) rlwinm r12,r12,0,4,2 /* Clear SO bit in CR */ - beq- 99f ALLOC_STACK_FRAME(r11, THREAD_SIZE - INT_FRAME_SIZE) stw r12, _CCR(r11) /* save various registers */ mflr r12 @@ -155,7 +153,6 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) 3: b transfer_to_syscall /* jump to handler */ -99: b ret_from_kernel_syscall .endm /* To handle the additional exception priority levels on 40x and Book-E -- 2.25.0
next prev parent reply other threads:[~2021-02-08 16:38 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-08 15:10 [PATCH v5 00/22] powerpc/32: Implement C syscall entry/exit Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 01/22] powerpc/32s: Add missing call to kuep_lock on syscall entry Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 02/22] powerpc/32: Always enable data translation " Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 03/22] powerpc/32: On syscall entry, enable instruction translation at the same time as data Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 04/22] powerpc/32: Reorder instructions to avoid using CTR in syscall entry Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 05/22] powerpc/irq: Add helper to set regs->softe Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:11 ` Nicholas Piggin 2021-02-09 1:11 ` Nicholas Piggin 2021-02-09 5:57 ` Christophe Leroy 2021-02-09 5:57 ` Christophe Leroy 2021-02-09 7:47 ` Nicholas Piggin 2021-02-09 7:47 ` Nicholas Piggin 2021-02-09 6:18 ` Christophe Leroy 2021-02-09 6:18 ` Christophe Leroy 2021-02-09 7:49 ` Nicholas Piggin 2021-02-09 7:49 ` Nicholas Piggin 2021-03-05 8:54 ` Christophe Leroy 2021-03-05 8:54 ` Christophe Leroy 2021-03-08 8:47 ` Nicholas Piggin 2021-03-08 8:47 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 06/22] powerpc/irq: Rework helpers that manipulate MSR[EE/RI] Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:14 ` Nicholas Piggin 2021-02-09 1:14 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 07/22] powerpc/irq: Add stub irq_soft_mask_return() for PPC32 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:19 ` Nicholas Piggin 2021-02-09 1:19 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 08/22] powerpc/syscall: Rename syscall_64.c into interrupt.c Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:19 ` Nicholas Piggin 2021-02-09 1:19 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 09/22] powerpc/syscall: Make interrupt.c buildable on PPC32 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:27 ` Nicholas Piggin 2021-02-09 1:27 ` Nicholas Piggin 2021-02-09 6:02 ` Christophe Leroy 2021-02-09 6:02 ` Christophe Leroy 2021-02-09 7:50 ` Nicholas Piggin 2021-02-09 7:50 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 10/22] powerpc/syscall: Use is_compat_task() Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:29 ` Nicholas Piggin 2021-02-09 1:29 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 11/22] powerpc/syscall: Save r3 in regs->orig_r3 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:29 ` Nicholas Piggin 2021-02-09 1:29 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 12/22] powerpc/syscall: Change condition to check MSR_RI Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:36 ` Nicholas Piggin 2021-02-09 1:36 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 13/22] powerpc/32: Always save non volatile GPRs at syscall entry Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 14/22] powerpc/syscall: implement system call entry/exit logic in C for PPC32 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy [this message] 2021-02-08 15:10 ` [PATCH v5 15/22] powerpc/32: Remove verification of MSR_PR on syscall in the ASM entry Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 16/22] powerpc/syscall: Avoid stack frame in likely part of system_call_exception() Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:55 ` Nicholas Piggin 2021-02-09 1:55 ` Nicholas Piggin 2021-02-09 16:13 ` Christophe Leroy 2021-02-09 16:13 ` Christophe Leroy 2021-02-10 1:56 ` Nicholas Piggin 2021-02-10 1:56 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 17/22] powerpc/syscall: Do not check unsupported scv vector on PPC32 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 2:00 ` Nicholas Piggin 2021-02-09 2:00 ` Nicholas Piggin 2021-02-09 6:13 ` Christophe Leroy 2021-02-09 6:13 ` Christophe Leroy 2021-02-09 7:56 ` Nicholas Piggin 2021-02-09 7:56 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 18/22] powerpc/syscall: Remove FULL_REGS verification in system_call_exception Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 2:02 ` Nicholas Piggin 2021-02-09 2:02 ` Nicholas Piggin 2021-02-09 14:31 ` Christophe Leroy 2021-02-09 14:31 ` Christophe Leroy 2021-02-10 1:57 ` Nicholas Piggin 2021-02-10 1:57 ` Nicholas Piggin 2021-02-08 15:10 ` [PATCH v5 19/22] powerpc/syscall: Optimise checks in beginning of system_call_exception() Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 2:06 ` Nicholas Piggin 2021-02-09 2:06 ` Nicholas Piggin 2021-02-09 14:32 ` Christophe Leroy 2021-02-09 14:32 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 20/22] powerpc/syscall: Avoid storing 'current' in another pointer Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 2:36 ` Nicholas Piggin 2021-02-09 2:36 ` Nicholas Piggin 2021-02-09 13:50 ` Segher Boessenkool 2021-02-09 13:50 ` Segher Boessenkool 2021-02-09 14:31 ` David Laight 2021-02-09 14:31 ` David Laight 2021-02-09 17:03 ` Christophe Leroy 2021-02-09 17:03 ` Christophe Leroy 2021-02-09 17:16 ` David Laight 2021-02-09 17:16 ` David Laight 2021-02-10 2:00 ` Nicholas Piggin 2021-02-10 2:00 ` Nicholas Piggin 2021-02-10 8:45 ` Christophe Leroy 2021-02-10 8:45 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 21/22] powerpc/32: Remove the counter in global_dbcr0 Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-08 15:10 ` [PATCH v5 22/22] powerpc/32: Handle bookE debugging in C in syscall entry/exit Christophe Leroy 2021-02-08 15:10 ` Christophe Leroy 2021-02-09 1:03 ` [PATCH v5 00/22] powerpc/32: Implement C " Nicholas Piggin 2021-02-09 1:03 ` Nicholas Piggin 2021-02-12 0:19 ` Michael Ellerman 2021-02-12 0:19 ` Michael Ellerman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1eddb42cb12092b1e3d72608d182c365db3da41d.1612796617.git.christophe.leroy@csgroup.eu \ --to=christophe.leroy@csgroup.eu \ --cc=benh@kernel.crashing.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=msuchanek@suse.de \ --cc=npiggin@gmail.com \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.