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

Commit ab22a473 authored by Junaid Shahid's avatar Junaid Shahid Committed by Paolo Bonzini
Browse files

kvm: x86: mmu: Rename EPT_VIOLATION_READ/WRITE/INSTR constants 



Rename the EPT_VIOLATION_READ/WRITE/INSTR constants to
EPT_VIOLATION_ACC_READ/WRITE/INSTR to more clearly indicate that these
signify the type of the memory access as opposed to the permissions
granted by the PTE.

Signed-off-by: default avatarJunaid Shahid <junaids@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0b4c208d

arch/x86/include/asm/vmx.h

+6 −6
Original line number Diff line number Diff line
@@ -510,15 +510,15 @@ struct vmx_msr_entry { 
/*

 * Exit Qualifications for EPT Violations

 */

#define EPT_VIOLATION_READ_BIT		0

#define EPT_VIOLATION_WRITE_BIT		1

#define EPT_VIOLATION_INSTR_BIT		2

#define EPT_VIOLATION_ACC_READ_BIT	0

#define EPT_VIOLATION_ACC_WRITE_BIT	1

#define EPT_VIOLATION_ACC_INSTR_BIT	2

#define EPT_VIOLATION_READABLE_BIT	3

#define EPT_VIOLATION_WRITABLE_BIT	4

#define EPT_VIOLATION_EXECUTABLE_BIT	5

#define EPT_VIOLATION_READ		(1 << EPT_VIOLATION_READ_BIT)

#define EPT_VIOLATION_WRITE		(1 << EPT_VIOLATION_WRITE_BIT)

#define EPT_VIOLATION_INSTR		(1 << EPT_VIOLATION_INSTR_BIT)

#define EPT_VIOLATION_ACC_READ		(1 << EPT_VIOLATION_ACC_READ_BIT)

#define EPT_VIOLATION_ACC_WRITE		(1 << EPT_VIOLATION_ACC_WRITE_BIT)

#define EPT_VIOLATION_ACC_INSTR		(1 << EPT_VIOLATION_ACC_INSTR_BIT)

#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)

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -6375,13 +6375,13 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) 
	trace_kvm_page_fault(gpa, exit_qualification);



	/* Is it a read fault? */

	error_code = (exit_qualification & EPT_VIOLATION_READ)

	error_code = (exit_qualification & EPT_VIOLATION_ACC_READ)

		     ? PFERR_USER_MASK : 0;

	/* Is it a write fault? */

	error_code |= (exit_qualification & EPT_VIOLATION_WRITE)

	error_code |= (exit_qualification & EPT_VIOLATION_ACC_WRITE)

		      ? PFERR_WRITE_MASK : 0;

	/* Is it a fetch fault? */

	error_code |= (exit_qualification & EPT_VIOLATION_INSTR)

	error_code |= (exit_qualification & EPT_VIOLATION_ACC_INSTR)

		      ? PFERR_FETCH_MASK : 0;

	/* ept page table entry is present? */

	error_code |= (exit_qualification &