Commit 648fc8ae authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move nVMX's consistency check macro to common code 



Move KVM's CC() macro to x86.h so that it can be reused by nSVM.
Debugging VM-Enter is as painful on SVM as it is on VMX.

Rename the more visible macro to KVM_NESTED_VMENTER_CONSISTENCY_CHECK
to avoid any collisions with the uber-concise "CC".

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210204000117.3303214-12-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6906e06d

arch/x86/kvm/vmx/nested.c

+1 −7
Original line number Diff line number Diff line
@@ -21,13 +21,7 @@ module_param_named(enable_shadow_vmcs, enable_shadow_vmcs, bool, S_IRUGO); 
static bool __read_mostly nested_early_check = 0;

module_param(nested_early_check, bool, S_IRUGO);



#define CC(consistency_check)						\

({									\

	bool failed = (consistency_check);				\

	if (failed)							\

		trace_kvm_nested_vmenter_failed(#consistency_check, 0);	\

	failed;								\

})

#define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK



/*

 * Hyper-V requires all of these, so mark them as supported even though

arch/x86/kvm/x86.h

+8 −0
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ 
#include "kvm_cache_regs.h"

#include "kvm_emulate.h"



#define KVM_NESTED_VMENTER_CONSISTENCY_CHECK(consistency_check)		\

({									\

	bool failed = (consistency_check);				\

	if (failed)							\

		trace_kvm_nested_vmenter_failed(#consistency_check, 0);	\

	failed;								\

})



#define KVM_DEFAULT_PLE_GAP		128

#define KVM_VMX_DEFAULT_PLE_WINDOW	4096

#define KVM_DEFAULT_PLE_WINDOW_GROW	2