Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e62493f authored by KarimAllah Ahmed's avatar KarimAllah Ahmed Committed by Radim Krčmář
Browse files

x86/headers/UAPI: Move DISABLE_EXITS KVM capability bits to the UAPI 



Move DISABLE_EXITS KVM capability bits to the UAPI just like the rest of
capabilities.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: x86@kernel.org
Cc: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarKarimAllah Ahmed <karahmed@amazon.de>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent a468f2db

arch/x86/kvm/x86.h

+0 −7
Original line number Diff line number Diff line
@@ -302,13 +302,6 @@ static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec) 
	    __rem;						\

	 })



#define KVM_X86_DISABLE_EXITS_MWAIT          (1 << 0)

#define KVM_X86_DISABLE_EXITS_HTL            (1 << 1)

#define KVM_X86_DISABLE_EXITS_PAUSE          (1 << 2)

#define KVM_X86_DISABLE_VALID_EXITS          (KVM_X86_DISABLE_EXITS_MWAIT | \

                                              KVM_X86_DISABLE_EXITS_HTL | \

                                              KVM_X86_DISABLE_EXITS_PAUSE)



static inline bool kvm_mwait_in_guest(struct kvm *kvm)

{

	return kvm->arch.mwait_in_guest;

include/uapi/linux/kvm.h

+7 −0
Original line number Diff line number Diff line
@@ -676,6 +676,13 @@ struct kvm_ioeventfd { 
	__u8  pad[36];

};



#define KVM_X86_DISABLE_EXITS_MWAIT          (1 << 0)

#define KVM_X86_DISABLE_EXITS_HTL            (1 << 1)

#define KVM_X86_DISABLE_EXITS_PAUSE          (1 << 2)

#define KVM_X86_DISABLE_VALID_EXITS          (KVM_X86_DISABLE_EXITS_MWAIT | \

                                              KVM_X86_DISABLE_EXITS_HTL | \

                                              KVM_X86_DISABLE_EXITS_PAUSE)



/* for KVM_ENABLE_CAP */

struct kvm_enable_cap {

	/* in */