From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Nicholas Piggin <npiggin@gmail.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [RFC PATCH 1/3] powerpc/32: Implement HAVE_CONTEXT_TRACKING_USER support
Date: Tue, 4 Oct 2022 11:32:43 +0000 [thread overview]
Message-ID: <c3f87f7b-c4f9-eca0-a8dd-acc6e7e9f02b@csgroup.eu> (raw)
In-Reply-To: <20221004063306.511154-2-npiggin@gmail.com>
Le 04/10/2022 à 08:33, Nicholas Piggin a écrit :
> Context tracking involves tracking user, kernel, guest switches. This
> enables existing context tracking code for interrupt entry on 32-bit.
> KVM and interrupt exit already has context tracking calls.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> arch/powerpc/Kconfig | 2 +-
> arch/powerpc/include/asm/interrupt.h | 21 ++++++---------------
> 2 files changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 81c9f895d690..f667279ec74c 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -204,7 +204,7 @@ config PPC
> select HAVE_ARCH_SECCOMP_FILTER
> select HAVE_ARCH_TRACEHOOK
> select HAVE_ASM_MODVERSIONS
> - select HAVE_CONTEXT_TRACKING_USER if PPC64
> + select HAVE_CONTEXT_TRACKING_USER
> select HAVE_C_RECORDMCOUNT
> select HAVE_DEBUG_KMEMLEAK
> select HAVE_DEBUG_STACKOVERFLOW
> diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
> index 4745bb9998bd..8860a246d51a 100644
> --- a/arch/powerpc/include/asm/interrupt.h
> +++ b/arch/powerpc/include/asm/interrupt.h
> @@ -85,6 +85,8 @@ do { \
> (user_mode(regs) || (TRAP(regs) != INTERRUPT_PROGRAM))) \
> BUG_ON(cond); \
> } while (0)
> +#else
> +#define INT_SOFT_MASK_BUG_ON(regs, cond)
Here you can just drop the ifdef CONFIG_PPC64 I guess instead of adding
an additional empty macro.
> #endif
>
> #ifdef CONFIG_PPC_BOOK3S_64
> @@ -152,19 +154,8 @@ static inline void booke_restore_dbcr0(void)
> static inline void interrupt_enter_prepare(struct pt_regs *regs)
> {
> #ifdef CONFIG_PPC32
> - if (!arch_irq_disabled_regs(regs))
> - trace_hardirqs_off();
> -
> - if (user_mode(regs))
> - kuap_lock();
> - else
> - kuap_save_and_lock(regs);
> -
> - if (user_mode(regs))
> - account_cpu_user_entry();
> -#endif
> -
> -#ifdef CONFIG_PPC64
> + bool trace_enable = !arch_irq_disabled_regs(regs);
nit: You could be put this as an #else to the existing #ifdef CONFIG_PPC64
> +#else
> bool trace_enable = false;
>
> if (IS_ENABLED(CONFIG_TRACE_IRQFLAGS)) {
> @@ -188,8 +179,9 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
> } else {
> __hard_RI_enable();
> }
> + /* Only call trace_hardirqs_off when RI=1, it can cause SLB faults */
> +#endif
>
> - /* Do this when RI=1 because it can cause SLB faults */
> if (trace_enable)
> trace_hardirqs_off();
>
> @@ -215,7 +207,6 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
> }
> INT_SOFT_MASK_BUG_ON(regs, !arch_irq_disabled_regs(regs) &&
> !(regs->msr & MSR_EE));
> -#endif
>
> booke_restore_dbcr0();
> }
next prev parent reply other threads:[~2022-10-04 11:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 6:33 [RFC PATCH 0/3] powerpc/32: nohz full support Nicholas Piggin
2022-10-04 6:33 ` [RFC PATCH 1/3] powerpc/32: Implement HAVE_CONTEXT_TRACKING_USER support Nicholas Piggin
2022-10-04 11:32 ` Christophe Leroy [this message]
2022-10-06 8:22 ` Nicholas Piggin
2022-10-04 6:33 ` [RFC PATCH 2/3] powerpc: remove the last remnants of cputime_t Nicholas Piggin
2022-10-06 10:06 ` Michael Ellerman
2022-10-04 6:33 ` [RFC PATCH 3/3] Remove HAVE_VIRT_CPU_ACCOUNTING_GEN option Nicholas Piggin
2022-10-04 11:58 ` [RFC PATCH 0/3] powerpc/32: nohz full support Christophe Leroy
2022-10-06 8:18 ` Nicholas Piggin
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=c3f87f7b-c4f9-eca0-a8dd-acc6e7e9f02b@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--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).