linux-kernel - [PATCH] x86: don't re-generate cpufeaturemasks.h so eagerly

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <Z-uO9kK0QLuKfczo@gmail.com>
Date: Tue, 1 Apr 2025 09:00:06 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Jakub Kicinski <kuba@...nel.org>,
	Masahiro Yamada <masahiroy@...nel.org>,
	"H. Peter Anvin (Intel)" <hpa@...or.com>,
	Michael Kelley <mhklinux@...look.com>,
	"Xin Li (Intel)" <xin@...or.com>,
	"Borislav Petkov (AMD)" <bp@...en8.de>,
	Nikolay Borisov <nik.borisov@...e.com>,
	"x86@...nel.org" <x86@...nel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86: don't re-generate cpufeaturemasks.h so eagerly


* Linus Torvalds <torvalds@...ux-foundation.org> wrote:

> On Fri, 28 Mar 2025 at 17:14, Linus Torvalds
> <torvalds@...ux-foundation.org> wrote:
> >
> > So I think the real fix is something like this ENTIRELY UNTESTED
> > patch.  Whitespace-damaged again to make sure people don't apply this
> > mindlessly, it needs more thought:
> 
> .. and that ended up being even more whitespace-damaged than I meant
> to make it, because it also line-wrapped.
> 
> Oh well. Not pretty, but I hope people still get the idea.
> 
> And I just actually tried doing a build after touching the .config
> file, and it did seem to work.
> 
> But since I had _also_ messed with the config file on purpose earlier,
> I'm not sure I'm actually testing the thing the networking builds
> trigger. So I might be entirely missing something.
> 
> Adding Masahiro to the cc, so that somebody competent can actually
> check my thinking.
> 
> Masahiro, see the complaint (and my reply) in
> 
>     https://lore.kernel.org/all/20250328162311.08134fa6@kernel.org/
> 
> for background...

Just an update: Linus applied the fix below directly, which should 
resolve the problem. Thanks Linus!

Thanks,

	Ingo

==============>
From: Linus Torvalds <torvalds@...ux-foundation.org>
Date: Mon, 31 Mar 2025 14:19:55 -0700
Subject: [PATCH] x86: don't re-generate cpufeaturemasks.h so eagerly

It turns out the code to generate the x86 cpufeaturemasks.h header was
way too aggressive, and would re-generate it whenever the timestamp on
the kernel config file changed.

Now, the regular 'make *config' tools are fairly careful to not rewrite
the kernel config file unless the contents change, but other usecases
aren't that careful.

Michael Kelley reports that 'make-kpkg' ends up doing "make syncconfig"
multiple times in prepping to build, and will modify the config file in
the process (and then modify it back, but by then the timestamps have
changed).

Jakub Kicinski reports that the netdev CI does something similar in how
it generates the config file in multiple steps.

In both cases, the config file timestamp updates then cause the
cpufeaturemasks.h file to be regenerated, and that in turn then causes
lots of unnecessary rebuilds due to all the normal dependencies.

Fix it by using our 'filechk' infrastructure in the Makefile to generate
the header file.  That will only write a new version of the file if the
contents of the file have actually changed.

Fixes: 841326332bcb ("x86/cpufeatures: Generate the <asm/cpufeaturemasks.h> header based on build config")
Reported-by: Michael Kelley <mhklinux@...look.com>
Reported-by: Jakub Kicinski <kuba@...nel.org>
Link: https://lore.kernel.org/all/SN6PR02MB415756D1829740F6E8AC11D1D4D82@SN6PR02MB4157.namprd02.prod.outlook.com/
Link: https://lore.kernel.org/all/20250328162311.08134fa6@kernel.org/
Cc: Peter Anvin <hpa@...or.com>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
---
 arch/x86/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 0fc7e8fd1a2e..27efe2dc2aa8 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -277,12 +277,11 @@ cpufeaturemasks.hdr := arch/x86/include/generated/asm/cpufeaturemasks.h
 cpufeaturemasks.awk := $(srctree)/arch/x86/tools/cpufeaturemasks.awk
 cpufeatures_hdr := $(srctree)/arch/x86/include/asm/cpufeatures.h
 targets += $(cpufeaturemasks.hdr)
-quiet_cmd_gen_featuremasks = GEN     $@
-      cmd_gen_featuremasks = $(AWK) -f $(cpufeaturemasks.awk) $(cpufeatures_hdr) $(KCONFIG_CONFIG) > $@
+      filechk_gen_featuremasks = $(AWK) -f $(cpufeaturemasks.awk) $(cpufeatures_hdr) $(KCONFIG_CONFIG)
 
 $(cpufeaturemasks.hdr): $(cpufeaturemasks.awk) $(cpufeatures_hdr) $(KCONFIG_CONFIG) FORCE
 	$(shell mkdir -p $(dir $@))
-	$(call if_changed,gen_featuremasks)
+	$(call filechk,gen_featuremasks)
 archprepare: $(cpufeaturemasks.hdr)
 
 ###