1. Patchew
  2. linux
  3. [PATCH v7 0/2] MIPS: Fix idle VS timer enqueue
  4. View patch

[PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section

Marco Crivellari posted 2 patches 8 months, 2 weeks ago
[PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Marco Crivellari 8 months, 2 weeks ago 
Fix missing .cpuidle.text section assignment for r4k_wait() to correct
backtracing with nmi_backtrace().

Fixes: 97c8580e85cf ("MIPS: Annotate cpu_wait implementations with __cpuidle")
Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
---
 arch/mips/kernel/genex.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 46d975d00298..2cf312d9a3b0 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -104,6 +104,7 @@ handle_vcei:
 
 	__FINIT
 
+	.section .cpuidle.text,"ax"
 	/* Align to 32 bytes for the maximum idle interrupt region size. */
 	.align	5
 LEAF(r4k_wait)
-- 
2.49.0
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Huacai Chen 7 months, 3 weeks ago 
Hi, Marco,

On Fri, Apr 4, 2025 at 12:12 AM Marco Crivellari
<marco.crivellari@suse.com> wrote:
>
> Fix missing .cpuidle.text section assignment for r4k_wait() to correct
> backtracing with nmi_backtrace().
>
> Fixes: 97c8580e85cf ("MIPS: Annotate cpu_wait implementations with __cpuidle")
> Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
> Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
> Acked-by: Frederic Weisbecker <frederic@kernel.org>
> ---
>  arch/mips/kernel/genex.S | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
> index 46d975d00298..2cf312d9a3b0 100644
> --- a/arch/mips/kernel/genex.S
> +++ b/arch/mips/kernel/genex.S
> @@ -104,6 +104,7 @@ handle_vcei:
>
>         __FINIT
>
> +       .section .cpuidle.text,"ax"
If you submit a new version, adding a space before "ax" will be a little better.

Huacai

>         /* Align to 32 bytes for the maximum idle interrupt region size. */
>         .align  5
>  LEAF(r4k_wait)
> --
> 2.49.0
>
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Maciej W. Rozycki 7 months, 3 weeks ago 
On Mon, 28 Apr 2025, Huacai Chen wrote:

> > diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
> > index 46d975d00298..2cf312d9a3b0 100644
> > --- a/arch/mips/kernel/genex.S
> > +++ b/arch/mips/kernel/genex.S
> > @@ -104,6 +104,7 @@ handle_vcei:
> >
> >         __FINIT
> >
> > +       .section .cpuidle.text,"ax"
> If you submit a new version, adding a space before "ax" will be a little better.

 We use no space across our port though, which is why I haven't requested 
that before.

  Maciej
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Huacai Chen 7 months, 3 weeks ago 
On Mon, Apr 28, 2025 at 11:28 AM Maciej W. Rozycki <macro@orcam.me.uk> wrote:
>
> On Mon, 28 Apr 2025, Huacai Chen wrote:
>
> > > diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
> > > index 46d975d00298..2cf312d9a3b0 100644
> > > --- a/arch/mips/kernel/genex.S
> > > +++ b/arch/mips/kernel/genex.S
> > > @@ -104,6 +104,7 @@ handle_vcei:
> > >
> > >         __FINIT
> > >
> > > +       .section .cpuidle.text,"ax"
> > If you submit a new version, adding a space before "ax" will be a little better.
>
>  We use no space across our port though, which is why I haven't requested
> that before.

Current status:
arch/mips/include/asm/ftrace.h:         ".section .fixup, \"ax\"\n"
         \
arch/mips/include/asm/ftrace.h:         ".section .fixup, \"ax\"\n"     \
arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
                 \n"     \
arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
                 \n"     \
arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
                         \n"
arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
                         \n"
arch/mips/include/asm/paccess.h:        ".section\t.fixup,\"ax\"\n"
                                 \
arch/mips/include/asm/paccess.h:        ".section\t.fixup,\"ax\"\n"
                                 \

So there are a few files which have spaces.

Huacai


>
>   Maciej
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Marco Crivellari 7 months, 3 weeks ago 
Hi,

If it sounds good also to Maciej, I will submit the new version with the
space before "ax" (and of course, the ".previous").

Thank you.

On Mon, Apr 28, 2025 at 6:11 AM Huacai Chen <chenhuacai@kernel.org> wrote:
>
> On Mon, Apr 28, 2025 at 11:28 AM Maciej W. Rozycki <macro@orcam.me.uk> wrote:
> >
> > On Mon, 28 Apr 2025, Huacai Chen wrote:
> >
> > > > diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
> > > > index 46d975d00298..2cf312d9a3b0 100644
> > > > --- a/arch/mips/kernel/genex.S
> > > > +++ b/arch/mips/kernel/genex.S
> > > > @@ -104,6 +104,7 @@ handle_vcei:
> > > >
> > > >         __FINIT
> > > >
> > > > +       .section .cpuidle.text,"ax"
> > > If you submit a new version, adding a space before "ax" will be a little better.
> >
> >  We use no space across our port though, which is why I haven't requested
> > that before.
>
> Current status:
> arch/mips/include/asm/ftrace.h:         ".section .fixup, \"ax\"\n"
>          \
> arch/mips/include/asm/ftrace.h:         ".section .fixup, \"ax\"\n"     \
> arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
>                  \n"     \
> arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
>                  \n"     \
> arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
>                          \n"
> arch/mips/include/asm/futex.h:          "       .section .fixup,\"ax\"
>                          \n"
> arch/mips/include/asm/paccess.h:        ".section\t.fixup,\"ax\"\n"
>                                  \
> arch/mips/include/asm/paccess.h:        ".section\t.fixup,\"ax\"\n"
>                                  \
>
> So there are a few files which have spaces.
>
> Huacai
>
>
> >
> >   Maciej



-- 

Marco Crivellari

L3 Support Engineer, Technology & Product




marco.crivellari@suse.com
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Thomas Bogendoerfer 7 months, 3 weeks ago 
On Mon, Apr 28, 2025 at 12:20:31PM +0200, Marco Crivellari wrote:
> Hi,
> 
> If it sounds good also to Maciej, I will submit the new version with the
> space before "ax" (and of course, the ".previous").

save your time, this is already applied and I won't rebase the branch
just because of this minor bisection problem.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Huacai Chen 7 months, 2 weeks ago 
On Mon, Apr 28, 2025 at 6:24 PM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> wrote:
>
> On Mon, Apr 28, 2025 at 12:20:31PM +0200, Marco Crivellari wrote:
> > Hi,
> >
> > If it sounds good also to Maciej, I will submit the new version with the
> > space before "ax" (and of course, the ".previous").
>
> save your time, this is already applied and I won't rebase the branch
> just because of this minor bisection problem.
But this series lacks a tested-by from Jiaxun Yang. The first patch is
so complicated because it should handle the pre MIPS III case, I have
no old MIPS hardware, Jiaxun said he has [1] but he hasn't tested it
by now.

[1] https://lore.kernel.org/linux-mips/20250315194002.13778-1-marco.crivellari@suse.com/T/#m632ac91077d4cbc750b8acaacef08cad8bfd29da

Huacai

>
> Thomas.
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea.                                                [ RFC1925, 2.3 ]
Re: [PATCH v7 2/2] MIPS: Move r4k_wait() to .cpuidle.text section
Posted by Maciej W. Rozycki 7 months, 3 weeks ago 
On Mon, 28 Apr 2025, Thomas Bogendoerfer wrote:

> > If it sounds good also to Maciej, I will submit the new version with the
> > space before "ax" (and of course, the ".previous").
> 
> save your time, this is already applied and I won't rebase the branch
> just because of this minor bisection problem.

 For the record we actually have 121 cases without a space vs 4 with one, 
so formatting is a non-issue here in my view.

  Maciej

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.