From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 19 Mar 2025 13:05:34 +0000 (-0400)
Subject: Merge tag 'kvm-x86-selftests-6.15' of https://github.com/kvm-x86/linux into HEAD
X-Git-Tag: v6.15-rc1~195^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=783e9cd05cd015ac509ffc358e92f1d71f47500c;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'kvm-x86-selftests-6.15' of https://github.com/kvm-x86/linux into HEAD

KVM selftests changes for 6.15, part 2

 - Fix a variety of flaws, bugs, and false failures/passes dirty_log_test, and
   improve its coverage by collecting all dirty entries on each iteration.

 - Fix a few minor bugs related to handling of stats FDs.

 - Add infrastructure to make vCPU and VM stats FDs available to tests by
   default (open the FDs during VM/vCPU creation).

 - Relax an assertion on the number of HLT exits in the xAPIC IPI test when
   running on a CPU that supports AMD's Idle HLT (which elides interception of
   HLT if a virtual IRQ is pending and unmasked).

 - Misc cleanups and fixes.
---

783e9cd05cd015ac509ffc358e92f1d71f47500c
diff --cc tools/testing/selftests/kvm/include/x86/processor.h
index e28c3e462fa73,a968a56dcb6e7..32ab6ca7ec325
--- a/tools/testing/selftests/kvm/include/x86/processor.h
+++ b/tools/testing/selftests/kvm/include/x86/processor.h
@@@ -200,10 -197,9 +200,11 @@@ struct kvm_x86_cpu_feature 
  #define X86_FEATURE_PAUSEFILTER         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 10)
  #define X86_FEATURE_PFTHRESHOLD         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 12)
  #define	X86_FEATURE_VGIF		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16)
+ #define X86_FEATURE_IDLE_HLT		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 30)
  #define X86_FEATURE_SEV			KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1)
  #define X86_FEATURE_SEV_ES		KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3)
 +#define	X86_FEATURE_PERFMON_V2		KVM_X86_CPU_FEATURE(0x80000022, 0, EAX, 0)
 +#define	X86_FEATURE_LBR_PMC_FREEZE	KVM_X86_CPU_FEATURE(0x80000022, 0, EAX, 2)
  
  /*
   * KVM defined paravirt features.