Commit 9a7ad19a authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: Use KVM's pte type/helpers in handle_access_fault() 

Consistently use KVM's own pte types and helpers in
handle_access_fault().

No functional change intended.

Link: https://lore.kernel.org/r/20221202185156.696189-2-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent b7bfaa76

arch/arm64/include/asm/kvm_pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ static inline kvm_pte_t kvm_phys_to_pte(u64 pa) 
	return pte;

}



static inline kvm_pfn_t kvm_pte_to_pfn(kvm_pte_t pte)

{

	return __phys_to_pfn(kvm_pte_to_phys(pte));

}



static inline u64 kvm_granule_shift(u32 level)

{

	/* Assumes KVM_PGTABLE_MAX_LEVELS is 4 */

arch/arm64/kvm/mmu.c

+4 −6
Original line number Diff line number Diff line
@@ -1399,20 +1399,18 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
/* Resolve the access fault by making the page young again. */

static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa)

{

	pte_t pte;

	kvm_pte_t kpte;

	kvm_pte_t pte;

	struct kvm_s2_mmu *mmu;



	trace_kvm_access_fault(fault_ipa);



	write_lock(&vcpu->kvm->mmu_lock);

	mmu = vcpu->arch.hw_mmu;

	kpte = kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa);

	pte = kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa);

	write_unlock(&vcpu->kvm->mmu_lock);



	pte = __pte(kpte);

	if (pte_valid(pte))

		kvm_set_pfn_accessed(pte_pfn(pte));

	if (kvm_pte_valid(pte))

		kvm_set_pfn_accessed(kvm_pte_to_pfn(pte));

}



/**