From: Nicholas Piggin <npiggin@gmail.com> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Christophe Leroy <christophe.leroy@csgroup.eu>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 3/4] powerpc/interrupt: Rename and lightly change syscall_exit_prepare_main() Date: Fri, 11 Jun 2021 12:32:34 +1000 [thread overview] Message-ID: <1623378700.koj918a90m.astroid@bobo.none> (raw) In-Reply-To: <f46e330d3db9ac2567b5a12d170ba8375aa80c1b.1622818556.git.christophe.leroy@csgroup.eu> Excerpts from Christophe Leroy's message of June 5, 2021 12:56 am: > Rename syscall_exit_prepare_main() into interrupt_exit_prepare_main() > > Make it static as it is not used anywhere else. > > Pass it the 'ret' so that it can 'or' it directly instead of > oring twice, once inside the function and once outside. > > And remove 'r3' parameter which is not used. > > Also fix a typo where CONFIG_PPC_BOOK3S should be CONFIG_PPC_BOOK3S_64. This all looks good I think. I need to grab this fix from your series. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/kernel/interrupt.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c > index b6aa80930733..bc3c1892ed80 100644 > --- a/arch/powerpc/kernel/interrupt.c > +++ b/arch/powerpc/kernel/interrupt.c > @@ -228,11 +228,10 @@ static notrace void booke_load_dbcr0(void) > #endif > } > > -notrace unsigned long syscall_exit_prepare_main(unsigned long r3, > - struct pt_regs *regs) > +static notrace unsigned long > +interrupt_exit_user_prepare_main(struct pt_regs *regs, unsigned long ret) > { > unsigned long ti_flags; > - unsigned long ret = 0; > > again: > ti_flags = READ_ONCE(current_thread_info()->flags); > @@ -254,7 +253,7 @@ notrace unsigned long syscall_exit_prepare_main(unsigned long r3, > ti_flags = READ_ONCE(current_thread_info()->flags); > } > > - if (IS_ENABLED(CONFIG_PPC_BOOK3S) && IS_ENABLED(CONFIG_PPC_FPU)) { > + if (IS_ENABLED(CONFIG_PPC_BOOK3S_64) && IS_ENABLED(CONFIG_PPC_FPU)) { > if (IS_ENABLED(CONFIG_PPC_TRANSACTIONAL_MEM) && > unlikely((ti_flags & _TIF_RESTORE_TM))) { > restore_tm_state(regs); > @@ -350,7 +349,7 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3, > } > > local_irq_disable(); > - ret |= syscall_exit_prepare_main(r3, regs); > + ret = interrupt_exit_user_prepare_main(regs, ret); > > #ifdef CONFIG_PPC64 > regs->exit_result = ret; > @@ -378,7 +377,7 @@ notrace unsigned long syscall_exit_restart(unsigned long r3, struct pt_regs *reg > > BUG_ON(!user_mode(regs)); > > - regs->exit_result |= syscall_exit_prepare_main(r3, regs); > + regs->exit_result = interrupt_exit_user_prepare_main(regs, regs->exit_result); > > return regs->exit_result; > } > -- > 2.25.0 > >
WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Christophe Leroy <christophe.leroy@csgroup.eu>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/4] powerpc/interrupt: Rename and lightly change syscall_exit_prepare_main() Date: Fri, 11 Jun 2021 12:32:34 +1000 [thread overview] Message-ID: <1623378700.koj918a90m.astroid@bobo.none> (raw) In-Reply-To: <f46e330d3db9ac2567b5a12d170ba8375aa80c1b.1622818556.git.christophe.leroy@csgroup.eu> Excerpts from Christophe Leroy's message of June 5, 2021 12:56 am: > Rename syscall_exit_prepare_main() into interrupt_exit_prepare_main() > > Make it static as it is not used anywhere else. > > Pass it the 'ret' so that it can 'or' it directly instead of > oring twice, once inside the function and once outside. > > And remove 'r3' parameter which is not used. > > Also fix a typo where CONFIG_PPC_BOOK3S should be CONFIG_PPC_BOOK3S_64. This all looks good I think. I need to grab this fix from your series. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/kernel/interrupt.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c > index b6aa80930733..bc3c1892ed80 100644 > --- a/arch/powerpc/kernel/interrupt.c > +++ b/arch/powerpc/kernel/interrupt.c > @@ -228,11 +228,10 @@ static notrace void booke_load_dbcr0(void) > #endif > } > > -notrace unsigned long syscall_exit_prepare_main(unsigned long r3, > - struct pt_regs *regs) > +static notrace unsigned long > +interrupt_exit_user_prepare_main(struct pt_regs *regs, unsigned long ret) > { > unsigned long ti_flags; > - unsigned long ret = 0; > > again: > ti_flags = READ_ONCE(current_thread_info()->flags); > @@ -254,7 +253,7 @@ notrace unsigned long syscall_exit_prepare_main(unsigned long r3, > ti_flags = READ_ONCE(current_thread_info()->flags); > } > > - if (IS_ENABLED(CONFIG_PPC_BOOK3S) && IS_ENABLED(CONFIG_PPC_FPU)) { > + if (IS_ENABLED(CONFIG_PPC_BOOK3S_64) && IS_ENABLED(CONFIG_PPC_FPU)) { > if (IS_ENABLED(CONFIG_PPC_TRANSACTIONAL_MEM) && > unlikely((ti_flags & _TIF_RESTORE_TM))) { > restore_tm_state(regs); > @@ -350,7 +349,7 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3, > } > > local_irq_disable(); > - ret |= syscall_exit_prepare_main(r3, regs); > + ret = interrupt_exit_user_prepare_main(regs, ret); > > #ifdef CONFIG_PPC64 > regs->exit_result = ret; > @@ -378,7 +377,7 @@ notrace unsigned long syscall_exit_restart(unsigned long r3, struct pt_regs *reg > > BUG_ON(!user_mode(regs)); > > - regs->exit_result |= syscall_exit_prepare_main(r3, regs); > + regs->exit_result = interrupt_exit_user_prepare_main(regs, regs->exit_result); > > return regs->exit_result; > } > -- > 2.25.0 > >
next prev parent reply other threads:[~2021-06-11 2:32 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-04 14:56 [PATCH v2 1/4] powerpc/interrupt: Interchange prep_irq_for_{kernel_enabled/user}_exit() Christophe Leroy 2021-06-04 14:56 ` Christophe Leroy 2021-06-04 14:56 ` [PATCH v2 2/4] powerpc/interrupt: Refactor prep_irq_for_user_exit() Christophe Leroy 2021-06-04 14:56 ` Christophe Leroy 2021-06-11 2:30 ` Nicholas Piggin 2021-06-11 2:30 ` Nicholas Piggin 2021-06-15 8:37 ` Christophe Leroy 2021-06-15 8:37 ` Christophe Leroy 2021-06-17 3:33 ` Nicholas Piggin 2021-06-17 3:33 ` Nicholas Piggin 2021-06-04 14:56 ` [PATCH v2 3/4] powerpc/interrupt: Rename and lightly change syscall_exit_prepare_main() Christophe Leroy 2021-06-04 14:56 ` Christophe Leroy 2021-06-11 2:32 ` Nicholas Piggin [this message] 2021-06-11 2:32 ` Nicholas Piggin 2021-06-04 14:56 ` [PATCH v2 4/4] powerpc/interrupt: Refactor interrupt_exit_user_prepare() Christophe Leroy 2021-06-04 14:56 ` Christophe Leroy 2021-06-11 2:26 ` [PATCH v2 1/4] powerpc/interrupt: Interchange prep_irq_for_{kernel_enabled/user}_exit() Nicholas Piggin 2021-06-11 2:26 ` 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=1623378700.koj918a90m.astroid@bobo.none \ --to=npiggin@gmail.com \ --cc=benh@kernel.crashing.org \ --cc=christophe.leroy@csgroup.eu \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --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.