The kernel has a set of utilities and definitions to deal with x86 cpu features. The x86 KVM selftests don't use them, and instead have evolved to use differing and ad-hoc methods for checking features. The advantage of the kernel feature definitions is that they use a format that embeds the info needed to extract them from cpuid (function, index, and register to use). Patches 1 and 2 add a script for checking that kernel headers don't drift from their original copies. Patches 3 and 4 massage the related cpuid header files in the kernel side, then copy them into tools/ so they can be included by selftests. The last 2 patches replace the tests checking for cpu features to use the definitions and utilities introduced from the kernel. Tested the arch/x86 patches by building these combinations: ARCH=i386 allmodconfig ARCH=i386 allyesconfig ARCH=x86_64 allyesconfig ARCH=x86_64 allmodconfig ARCH=um alldefconfig ARCH=i386 alldefconfig and the selftest changes on both x86 and arm64. Thanks, Ricardo v2: - Add script to check for kernel headers drift in tools - Sync header that is currently failing the check - Move header copies under tools/testing/selftests/kvm/include/x86 instead of tools/arch/x86/include v1: https://lore.kernel.org/kvm/20210422005626.564163-1-ricarkol@xxxxxxxxxx Ricardo Koller (6): KVM: selftests: Add kernel headers sync check tools headers x86: Update bitsperlong.h in tools x86/cpu: Expose CPUID regs, leaf and index definitions to tools tools headers x86: Copy cpuid helpers from the kernel KVM: selftests: Introduce utilities for checking x86 features KVM: selftests: Use kernel x86 cpuid features format arch/x86/events/intel/pt.c | 1 + arch/x86/include/asm/cpufeature.h | 23 +- arch/x86/include/asm/processor.h | 11 - arch/x86/kernel/cpu/scattered.c | 2 +- arch/x86/kernel/cpuid.c | 2 +- tools/arch/x86/include/asm/cpufeatures.h | 3 + tools/include/uapi/asm-generic/bitsperlong.h | 1 + tools/testing/selftests/kvm/Makefile | 2 + tools/testing/selftests/kvm/check-headers.sh | 64 +++++ .../kvm/include/x86_64/asm/cpufeature.h | 257 ++++++++++++++++++ .../selftests/kvm/include/x86_64/cpuid.h | 61 +++++ .../selftests/kvm/include/x86_64/processor.h | 16 -- .../kvm/include/x86_64/reverse_cpuid.h | 185 +++++++++++++ .../selftests/kvm/include/x86_64/svm_util.h | 11 +- tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 5 +- tools/testing/selftests/kvm/steal_time.c | 5 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 23 +- .../selftests/kvm/x86_64/set_sregs_test.c | 25 +- .../selftests/kvm/x86_64/vmx_pmu_msrs_test.c | 8 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 5 +- .../selftests/kvm/x86_64/xss_msr_test.c | 10 +- 22 files changed, 630 insertions(+), 96 deletions(-) create mode 100755 tools/testing/selftests/kvm/check-headers.sh create mode 100644 tools/testing/selftests/kvm/include/x86_64/asm/cpufeature.h create mode 100644 tools/testing/selftests/kvm/include/x86_64/cpuid.h create mode 100644 tools/testing/selftests/kvm/include/x86_64/reverse_cpuid.h -- 2.31.1.498.g6c1eba8ee3d-goog
