From nobody Thu Dec 18 12:32:31 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BC0525E465; Wed, 19 Mar 2025 11:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382245; cv=none; b=XwrgVyby93R8N1eF9Xfpen8sZYHqYeZupTqeX8ParPFpJ6npw7gqTTWQHmsTHWXaTqk5/2wqi+LKOIid9GHHqhRWWySPPLpfStdNQi3ynUU54qj0K7kLIwBbioT5DEE04IFCY7jeh1d4iOUafto1mKbK1U2FlabPhd2kUZmUkog= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742382245; c=relaxed/simple; bh=dMkKJClcQbfZVXuRXtIec8pj7pynyS11EVPRDQ4M8VI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RSW8pP0aFeDi4HMgXyODU/iBXW1WYQaMNX/U2+E1rAtfORoEjkFI6ND+Arrejt3Ywc+nvtqARgNLhrb9XICzjgmfo2NfIOSCKJIgz9bVU3wlQXiZeX0TokrLKd5di3w/rOgTcGuC4MRfZFhbTnnFc/0/DcxlrWOLAmuyX9Cu2AA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zW/19k43; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Ztscujk7; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zW/19k43"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Ztscujk7" Date: Wed, 19 Mar 2025 11:03:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1742382240; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kZGtCkuhm6iQkUP9sKMEglk59R56GZ1vQhTx5BppSjY=; b=zW/19k43Xt55gbGsrUJZt4zGyp6X/mpX+faU9JNWEVQqr67BphAEfhoAzHCnwVAlBWQXl1 quc82GNXFi1ibn5ISYNdAcx7rbjaAMkwwd1zCm6PLwkfBWa90cilQDJIX4mGY3LSIHsjb+ K4GtIrlVKovUQ9MtxaqmH+Q7DXH+omJUyJH1V447np4LBhpKt4OUNzqFN/pj9RcGBGYS1k aI/dLap0V39kbYNiF5oTOlk20SP1dQ2Fi8bxEhPVRnAxpz9by5r2np1SjPl/bMqnvI0UlU ar7lULu7cwtCh0L740dlLvaxXqsFhfJsWLN4ATMckbKxRiXeBFdKS+/c057I6g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1742382240; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kZGtCkuhm6iQkUP9sKMEglk59R56GZ1vQhTx5BppSjY=; b=Ztscujk72dpEhDoUXaJAeGeLYB4ROv3ANy9UhNcs18bYfku5ht0P48uweN1WA0MubTnT/X 8G5AM72B0h/TXfBg== From: "tip-bot2 for H. Peter Anvin (Intel)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/cpufeatures: Generate the header based on build config Cc: "H. Peter Anvin (Intel)" , "Xin Li (Intel)" , "Borislav Petkov (AMD)" , Ingo Molnar , Nikolay Borisov , Linus Torvalds , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250305184725.3341760-3-xin@zytor.com> References: <20250305184725.3341760-3-xin@zytor.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174238223959.14745.6970497940010271580.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/core branch of tip: Commit-ID: 841326332bcb13ae4e6cd456350bf566a402b45e Gitweb: https://git.kernel.org/tip/841326332bcb13ae4e6cd456350bf566a= 402b45e Author: H. Peter Anvin (Intel) AuthorDate: Wed, 05 Mar 2025 10:47:22 -08:00 Committer: Ingo Molnar CommitterDate: Wed, 19 Mar 2025 11:15:11 +01:00 x86/cpufeatures: Generate the header based on build= config Introduce an AWK script to auto-generate the header with required and disabled feature masks based on and the current build config. Thus for any CPU feature with a build config, e.g., X86_FRED, simply add: config X86_DISABLED_FEATURE_FRED def_bool y depends on !X86_FRED to arch/x86/Kconfig.cpufeatures, instead of adding a conditional CPU feature disable flag, e.g., DISABLE_FRED. Lastly, the generated required and disabled feature masks will be added to their corresponding feature masks for this particular compile-time configuration. [ Xin: build integration improvements ] [ mingo: Improved changelog and comments ] Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li (Intel) Signed-off-by: Borislav Petkov (AMD) Signed-off-by: Ingo Molnar Reviewed-by: Nikolay Borisov Cc: Linus Torvalds Link: https://lore.kernel.org/r/20250305184725.3341760-3-xin@zytor.com --- arch/x86/Makefile | 15 +++++- arch/x86/boot/cpucheck.c | 3 +- arch/x86/boot/cpuflags.c | 1 +- arch/x86/boot/mkcpustr.c | 3 +- arch/x86/include/asm/Kbuild | 1 +- arch/x86/include/asm/cpufeature.h | 1 +- arch/x86/include/asm/cpufeatures.h | 8 +--- arch/x86/kernel/verify_cpu.S | 4 +- arch/x86/tools/cpufeaturemasks.awk | 81 +++++++++++++++++++++++++++++- 9 files changed, 105 insertions(+), 12 deletions(-) create mode 100755 arch/x86/tools/cpufeaturemasks.awk diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 6784129..a607769 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -269,6 +269,21 @@ archheaders: $(Q)$(MAKE) $(build)=3Darch/x86/entry/syscalls all =20 ### +# header generation + +cpufeaturemasks.hdr :=3D arch/x86/include/generated/asm/cpufeaturemasks.h +cpufeaturemasks.awk :=3D $(srctree)/arch/x86/tools/cpufeaturemasks.awk +cpufeatures_hdr :=3D $(srctree)/arch/x86/include/asm/cpufeatures.h +targets +=3D $(cpufeaturemasks.hdr) +quiet_cmd_gen_featuremasks =3D GEN $@ + cmd_gen_featuremasks =3D $(AWK) -f $(cpufeaturemasks.awk) $(cpufeatu= res_hdr) $(KCONFIG_CONFIG) > $@ + +$(cpufeaturemasks.hdr): $(cpufeaturemasks.awk) $(cpufeatures_hdr) $(KCONFI= G_CONFIG) FORCE + $(shell mkdir -p $(dir $@)) + $(call if_changed,gen_featuremasks) +archprepare: $(cpufeaturemasks.hdr) + +### # Kernel objects =20 libs-y +=3D arch/x86/lib/ diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index 0aae4d4..f82de8d 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c @@ -22,10 +22,11 @@ # include "boot.h" #endif #include +#include #include #include -#include #include + #include "string.h" #include "msr.h" =20 diff --git a/arch/x86/boot/cpuflags.c b/arch/x86/boot/cpuflags.c index d75237b..0cabdac 100644 --- a/arch/x86/boot/cpuflags.c +++ b/arch/x86/boot/cpuflags.c @@ -3,7 +3,6 @@ #include "bitops.h" =20 #include -#include #include #include "cpuflags.h" =20 diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c index da0ccc5..22d730b 100644 --- a/arch/x86/boot/mkcpustr.c +++ b/arch/x86/boot/mkcpustr.c @@ -12,8 +12,6 @@ =20 #include =20 -#include "../include/asm/required-features.h" -#include "../include/asm/disabled-features.h" #include "../include/asm/cpufeatures.h" #include "../include/asm/vmxfeatures.h" #include "../kernel/cpu/capflags.c" @@ -23,6 +21,7 @@ int main(void) int i, j; const char *str; =20 + printf("#include \n\n"); printf("static const char x86_cap_strs[] =3D\n"); =20 for (i =3D 0; i < NCAPINTS; i++) { diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 58f4dde..4566000 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -8,6 +8,7 @@ generated-y +=3D syscalls_x32.h generated-y +=3D unistd_32_ia32.h generated-y +=3D unistd_64_x32.h generated-y +=3D xen-hypercalls.h +generated-y +=3D cpufeaturemasks.h =20 generic-y +=3D early_ioremap.h generic-y +=3D fprobe.h diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufe= ature.h index e955da3..d54db88 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -9,6 +9,7 @@ #include #include #include +#include =20 enum cpuid_leafs { diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpuf= eatures.h index 8770dc1..c0462be 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -2,14 +2,6 @@ #ifndef _ASM_X86_CPUFEATURES_H #define _ASM_X86_CPUFEATURES_H =20 -#ifndef _ASM_X86_REQUIRED_FEATURES_H -#include -#endif - -#ifndef _ASM_X86_DISABLED_FEATURES_H -#include -#endif - /* * Defines x86 CPU feature bits */ diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S index 1258a58..37ad437 100644 --- a/arch/x86/kernel/verify_cpu.S +++ b/arch/x86/kernel/verify_cpu.S @@ -29,8 +29,12 @@ */ =20 #include +#include #include =20 +#define SSE_MASK \ + (REQUIRED_MASK0 & ((1<<(X86_FEATURE_XMM & 31)) | (1<<(X86_FEATURE_XMM2 & = 31)))) + SYM_FUNC_START_LOCAL(verify_cpu) pushf # Save caller passed flags push $0 # Kill any dangerous flags diff --git a/arch/x86/tools/cpufeaturemasks.awk b/arch/x86/tools/cpufeature= masks.awk new file mode 100755 index 0000000..59757ca --- /dev/null +++ b/arch/x86/tools/cpufeaturemasks.awk @@ -0,0 +1,81 @@ +#!/usr/bin/awk +# +# Convert cpufeatures.h to a list of compile-time masks +# Note: this blithely assumes that each word has at least one +# feature defined in it; if not, something else is wrong! +# + +BEGIN { + printf "#ifndef _ASM_X86_CPUFEATUREMASKS_H\n"; + printf "#define _ASM_X86_CPUFEATUREMASKS_H\n\n"; + + file =3D 0 +} + +FNR =3D=3D 1 { + ++file; + + # arch/x86/include/asm/cpufeatures.h + if (file =3D=3D 1) + FS =3D "[ \t()*+]+"; + + # .config + if (file =3D=3D 2) + FS =3D "=3D"; +} + +# Create a dictionary of sorts, containing all defined feature bits +file =3D=3D 1 && $1 ~ /^#define$/ && $2 ~ /^X86_FEATURE_/ { + nfeat =3D $3 * $4 + $5; + feat =3D $2; + sub(/^X86_FEATURE_/, "", feat); + feats[nfeat] =3D feat; +} +file =3D=3D 1 && $1 ~ /^#define$/ && $2 =3D=3D "NCAPINTS" { + ncapints =3D int($3); +} + +# Create a dictionary featstat[REQUIRED|DISABLED, FEATURE_NAME] =3D on | o= ff +file =3D=3D 2 && $1 ~ /^CONFIG_X86_(REQUIRED|DISABLED)_FEATURE_/ { + on =3D ($2 =3D=3D "y"); + if (split($1, fs, "CONFIG_X86_|_FEATURE_") =3D=3D 3) + featstat[fs[2], fs[3]] =3D on; +} + +END { + sets[1] =3D "REQUIRED"; + sets[2] =3D "DISABLED"; + + for (ns in sets) { + s =3D sets[ns]; + + printf "/*\n"; + printf " * %s features:\n", s; + printf " *\n"; + fstr =3D ""; + for (i =3D 0; i < ncapints; i++) { + mask =3D 0; + for (j =3D 0; j < 32; j++) { + feat =3D feats[i*32 + j]; + if (featstat[s, feat]) { + nfstr =3D fstr " " feat; + if (length(nfstr) > 72) { + printf " * %s\n", fstr; + nfstr =3D " " feat; + } + fstr =3D nfstr; + mask +=3D (2 ^ j); + } + } + masks[i] =3D mask; + } + printf " * %s\n */\n", fstr; + + for (i =3D 0; i < ncapints; i++) + printf "#define %s_MASK%d\t0x%08xU\n", s, i, masks[i]; + + printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS !=3D %d)\n\n", = s, ncapints; + } + + printf "#endif /* _ASM_X86_CPUFEATUREMASKS_H */\n"; +}