Commit aecce510 authored by SU Hang's avatar SU Hang Committed by Paolo Bonzini
Browse files

KVM: VMX: replace 0x180 with EPT_VIOLATION_* definition 



Using self-expressing macro definition EPT_VIOLATION_GVA_VALIDATION
and EPT_VIOLATION_GVA_TRANSLATED instead of 0x180
in FNAME(walk_addr_generic)().

Signed-off-by: default avatarSU Hang <darcy.sh@antgroup.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220329030108.97341-2-darcy.sh@antgroup.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 77d72792

arch/x86/include/asm/vmx.h

+2 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ enum vm_entry_failure_code { 
#define EPT_VIOLATION_READABLE_BIT	3

#define EPT_VIOLATION_WRITABLE_BIT	4

#define EPT_VIOLATION_EXECUTABLE_BIT	5

#define EPT_VIOLATION_GVA_IS_VALID_BIT	7

#define EPT_VIOLATION_GVA_TRANSLATED_BIT 8

#define EPT_VIOLATION_ACC_READ		(1 << EPT_VIOLATION_ACC_READ_BIT)

#define EPT_VIOLATION_ACC_WRITE		(1 << EPT_VIOLATION_ACC_WRITE_BIT)
@@ -553,6 +554,7 @@ enum vm_entry_failure_code { 
#define EPT_VIOLATION_READABLE		(1 << EPT_VIOLATION_READABLE_BIT)

#define EPT_VIOLATION_WRITABLE		(1 << EPT_VIOLATION_WRITABLE_BIT)

#define EPT_VIOLATION_EXECUTABLE	(1 << EPT_VIOLATION_EXECUTABLE_BIT)

#define EPT_VIOLATION_GVA_IS_VALID	(1 << EPT_VIOLATION_GVA_IS_VALID_BIT)

#define EPT_VIOLATION_GVA_TRANSLATED	(1 << EPT_VIOLATION_GVA_TRANSLATED_BIT)



/*

arch/x86/kvm/mmu/paging_tmpl.h

+2 −1
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 
	 * The other bits are set to 0.

	 */

	if (!(errcode & PFERR_RSVD_MASK)) {

		vcpu->arch.exit_qualification &= 0x180;

		vcpu->arch.exit_qualification &= (EPT_VIOLATION_GVA_IS_VALID |

						  EPT_VIOLATION_GVA_TRANSLATED);

		if (write_fault)

			vcpu->arch.exit_qualification |= EPT_VIOLATION_ACC_WRITE;

		if (user_fault)