Skip to content

x86/cpufeatures: Automatically generate required and disabled feature masks

Xin Li (Intel) linux-perf-users lkml 8 versions – Applied

Status from this message: The following commit has been merged into the x86/cpu branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest4 patches 10 repliesApplied
  2. v65 patches 13 repliesApplied
  3. v55 patches 21 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v44 patches6 repliesSuperseded
v34 patches9 repliesSuperseded
v23 patches4 repliesSuperseded
v1 posting 2/23 patches5 repliesSuperseded
v1 posting 1/23 patches2 repliesSuperseded

Changes in v7 from the cover letter

* Fix build error with "make distclean; make headers" (Aithal, Srikanth)
* Collect reviewed-bys.

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/4x86/cpufeatures: Add {required,disabled} feature configsarch/x86/Kconfig arch/x86/Kconfig.cpufeatures+199 -00 replies
2/4x86/cpufeatures: Generate a feature mask header based on build configarch/x86/Makefile arch/x86/boot/cpucheck.c arch/x86/boot/cpuflags.c +6 more+105 -129 replies
3/4x86/cpufeatures: Remove {disabled,required}-features.harch/x86/include/asm/disabled-features.h arch/x86/include/asm/required-features.h tools/arch/x86/include/asm/cpufeatures.h +3 more+0 -5420 replies
4/4x86/cpufeatures: Use AWK to generate {REQUIRED|DISABLED}_MASK_BIT_SETarch/x86/include/asm/cpufeature.h arch/x86/tools/featuremasks.awk+8 -700 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchNikolay BorisovIngo MolnarBrian Gerst
1/4R-b
2/4R-b R-b
3/4R-b
4/4R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v7 thread

Cover letter [PATCH v7 0/4] x86/cpufeatures: Automatically generate required and disabled feature masks

The x86 build process first generates required and disabled feature masks based on current build config, and then uses these generated masks to compile the source code. When a CPU feature is not enabled in a build config, e.g., when CONFIG_X86_FRED=n, its feature disable flag, i.e., DISABLE_FRED, needs to be properly defined and added to a specific disabled CPU features mask in <asm/disabled-features.h>, as the following patch does:
https://lore.kernel.org/all/[email protected]/.
As a result, the FRED feature bit is surely cleared in the generated kernel binary when CONFIG_X86_FRED=n.

Recently there is another case to repeat the same exercise for the AMD SEV-SNP CPU feature:
https://lore.kernel.org/all/[email protected]/.
https://lore.kernel.org/all/[email protected]/.

It was one thing when there were four of CPU feature masks, but with over 20 it is going to cause mistakes, e.g.,
https://lore.kernel.org/lkml/[email protected]/.

We want to eliminate the stupidly repeated exercise to manually assign features to CPU feature words through introducing an AWK script to automatically generate a header with required and disabled CPU feature masks based on current build config, and this patch set does that.

Link to v6:
https://lore.kernel.org/lkml/[email protected]/

Changes in v7:
* Fix build error with "make distclean; make headers" (Aithal, Srikanth)
* Collect reviewed-bys.

H. Peter Anvin (Intel) (2):
x86/cpufeatures: Add {required,disabled} feature configs x86/cpufeatures: Generate a feature mask header based on build config

Xin Li (Intel) (2):
x86/cpufeatures: Remove {disabled,required}-features.h x86/cpufeatures: Use AWK to generate {REQUIRED|DISABLED}_MASK_BIT_SET

 arch/x86/Kconfig                              |   2 +
 arch/x86/Kconfig.cpufeatures                  | 197 ++++++++++++++++++
 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             |  70 +------
 arch/x86/include/asm/cpufeatures.h            |   8 -
 arch/x86/include/asm/disabled-features.h      | 161 --------------
 arch/x86/include/asm/required-features.h      | 105 ----------
 arch/x86/kernel/verify_cpu.S                  |   4 +
 arch/x86/tools/featuremasks.awk               |  88 ++++++++
 tools/arch/x86/include/asm/cpufeatures.h      |   8 -
 .../arch/x86/include/asm/disabled-features.h  | 161 --------------
 .../arch/x86/include/asm/required-features.h  | 105 ----------
 tools/perf/check-headers.sh                   |   2 -
 17 files changed, 311 insertions(+), 623 deletions(-)
 create mode 100644 arch/x86/Kconfig.cpufeatures
 delete mode 100644 arch/x86/include/asm/disabled-features.h
 delete mode 100644 arch/x86/include/asm/required-features.h
 create mode 100755 arch/x86/tools/featuremasks.awk
 delete mode 100644 tools/arch/x86/include/asm/disabled-features.h
 delete mode 100644 tools/arch/x86/include/asm/required-features.h

base-commit: 32dc26a2f55f71907af0874468298c6ab8a8f7f9

Signature · 1 line
2.48.1