From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Subject: Re: [PATCH v7 32/42] powerpc/64: context tracking move to interrupt wrappers
Date: Tue, 9 Feb 2021 06:49:13 +0100 [thread overview]
Message-ID: <3cb26edb-c9cc-4f21-0b6d-dcd4bbeed7b3@csgroup.eu> (raw)
In-Reply-To: <20210130130852.2952424-33-npiggin@gmail.com>
Le 30/01/2021 à 14:08, Nicholas Piggin a écrit :
> This moves exception_enter/exit calls to wrapper functions for
> synchronous interrupts. More interrupt handlers are covered by
> this than previously.
Why did you enclose everything in #ifdef CONFIG_PPC64 ? As far as I understand, before this patch
exception_enter() and exception_exit() are called also on PPC32.
Christophe
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/powerpc/include/asm/interrupt.h | 9 ++++
> arch/powerpc/kernel/traps.c | 74 ++++++---------------------
> arch/powerpc/mm/book3s64/hash_utils.c | 3 --
> arch/powerpc/mm/fault.c | 9 +---
> 4 files changed, 27 insertions(+), 68 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
> index 488bdd5bd922..e65ce3e2b071 100644
> --- a/arch/powerpc/include/asm/interrupt.h
> +++ b/arch/powerpc/include/asm/interrupt.h
> @@ -7,10 +7,16 @@
> #include <asm/ftrace.h>
>
> struct interrupt_state {
> +#ifdef CONFIG_PPC64
> + enum ctx_state ctx_state;
> +#endif
> };
>
> static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrupt_state *state)
> {
> +#ifdef CONFIG_PPC64
> + state->ctx_state = exception_enter();
> +#endif
> }
>
> /*
> @@ -29,6 +35,9 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup
> */
> static inline void interrupt_exit_prepare(struct pt_regs *regs, struct interrupt_state *state)
> {
> +#ifdef CONFIG_PPC64
> + exception_exit(state->ctx_state);
> +#endif
> }
>
> static inline void interrupt_async_enter_prepare(struct pt_regs *regs, struct interrupt_state *state)
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index da488e62fb5f..21fd14828827 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -1087,41 +1087,28 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(handle_hmi_exception)
>
> DEFINE_INTERRUPT_HANDLER(unknown_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> printk("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
> regs->nip, regs->msr, regs->trap);
>
> _exception(SIGTRAP, regs, TRAP_UNK, 0);
> -
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER_ASYNC(unknown_async_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> printk("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
> regs->nip, regs->msr, regs->trap);
>
> _exception(SIGTRAP, regs, TRAP_UNK, 0);
> -
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(instruction_breakpoint_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> if (notify_die(DIE_IABR_MATCH, "iabr_match", regs, 5,
> 5, SIGTRAP) == NOTIFY_STOP)
> - goto bail;
> + return;
> if (debugger_iabr_match(regs))
> - goto bail;
> + return;
> _exception(SIGTRAP, regs, TRAP_BRKPT, regs->nip);
> -
> -bail:
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(RunModeException)
> @@ -1131,8 +1118,6 @@ DEFINE_INTERRUPT_HANDLER(RunModeException)
>
> DEFINE_INTERRUPT_HANDLER(single_step_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> clear_single_step(regs);
> clear_br_trace(regs);
>
> @@ -1141,14 +1126,11 @@ DEFINE_INTERRUPT_HANDLER(single_step_exception)
>
> if (notify_die(DIE_SSTEP, "single_step", regs, 5,
> 5, SIGTRAP) == NOTIFY_STOP)
> - goto bail;
> + return;
> if (debugger_sstep(regs))
> - goto bail;
> + return;
>
> _exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
> -
> -bail:
> - exception_exit(prev_state);
> }
> NOKPROBE_SYMBOL(single_step_exception);
>
> @@ -1476,7 +1458,6 @@ static inline int emulate_math(struct pt_regs *regs) { return -1; }
>
> DEFINE_INTERRUPT_HANDLER(program_check_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> unsigned int reason = get_reason(regs);
>
> /* We can now get here via a FP Unavailable exception if the core
> @@ -1485,22 +1466,22 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> if (reason & REASON_FP) {
> /* IEEE FP exception */
> parse_fpe(regs);
> - goto bail;
> + return;
> }
> if (reason & REASON_TRAP) {
> unsigned long bugaddr;
> /* Debugger is first in line to stop recursive faults in
> * rcu_lock, notify_die, or atomic_notifier_call_chain */
> if (debugger_bpt(regs))
> - goto bail;
> + return;
>
> if (kprobe_handler(regs))
> - goto bail;
> + return;
>
> /* trap exception */
> if (notify_die(DIE_BPT, "breakpoint", regs, 5, 5, SIGTRAP)
> == NOTIFY_STOP)
> - goto bail;
> + return;
>
> bugaddr = regs->nip;
> /*
> @@ -1512,10 +1493,10 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> if (!(regs->msr & MSR_PR) && /* not user-mode */
> report_bug(bugaddr, regs) == BUG_TRAP_TYPE_WARN) {
> regs->nip += 4;
> - goto bail;
> + return;
> }
> _exception(SIGTRAP, regs, TRAP_BRKPT, regs->nip);
> - goto bail;
> + return;
> }
> #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
> if (reason & REASON_TM) {
> @@ -1536,7 +1517,7 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> */
> if (user_mode(regs)) {
> _exception(SIGILL, regs, ILL_ILLOPN, regs->nip);
> - goto bail;
> + return;
> } else {
> printk(KERN_EMERG "Unexpected TM Bad Thing exception "
> "at %lx (msr 0x%lx) tm_scratch=%llx\n",
> @@ -1567,7 +1548,7 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> * pattern to occurrences etc. -dgibson 31/Mar/2003
> */
> if (!emulate_math(regs))
> - goto bail;
> + return;
>
> /* Try to emulate it if we should. */
> if (reason & (REASON_ILLEGAL | REASON_PRIVILEGED)) {
> @@ -1575,10 +1556,10 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> case 0:
> regs->nip += 4;
> emulate_single_step(regs);
> - goto bail;
> + return;
> case -EFAULT:
> _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
> - goto bail;
> + return;
> }
> }
>
> @@ -1587,9 +1568,6 @@ DEFINE_INTERRUPT_HANDLER(program_check_exception)
> _exception(SIGILL, regs, ILL_PRVOPC, regs->nip);
> else
> _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
> -
> -bail:
> - exception_exit(prev_state);
> }
> NOKPROBE_SYMBOL(program_check_exception);
>
> @@ -1606,14 +1584,12 @@ NOKPROBE_SYMBOL(emulation_assist_interrupt);
>
> DEFINE_INTERRUPT_HANDLER(alignment_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> int sig, code, fixed = 0;
> unsigned long reason;
>
> interrupt_cond_local_irq_enable(regs);
>
> reason = get_reason(regs);
> -
> if (reason & REASON_BOUNDARY) {
> sig = SIGBUS;
> code = BUS_ADRALN;
> @@ -1621,7 +1597,7 @@ DEFINE_INTERRUPT_HANDLER(alignment_exception)
> }
>
> if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT))
> - goto bail;
> + return;
>
> /* we don't implement logging of alignment exceptions */
> if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))
> @@ -1631,7 +1607,7 @@ DEFINE_INTERRUPT_HANDLER(alignment_exception)
> /* skip over emulated instruction */
> regs->nip += inst_length(reason);
> emulate_single_step(regs);
> - goto bail;
> + return;
> }
>
> /* Operand address was bad */
> @@ -1647,9 +1623,6 @@ DEFINE_INTERRUPT_HANDLER(alignment_exception)
> _exception(sig, regs, code, regs->dar);
> else
> bad_page_fault(regs, sig);
> -
> -bail:
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(StackOverflow)
> @@ -1663,41 +1636,28 @@ DEFINE_INTERRUPT_HANDLER(StackOverflow)
>
> DEFINE_INTERRUPT_HANDLER(stack_overflow_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> die("Kernel stack overflow", regs, SIGSEGV);
> -
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(kernel_fp_unavailable_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> printk(KERN_EMERG "Unrecoverable FP Unavailable Exception "
> "%lx at %lx\n", regs->trap, regs->nip);
> die("Unrecoverable FP Unavailable Exception", regs, SIGABRT);
> -
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(altivec_unavailable_exception)
> {
> - enum ctx_state prev_state = exception_enter();
> -
> if (user_mode(regs)) {
> /* A user program has executed an altivec instruction,
> but this kernel doesn't support altivec. */
> _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
> - goto bail;
> + return;
> }
>
> printk(KERN_EMERG "Unrecoverable VMX/Altivec Unavailable Exception "
> "%lx at %lx\n", regs->trap, regs->nip);
> die("Unrecoverable VMX/Altivec Unavailable Exception", regs, SIGABRT);
> -
> -bail:
> - exception_exit(prev_state);
> }
>
> DEFINE_INTERRUPT_HANDLER(vsx_unavailable_exception)
> diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
> index d681dc5a7b1c..fb7c10524bcd 100644
> --- a/arch/powerpc/mm/book3s64/hash_utils.c
> +++ b/arch/powerpc/mm/book3s64/hash_utils.c
> @@ -1514,7 +1514,6 @@ EXPORT_SYMBOL_GPL(hash_page);
> DECLARE_INTERRUPT_HANDLER_RET(__do_hash_fault);
> DEFINE_INTERRUPT_HANDLER_RET(__do_hash_fault)
> {
> - enum ctx_state prev_state = exception_enter();
> unsigned long ea = regs->dar;
> unsigned long dsisr = regs->dsisr;
> unsigned long access = _PAGE_PRESENT | _PAGE_READ;
> @@ -1563,8 +1562,6 @@ DEFINE_INTERRUPT_HANDLER_RET(__do_hash_fault)
> err = 0;
> }
>
> - exception_exit(prev_state);
> -
> return err;
> }
>
> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
> index 9c4220efc20f..b26a7643fc6e 100644
> --- a/arch/powerpc/mm/fault.c
> +++ b/arch/powerpc/mm/fault.c
> @@ -564,14 +564,7 @@ NOKPROBE_SYMBOL(__do_page_fault);
>
> DEFINE_INTERRUPT_HANDLER_RET(do_page_fault)
> {
> - enum ctx_state prev_state = exception_enter();
> - long err;
> -
> - err = __do_page_fault(regs);
> -
> - exception_exit(prev_state);
> -
> - return err;
> + return __do_page_fault(regs);
> }
> NOKPROBE_SYMBOL(do_page_fault);
>
>
next prev parent reply other threads:[~2021-02-09 5:51 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-30 13:08 [PATCH v7 00/42] powerpc: interrupt wrappers Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 01/42] powerpc/64s: interrupt exit improve bounding of interrupt recursion Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 02/42] KVM: PPC: Book3S HV: Context tracking exit guest context before enabling irqs Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 03/42] powerpc/32s: move DABR match out of handle_page_fault Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 04/42] powerpc/64s: " Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 05/42] powerpc/64s: move the hash fault handling logic to C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 06/42] powerpc: remove arguments from fault handler functions Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 07/42] powerpc/fsl_booke/32: CacheLockingException remove args Nicholas Piggin
2021-02-08 10:04 ` Gautham R Shenoy
2021-02-08 11:54 ` Michael Ellerman
2021-01-30 13:08 ` [PATCH v7 08/42] powerpc: do_break get registers from regs Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 09/42] powerpc: DebugException remove args Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 10/42] powerpc/32: transfer can avoid saving r4/r5 over trace call Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 11/42] powerpc: bad_page_fault get registers from regs Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 12/42] powerpc/64s: add do_bad_page_fault_segv handler Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 13/42] powerpc: rearrange do_page_fault error case to be inside exception_enter Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 14/42] powerpc/64s: move bad_page_fault handling to C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 15/42] powerpc/64s: split do_hash_fault Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 16/42] powerpc/mm: Remove stale do_page_fault comment referring to SLB faults Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 17/42] powerpc/64s: slb comment update Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 18/42] powerpc/traps: add NOKPROBE_SYMBOL for sreset and mce Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 19/42] powerpc/perf: move perf irq/nmi handling details into traps.c Nicholas Piggin
2021-01-31 12:30 ` Athira Rajeev
2021-01-30 13:08 ` [PATCH v7 20/42] powerpc/time: move timer_broadcast_interrupt prototype to asm/time.h Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 21/42] powerpc: add and use unknown_async_exception Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 22/42] powerpc/cell: tidy up pervasive declarations Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 23/42] powerpc: introduce die_mce Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 24/42] powerpc/mce: ensure machine check handler always tests RI Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 25/42] powerpc: improve handling of unrecoverable system reset Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 26/42] powerpc: interrupt handler wrapper functions Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 27/42] powerpc: add interrupt wrapper entry / exit stub functions Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 28/42] powerpc: convert interrupt handlers to use wrappers Nicholas Piggin
2021-02-03 1:54 ` Nicholas Piggin
2021-02-05 8:09 ` Christophe Leroy
2021-02-06 2:43 ` Nicholas Piggin
2021-02-07 12:56 ` Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 29/42] powerpc: add interrupt_cond_local_irq_enable helper Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 30/42] powerpc/64: context tracking remove _TIF_NOHZ Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 31/42] powerpc/64s/hash: improve context tracking of hash faults Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 32/42] powerpc/64: context tracking move to interrupt wrappers Nicholas Piggin
2021-02-09 5:49 ` Christophe Leroy [this message]
2021-02-09 7:45 ` Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 33/42] powerpc/64: add context tracking to asynchronous interrupts Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 34/42] powerpc: handle irq_enter/irq_exit in interrupt handler wrappers Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 35/42] powerpc/64s: move context tracking exit to interrupt exit path Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 36/42] powerpc/64s: reconcile interrupts in C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 37/42] powerpc/64: move account_stolen_time into its own function Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 38/42] powerpc/64: entry cpu time accounting in C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 39/42] powerpc: move NMI entry/exit code into wrapper Nicholas Piggin
2021-02-04 10:15 ` Michael Ellerman
2021-02-04 11:31 ` Nicholas Piggin
2021-02-05 23:38 ` Michael Ellerman
2021-02-06 2:46 ` Nicholas Piggin
2021-02-07 12:54 ` Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 40/42] powerpc/64s: move NMI soft-mask handling to C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 41/42] powerpc/64s: runlatch interrupt handling in C Nicholas Piggin
2021-01-30 13:08 ` [PATCH v7 42/42] powerpc/64s: power4 nap fixup " Nicholas Piggin
2021-02-02 10:31 ` Michael Ellerman
2021-02-03 0:35 ` Nicholas Piggin
2021-02-07 12:58 ` Nicholas Piggin
2021-02-02 5:57 ` [PATCH v7 00/42] powerpc: interrupt wrappers Christophe Leroy
2021-02-10 12:57 ` 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=3cb26edb-c9cc-4f21-0b6d-dcd4bbeed7b3@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
/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).