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
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [RFC PATCH v1 17/41] powerpc/32: Add vmap_stack_overflow label inside the macro
Date: Tue, 9 Feb 2021 09:56:41 +0000 (UTC) [thread overview]
Message-ID: <070dc48559435f528b5682d685af300ae974cb35.1612864003.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1612864003.git.christophe.leroy@csgroup.eu>
For consistancy, add in the macro the label used by exception prolog
to branch to stack overflow processing.
While at it, enclose the macro in #ifdef CONFIG_VMAP_STACK on the 8xx
as already done on book3s/32.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/kernel/head_32.h | 3 ++-
arch/powerpc/kernel/head_8xx.S | 3 ++-
arch/powerpc/kernel/head_book3s_32.S | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h
index 15c6fc7cbbf5..d97ec94b34da 100644
--- a/arch/powerpc/kernel/head_32.h
+++ b/arch/powerpc/kernel/head_32.h
@@ -52,7 +52,7 @@
1:
#ifdef CONFIG_VMAP_STACK
mtcrf 0x3f, r1
- bt 32 - THREAD_ALIGN_SHIFT, stack_overflow
+ bt 32 - THREAD_ALIGN_SHIFT, vmap_stack_overflow
#endif
.endm
@@ -196,6 +196,7 @@
ret_from_except)
.macro vmap_stack_overflow_exception
+vmap_stack_overflow:
#ifdef CONFIG_SMP
mfspr r1, SPRN_SPRG_THREAD
lwz r1, TASK_CPU - THREAD(r1)
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index cdbfa9d41353..b63445c55f4d 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -338,8 +338,9 @@ DARFixed:/* Return from dcbx instruction bug workaround */
/* 0x300 is DataAccess exception, needed by bad_page_fault() */
EXC_XFER_LITE(0x300, handle_page_fault)
-stack_overflow:
+#ifdef CONFIG_VMAP_STACK
vmap_stack_overflow_exception
+#endif
/* On the MPC8xx, these next four traps are used for development
* support of breakpoints and such. Someday I will get around to
diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S
index 59efbee7c080..9dc05890477d 100644
--- a/arch/powerpc/kernel/head_book3s_32.S
+++ b/arch/powerpc/kernel/head_book3s_32.S
@@ -729,7 +729,6 @@ fast_hash_page_return:
#endif /* CONFIG_PPC_BOOK3S_604 */
#ifdef CONFIG_VMAP_STACK
-stack_overflow:
vmap_stack_overflow_exception
#endif
--
2.25.0
next prev parent reply other threads:[~2021-02-09 10:14 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 9:56 [RFC PATCH v1 00/41] powerpc/32: Switch to interrupt entry/exit in C Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 01/41] powerpc/32: Preserve cr1 in exception prolog stack check to fix build error Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 02/41] powerpc/40x: Don't use SPRN_SPRG_SCRATCH0/1 in TLB miss handlers Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 03/41] powerpc/40x: Change CRITICAL_EXCEPTION_PROLOG macro to a gas macro Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 04/41] powerpc/40x: Save SRR0/SRR1 and r10/r11 earlier in critical exception Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 05/41] powerpc/40x: Reorder a few instructions in critical exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 06/41] powerpc/40x: Prepare for enabling MMU " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 07/41] powerpc/40x: Prepare normal exception handler for enabling MMU early Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 08/41] powerpc/32: Reconcile interrupts in C Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 09/41] powerpc/32: Entry cpu time accounting " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 10/41] powerpc/32: Handle bookE debugging in C in exception entry Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 11/41] powerpc/32: Use fast instruction to set MSR RI in exception prolog on 8xx Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 12/41] powerpc/32: Remove ksp_limit Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 13/41] powerpc/32: Always enable data translation in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 14/41] powerpc/32: Tag DAR in EXCEPTION_PROLOG_2 for the 8xx Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 15/41] powerpc/32: Enable instruction translation at the same time as data translation Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 16/41] powerpc/32: Statically initialise first emergency context Christophe Leroy
2021-02-09 9:56 ` Christophe Leroy [this message]
2021-02-09 9:56 ` [RFC PATCH v1 18/41] powerpc/32: Use START_EXCEPTION() as much as possible Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 19/41] powerpc/32: Move exception prolog code into .text once MMU is back on Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 20/41] powerpc/32: Provide a name to exception prolog continuation in virtual mode Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 21/41] powerpc/32: Refactor booke critical registers saving Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 22/41] powerpc/32: Perform normal function call in exception entry Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 23/41] powerpc/32: Always save non volatile registers on " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 24/41] powerpc/32: Replace ASM exception exit by C exception exit from ppc64 Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 25/41] powerpc/32: Set regs parameter in r3 in transfer_to_handler Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 26/41] powerpc/32: Remove handle_page_fault() Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 27/41] powerpc/32: Save trap number on stack in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 28/41] powerpc/32: Add a prepare_transfer_to_handler macro for exception prologs Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 29/41] powerpc/32: Only restore non volatile registers when required Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 30/41] powerpc/32: Dismantle EXC_XFER_STD/LITE/TEMPLATE Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 31/41] powerpc/32: Remove the xfer parameter in EXCEPTION() macro Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 32/41] powerpc/32: Refactor saving of volatile registers in exception prologs Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 33/41] powerpc/32: Save remaining registers in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 34/41] powerpc/32: Set current->thread.regs in C interrupt entry Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 35/41] powerpc/32: Return directly from power_save_ppc32_restore() Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 36/41] powerpc/32: Only use prepare_transfer_to_handler function on book3s/32 and e500 Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 37/41] powerpc/32s: Move KUEP locking/unlocking in C Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 38/41] powerpc/64s: Make kuap_check_amr() and kuap_get_and_check_amr() generic Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 39/41] powerpc/32s: Create C version of kuap save/restore/check helpers Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 40/41] powerpc/8xx: " Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 41/41] powerpc/32: Manage KUAP in C Christophe Leroy
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=070dc48559435f528b5682d685af300ae974cb35.1612864003.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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).