Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 12 Aug 2023 17:48:52 +0200
From:   Helge Deller <deller@gmx.de>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org,
        Guenter Roeck <linux@roeck-us.net>,
        Borislav Petkov <bp@suse.de>,
        Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH] lockdep: Fix static memory detection even more
Message-ID: <ZNep5EcYskP9HtGD@p100>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
UI-OutboundReport: notjunk:1;M01:P0:FQuwPfMEExY=;0JYJ1lo7wRKTut9LtUqVC1gCdxn
 cqA6IjESb79Fst17BdqiY//gP9sRdNViukWNjBbrLbSrmL/I0267DW2CLXR4aMkztB5ZIwC1J
 m1pw+iF7wl2G5yhVVmjMqlBCkaL6X7gcww2tOGjP4n2r24GtttypEzCTDUHdNtDatC9ZsLHy8
 6ngAUkx3qXiYB13r0rj7ZDrk8Exrj8MRBdGh+rxBbvP0JPugMBYR+QAWfws8eKZMfL1mUQ6Qb
 9ppGDVRn86xowoG8gzCbxTIFPjj0f//pqdOuXB6LVZibMKRoz1pqXRy5pJSNbNyIg+2yjVdP+
 Z7aIQuQ+0Nze57gQidbipSrOTB321PEIxU3fYQ3FzFacnEH8deDzD6FOFs3/59ITP78P4H0Ka
 49K8Vt2DjEDCBYVzW1sLb0PuflsYO2Oy8Y33aF8pGTGD4/eb2z8bOuotpLOgltKA3FfLTtk47
 n5hfn+JkscqiU/ojDZ+4sRXNdyMwUH9hU119zcwDFpAsH4WUHjhYFWB2AYqLtyBJjL/8l8zrZ
 wajni0bjSxw86vmmBpFCJYpHogZu9386UVrvphg1+T91UjtV05refULoCb5lwPVaDjTBXnixD
 Uo7UMSqBBjVbzEvmBr/RoRSvTJDa8DhjlYr6EhDnJTFjXmxo/2KV5aq1/b2d8zG26gdcZFUrK
 NXYPWuXBaNTwdSUY5na2Nb1a6TvVNGz40Z2dtvfHZxGJPTOg48vxDfllP2GXh6qFJLwC6sJky
 /VmkbA9DIwDHxZd4TJ4ljufD1RZAPvAKnzdDxAHzM1d1gVMYpH9GzTXDRefYhIYXlFkSPgoJQ
 eiQPbIHuBwijAiQDL0SuIUdrI7573NFTsbXJeonWsyQWXSx5U61Mj6Ajvjg8pBCRY4ZB9FKaO
 SHSRASFrLGqfc5SgN/KzUbHQUC52RX6n/jOWKpx/2xpaoivS8gV8la5Ma1cvZpel2gE+nWSgT
 PruKjg==
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On the parisc architecture, lockdep reports for all static objects which
are in the __initdata section (e.g. "setup_done" in devtmpfs,
"kthreadd_done" in init/main.c) this warning:

	INFO: trying to register non-static key.

The warning itself is wrong, because those objects are in the __initdata
section, but the section itself is on parisc outside of range from
_stext to _end, which is why the static_obj() functions returns a wrong
answer.

While fixing this issue, I noticed that the whole existing check can
be simplified a lot.
Instead of checking against the _stext and _end symbols (which include
code areas too) just check for the .data and .bss segments (since we check=
 a
data object). This can be done with the existing is_kernel_core_data()
macro.

In addition objects in the __initdata section can be checked with
init_section_contains().

This partly reverts and simplifies commit bac59d18c701 ("x86/setup: Fix st=
atic
memory detection").

Tested on x86-64 and parisc.

Signed-off-by: Helge Deller <deller@gmx.de>
Fixes: bac59d18c701 ("x86/setup: Fix static memory detection")

=2D--

diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sectio=
ns.h
index a6e8373a5170..3fa87e5e11ab 100644
=2D-- a/arch/x86/include/asm/sections.h
+++ b/arch/x86/include/asm/sections.h
@@ -2,8 +2,6 @@
 #ifndef _ASM_X86_SECTIONS_H
 #define _ASM_X86_SECTIONS_H

-#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed
-
 #include <asm-generic/sections.h>
 #include <asm/extable.h>

@@ -18,20 +16,4 @@ extern char __end_of_kernel_reserve[];

 extern unsigned long _brk_start, _brk_end;

-static inline bool arch_is_kernel_initmem_freed(unsigned long addr)
-{
-	/*
-	 * If _brk_start has not been cleared, brk allocation is incomplete,
-	 * and we can not make assumptions about its use.
-	 */
-	if (_brk_start)
-		return 0;
-
-	/*
-	 * After brk allocation is complete, space between _brk_end and _end
-	 * is available for allocation.
-	 */
-	return addr >=3D _brk_end && addr < (unsigned long)&_end;
-}
-
 #endif	/* _ASM_X86_SECTIONS_H */
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 111607d91489..957b785d0b59 100644
=2D-- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -819,34 +819,20 @@ static int very_verbose(struct lock_class *class)
  * Is this the address of a static object:
  */
 #ifdef __KERNEL__
-/*
- * Check if an address is part of freed initmem. After initmem is freed,
- * memory can be allocated from it, and such allocations would then have
- * addresses within the range [_stext, _end].
- */
-#ifndef arch_is_kernel_initmem_freed
-static int arch_is_kernel_initmem_freed(unsigned long addr)
-{
-	if (system_state < SYSTEM_FREEING_INITMEM)
-		return 0;
-
-	return init_section_contains((void *)addr, 1);
-}
-#endif
-
 static int static_obj(const void *obj)
 {
-	unsigned long start =3D (unsigned long) &_stext,
-		      end   =3D (unsigned long) &_end,
-		      addr  =3D (unsigned long) obj;
+	unsigned long addr =3D (unsigned long) obj;

-	if (arch_is_kernel_initmem_freed(addr))
-		return 0;
+	if (is_kernel_core_data(addr))
+		return 1;

 	/*
-	 * static variable?
+	 * in initdata section and used during bootup only?
+	 * NOTE: On some platforms the initdata section is
+	 * outside of the _stext ... _end range.
 	 */
-	if ((addr >=3D start) && (addr < end))
+	if (system_state < SYSTEM_FREEING_INITMEM &&
+		init_section_contains((void *)addr, 1))
 		return 1;

 	/*