From nobody Sun Dec 14 19:14:05 2025 Received: from mail.zytor.com (terminus.zytor.com [198.137.202.136]) (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 9512086244; Thu, 9 May 2024 21:18:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.136 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289487; cv=none; b=DA/UpMdRGU/k66KtSTdHPdtQwfOZGr0vNX1fVseZhqEdH/OuWbMdz9INZgywbLMOKMRuyxZlv69bpMnKUWlbKjofwWB62u+xDKf0HZ3FirUlaHDDSnPar6hATXVcfPnBXV5XknWwviPR1mAIWN4iLSo/bQmiD0wegSI4H9ED5pg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289487; c=relaxed/simple; bh=hglL0exCKjz/E+QzHIuBkoQgPJXIjr7oH1aPnKQ+0So=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e6huKjt71gEq9JGUeiZlhyth0PnlISeD8wm4GG9W/y57CBUn0PZYPItbpey6aNod1fSgY5I4+b/1hCO8W6SPGr4p8zlT2TmOuaI7hj2HeEBvHW2ZQ1EyLemnXpw2hdAnhjb+gogA9wNVWj/ijDXHk1hR0K3CLBWdKOZm2gg96as= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com; spf=pass smtp.mailfrom=zytor.com; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b=CKwN7ElF; arc=none smtp.client-ip=198.137.202.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zytor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="CKwN7ElF" Received: from terminus.zytor.com (terminus.zytor.com [IPv6:2607:7c80:54:3:0:0:0:136]) (authenticated bits=0) by mail.zytor.com (8.17.2/8.17.1) with ESMTPSA id 449KrevT275586 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 9 May 2024 13:53:46 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 449KrevT275586 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2024041401; t=1715288027; bh=OTVyo9YSZWN/DVt1cJEYkHWbfxp9X5uqNNbX2ey6OEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CKwN7ElFF/6ssDeGIstMy8aredFlRF/gusg7Uh5E2XAChgJ684lIk4GhMrxnY9w4r lYDaNKbI06ZQMmynD0gY6iMlZtcYxsRZVwf+/h26QdCfZMtAEt3ckRCxc0HlLK27pe nXf/eSfAuThUu+9iol42fplC7KCKcUpXc6utAXKTmIGVelzjj/F4Aex+ey6Bwm4HNY ix44WZhLVHLgZuak4HH4YB/KwUFoMs6ZW8uzhbdphHSOCFSwmw2fC6N1pfwWkqjd6A BF28WLkvJlzbbr++9qd69Y7mXPyu4wf8mEF6M3DTGZz6jPA9u48vqUu/CSiaBDq7ky CLdsV0PD9pfMQ== From: "Xin Li (Intel)" To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, will@kernel.org, peterz@infradead.org, akpm@linux-foundation.org, acme@kernel.org, namhyung@kernel.org Subject: [RESEND v1 2/3] x86/cpufeatures: Generate a feature mask header based on build config Date: Thu, 9 May 2024 13:53:39 -0700 Message-ID: <20240509205340.275568-3-xin@zytor.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509205340.275568-1-xin@zytor.com> References: <20240509205340.275568-1-xin@zytor.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "H. Peter Anvin (Intel)" Introduce an AWK script to auto-generate a header with required and disabled feature masks based on and 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. Besides, the generated required and disabled feature masks will be added to their corresponding CPU feature masks automatically. [ Xin: build integration improvements ] Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li (Intel) --- arch/x86/Makefile | 17 ++++- 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 | 1 + arch/x86/tools/featuremasks.awk | 108 +++++++++++++++++++++++++++++ 9 files changed, 129 insertions(+), 14 deletions(-) create mode 100755 arch/x86/tools/featuremasks.awk diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 5ab93fcdd691..2a364fe0a5b4 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -241,9 +241,22 @@ archscripts: scripts_basic $(Q)$(MAKE) $(build)=3Darch/x86/tools relocs =20 ### -# Syscall table generation +# Feature masks header and syscall table generation =20 -archheaders: +out :=3D arch/x86/include/generated/asm +featuremasks_hdr :=3D featuremasks.h +featuremasks_awk :=3D $(srctree)/arch/x86/tools/featuremasks.awk +cpufeatures_hdr :=3D $(srctree)/arch/x86/include/asm/cpufeatures.h +quiet_cmd_gen_featuremasks =3D GEN $@ + cmd_gen_featuremasks =3D $(AWK) -f $(featuremasks_awk) $(cpufeatures= _hdr) $(KCONFIG_CONFIG) > $@ + +$(out)/$(featuremasks_hdr): $(featuremasks_awk) $(cpufeatures_hdr) $(KCONF= IG_CONFIG) FORCE + $(shell mkdir -p $(out)) + $(call if_changed,gen_featuremasks) + +targets +=3D $(out)/$(featuremasks_hdr) + +archheaders: $(out)/$(featuremasks_hdr) $(Q)$(MAKE) $(build)=3Darch/x86/entry/syscalls all =20 ### diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index fed8d13ce252..49b982c4e932 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 d75237ba7ce9..0cabdacb2a2f 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 da0ccc5de538..b90110109675 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 a192bdea69e2..29c3481f40fc 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 featuremasks.h =20 generic-y +=3D early_ioremap.h generic-y +=3D mcs_spinlock.h diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufe= ature.h index 0b9611da6c53..8332f596ba3c 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 3c7434329661..05503448b94d 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 1258a5872d12..3205cbb47b9c 100644 --- a/arch/x86/kernel/verify_cpu.S +++ b/arch/x86/kernel/verify_cpu.S @@ -29,6 +29,7 @@ */ =20 #include +#include #include =20 SYM_FUNC_START_LOCAL(verify_cpu) diff --git a/arch/x86/tools/featuremasks.awk b/arch/x86/tools/featuremasks.= awk new file mode 100755 index 000000000000..2af32c60fc76 --- /dev/null +++ b/arch/x86/tools/featuremasks.awk @@ -0,0 +1,108 @@ +#!/usr/bin/awk +# +# Convert cpufeatures.h to a list of compile-time masks +# Note: this blithly assumes that each word has at least one +# feature defined in it; if not, something else is wrong! +# + +BEGIN { + printf "#ifndef _ASM_X86_FEATUREMASKS_H\n"; + printf "#define _ASM_X86_FEATUREMASKS_H\n\n"; + + file =3D 0 +} + +BEGINFILE { + switch (++file) { + case 1: # cpufeatures.h + FPAT =3D "#[ \t]*[a-z]+|[A-Za-z0-9_]+|[^ \t]"; + break; + case 2: # .config + FPAT =3D "CONFIG_[A-Z0-9_]+|is not set|[yn]"; + break; + } +} + +file =3D=3D 1 && $1 ~ /^#[ \t]*define$/ && $2 ~ /^X86_FEATURE_/ && +$3 =3D=3D "(" && $5 =3D=3D "*" && $7 =3D=3D "+" && $9 =3D=3D ")" { + nfeat =3D $4 * $6 + $8; + feat =3D $2; + sub(/^X86_FEATURE_/, "", feat); + feats[nfeat] =3D feat; +} +file =3D=3D 1 && $1 ~ /^#[ \t]*define$/ && $2 =3D=3D "NCAPINTS" { + ncapints =3D strtonum($3); +} + +file =3D=3D 2 && $1 ~ /^CONFIG_X86_[A-Z]*_FEATURE_/ { + on =3D ($2 =3D=3D "y"); + printf "/* %s =3D %s (%d) */\n", $1, $2, on; + if (split($1, fs, "CONFIG_X86_|_FEATURE_") =3D=3D 3) { + printf "/* %s %s =3D %d */\n", fs[2], fs[3], on; + 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++) { + nfeat =3D i*32 + j; + feat =3D feats[nfeat]; + if (feat) { + st =3D !!featstat[s, feat]; + if (st) { + nfstr =3D fstr " " feat; + if (length(nfstr) > 72) { + printf " * %s\n", fstr; + nfstr =3D " " feat; + } + fstr =3D nfstr; + } + mask +=3D st * (2 ^ j); + } + } + masks[i] =3D mask; + } + printf " * %s\n */\n\n", fstr; + + for (i =3D 0; i < ncapints; i++) { + printf "#define %s_MASK%-3d 0x%08x\n", s, i, masks[i]; + } + + printf "\n#define %s_MASKS ", s; + pfx =3D "{"; + for (i =3D 0; i < ncapints; i++) { + printf "%s \\\n\t%s_MASK_%d", pfx, s, i; + pfx =3D ","; + } + printf " \\\n}\n\n"; + + printf "#define %s_FEATURE(x) \\\n", s; + printf "\t((( "; + for (i =3D 0; i < ncapints; i++) { + if (masks[i]) { + printf "\\\n\t\t((x) >> 5) =3D=3D %2d ? %s_MASK%-3d : ", i, s, i; + } + } + printf "0 \\\n"; + printf "\t) >> ((x) & 31)) & 1)\n\n"; + + printf "#define %s_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS !=3D %d)\n\n", = s, ncapints; + } + + printf "#define SSE_MASK\t\\\n"; + printf "\t(REQUIRED_MASK0 & ((1<<(X86_FEATURE_XMM & 31)) | (1<<(X86_FEATU= RE_XMM2 & 31))))\n\n"; + + printf "#endif /* _ASM_X86_FEATUREMASKS_H */\n"; +} --=20 2.45.0