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

Commit fd97dc51 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Simpify accessed/dirty/present/nx bit handling 



Always set the accessed and dirty bit (since having them cleared causes
a read-modify-write cycle), always set the present bit, and copy the
nx bit from the guest.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 4436d466

drivers/kvm/mmu.c

+0 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ static int dbg = 1; 
#define PT32_DIR_PSE36_MASK (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT)





#define PT32_PTE_COPY_MASK \

	(PT_PRESENT_MASK | PT_ACCESSED_MASK | PT_DIRTY_MASK | PT_GLOBAL_MASK)



#define PT64_PTE_COPY_MASK (PT64_NX_MASK | PT32_PTE_COPY_MASK)



#define PT_FIRST_AVAIL_BITS_SHIFT 9

#define PT64_SECOND_AVAIL_BITS_SHIFT 52

drivers/kvm/paging_tmpl.h

+2 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)

	#define PT_PTE_COPY_MASK PT64_PTE_COPY_MASK

	#ifdef CONFIG_X86_64

	#define PT_MAX_FULL_LEVELS 4

	#else
@@ -46,7 +45,6 @@ 
	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)

	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)

	#define PT_PTE_COPY_MASK PT32_PTE_COPY_MASK

	#define PT_MAX_FULL_LEVELS 2

#else

	#error Invalid PTTYPE value
@@ -219,7 +217,8 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu, 
		FNAME(mark_pagetable_dirty)(vcpu->kvm, walker);

	}



	spte |= *gpte & PT_PTE_COPY_MASK;

	spte |= PT_PRESENT_MASK | PT_ACCESSED_MASK | PT_DIRTY_MASK;

	spte |= *gpte & PT64_NX_MASK;

	spte |= access_bits << PT_SHADOW_BITS_OFFSET;

	if (!dirty)

		access_bits &= ~PT_WRITABLE_MASK;
@@ -495,7 +494,5 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr) 
#undef PT_INDEX

#undef SHADOW_PT_INDEX

#undef PT_LEVEL_MASK

#undef PT_PTE_COPY_MASK

#undef PT_NON_PTE_COPY_MASK

#undef PT_DIR_BASE_ADDR_MASK

#undef PT_MAX_FULL_LEVELS