Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
MIME-Version: 1.0
References: <ZQC5jS/Kc/JiBEOa@p100>
In-Reply-To: <ZQC5jS/Kc/JiBEOa@p100>
From:   Huacai Chen <chenhuacai@kernel.org>
Date:   Fri, 15 Sep 2023 11:22:20 +0800
Message-ID: <CAAhV-H56oqmQhA1PKh3E6z0A04qfRPehQ8ATOiirAU2O+z=fgw@mail.gmail.com>
Subject: Re: [PATCH] LoongArch: Fix lockdep static memory detection
To:     Helge Deller <deller@gmx.de>
Cc:     WANG Xuerui <kernel@xen0n.name>, loongarch@lists.linux.dev,
        Guenter Roeck <linux@roeck-us.net>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Helge,

On Wed, Sep 13, 2023 at 3:18=E2=80=AFAM Helge Deller <deller@gmx.de> wrote:
>
> Since commit 0a6b58c5cd0d ("lockdep: fix static memory detection even
> more") the lockdep code uses is_kernel_core_data(), is_kernel_rodata()
> and init_section_contains() to verify if a lock is located inside a
> kernel static data section.
>
> This change triggers a failure on LoongArch, for which the vmlinux.lds.S
> script misses to put the locks (as part of in the .data.rel symbols)
> into the Linux data section.
> This patch fixes the lockdep problem by moving *(.data.rel*) symbols
> into the kernel data section (from _sdata to _edata).
>
> Additionally, move other wrongly assigned symbols too:
> - altinstructions into the _initdata section,
I think altinstructions cannot  be put into _initdata because it will
be used by modules.

Huacai

> - PLT symbols behind the read-only section, and
> - *(.la_abs) into the data section.
>
> Signed-off-by: Helge Deller <deller@gmx.de>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Fixes: 0a6b58c5cd0d ("lockdep: fix static memory detection even more")
> Cc: stable <stable@kernel.org> # v6.4+
>
> diff --git a/arch/loongarch/kernel/vmlinux.lds.S b/arch/loongarch/kernel/=
vmlinux.lds.S
> index b1686afcf876..bb2ec86f37a8 100644
> --- a/arch/loongarch/kernel/vmlinux.lds.S
> +++ b/arch/loongarch/kernel/vmlinux.lds.S
> @@ -53,33 +53,6 @@ SECTIONS
>         . =3D ALIGN(PECOFF_SEGMENT_ALIGN);
>         _etext =3D .;
>
> -       /*
> -        * struct alt_inst entries. From the header (alternative.h):
> -        * "Alternative instructions for different CPU types or capabilit=
ies"
> -        * Think locking instructions on spinlocks.
> -        */
> -       . =3D ALIGN(4);
> -       .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
> -               __alt_instructions =3D .;
> -               *(.altinstructions)
> -               __alt_instructions_end =3D .;
> -       }
> -
> -#ifdef CONFIG_RELOCATABLE
> -       . =3D ALIGN(8);
> -       .la_abs : AT(ADDR(.la_abs) - LOAD_OFFSET) {
> -               __la_abs_begin =3D .;
> -               *(.la_abs)
> -               __la_abs_end =3D .;
> -       }
> -#endif
> -
> -       .got : ALIGN(16) { *(.got) }
> -       .plt : ALIGN(16) { *(.plt) }
> -       .got.plt : ALIGN(16) { *(.got.plt) }
> -
> -       .data.rel : { *(.data.rel*) }
> -
>         . =3D ALIGN(PECOFF_SEGMENT_ALIGN);
>         __init_begin =3D .;
>         __inittext_begin =3D .;
> @@ -94,6 +67,18 @@ SECTIONS
>
>         __initdata_begin =3D .;
>
> +       /*
> +        * struct alt_inst entries. From the header (alternative.h):
> +        * "Alternative instructions for different CPU types or capabilit=
ies"
> +        * Think locking instructions on spinlocks.
> +        */
> +       . =3D ALIGN(4);
> +       .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
> +               __alt_instructions =3D .;
> +               *(.altinstructions)
> +               __alt_instructions_end =3D .;
> +       }
> +
>         INIT_DATA_SECTION(16)
>         .exit.data : {
>                 EXIT_DATA
> @@ -113,6 +98,11 @@ SECTIONS
>
>         _sdata =3D .;
>         RO_DATA(4096)
> +
> +       .got : ALIGN(16) { *(.got) }
> +       .plt : ALIGN(16) { *(.plt) }
> +       .got.plt : ALIGN(16) { *(.got.plt) }
> +
>         RW_DATA(1 << CONFIG_L1_CACHE_SHIFT, PAGE_SIZE, THREAD_SIZE)
>
>         .rela.dyn : ALIGN(8) {
> @@ -121,6 +111,17 @@ SECTIONS
>                 __rela_dyn_end =3D .;
>         }
>
> +       .data.rel : { *(.data.rel*) }
> +
> +#ifdef CONFIG_RELOCATABLE
> +       . =3D ALIGN(8);
> +       .la_abs : AT(ADDR(.la_abs) - LOAD_OFFSET) {
> +               __la_abs_begin =3D .;
> +               *(.la_abs)
> +               __la_abs_end =3D .;
> +       }
> +#endif
> +
>         .sdata : {
>                 *(.sdata)
>         }