Commit bc17fccb authored by Yan Zhao's avatar Yan Zhao Committed by Sean Christopherson
Browse files

KVM: VMX: Remove the unused variable "gpa" in __invept() 



Remove the unused variable "gpa" in __invept().

The INVEPT instruction only supports two types: VMX_EPT_EXTENT_CONTEXT (1)
and VMX_EPT_EXTENT_GLOBAL (2). Neither of these types requires a third
variable "gpa".

The "gpa" variable for __invept() is always set to 0 and was originally
introduced for the old non-existent type VMX_EPT_EXTENT_INDIVIDUAL_ADDR
(0). This type was removed by commit 2b3c5cbc ("kvm: don't use bit24
for detecting address-specific invalidation capability") and
commit 63f3ac48 ("KVM: VMX: clean up declaration of VPID/EPT
invalidation types").

Since this variable is not useful for error handling either, remove it to
avoid confusion.

No functional changes expected.

Cc: Yuan Yao <yuan.yao@intel.com>
Signed-off-by: default avatarYan Zhao <yan.y.zhao@intel.com>
Link: https://lore.kernel.org/r/20241014045931.1061-1-yan.y.zhao@intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 5cb1659f

arch/x86/kvm/vmx/vmx.c

+2 −3
Original line number Diff line number Diff line
@@ -481,10 +481,9 @@ noinline void invvpid_error(unsigned long ext, u16 vpid, gva_t gva) 
			ext, vpid, gva);

}



noinline void invept_error(unsigned long ext, u64 eptp, gpa_t gpa)

noinline void invept_error(unsigned long ext, u64 eptp)

{

	vmx_insn_failed("invept failed: ext=0x%lx eptp=%llx gpa=0x%llx\n",

			ext, eptp, gpa);

	vmx_insn_failed("invept failed: ext=0x%lx eptp=%llx\n", ext, eptp);

}



static DEFINE_PER_CPU(struct vmcs *, vmxarea);

arch/x86/kvm/vmx/vmx_ops.h

+8 −8
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void vmwrite_error(unsigned long field, unsigned long value); 
void vmclear_error(struct vmcs *vmcs, u64 phys_addr);

void vmptrld_error(struct vmcs *vmcs, u64 phys_addr);

void invvpid_error(unsigned long ext, u16 vpid, gva_t gva);

void invept_error(unsigned long ext, u64 eptp, gpa_t gpa);

void invept_error(unsigned long ext, u64 eptp);



#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT

/*
@@ -312,13 +312,13 @@ static inline void __invvpid(unsigned long ext, u16 vpid, gva_t gva) 
	vmx_asm2(invvpid, "r"(ext), "m"(operand), ext, vpid, gva);

}



static inline void __invept(unsigned long ext, u64 eptp, gpa_t gpa)

static inline void __invept(unsigned long ext, u64 eptp)

{

	struct {

		u64 eptp, gpa;

	} operand = {eptp, gpa};



	vmx_asm2(invept, "r"(ext), "m"(operand), ext, eptp, gpa);

		u64 eptp;

		u64 reserved_0;

	} operand = { eptp, 0 };

	vmx_asm2(invept, "r"(ext), "m"(operand), ext, eptp);

}



static inline void vpid_sync_vcpu_single(int vpid)
@@ -355,13 +355,13 @@ static inline void vpid_sync_vcpu_addr(int vpid, gva_t addr) 


static inline void ept_sync_global(void)

{

	__invept(VMX_EPT_EXTENT_GLOBAL, 0, 0);

	__invept(VMX_EPT_EXTENT_GLOBAL, 0);

}



static inline void ept_sync_context(u64 eptp)

{

	if (cpu_has_vmx_invept_context())

		__invept(VMX_EPT_EXTENT_CONTEXT, eptp, 0);

		__invept(VMX_EPT_EXTENT_CONTEXT, eptp);

	else

		ept_sync_global();

}