Commit 5398ddc5 authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: Pass walk flags to kvm_pgtable_stage2_mkyoung 



kvm_pgtable_stage2_mkyoung currently assumes that it is being called
from a 'shared' walker, which will not be true once called from pKVM.
To allow for the re-use of that function, make the walk flags one of
its parameters.

Tested-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20241218194059.3670226-6-qperret@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent e94a7dea

arch/arm64/include/asm/kvm_pgtable.h

+3 −1
Original line number Diff line number Diff line
@@ -669,13 +669,15 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size); 
 * kvm_pgtable_stage2_mkyoung() - Set the access flag in a page-table entry.

 * @pgt:	Page-table structure initialised by kvm_pgtable_stage2_init*().

 * @addr:	Intermediate physical address to identify the page-table entry.

 * @flags:	Flags to control the page-table walk (ex. a shared walk)

 *

 * The offset of @addr within a page is ignored.

 *

 * If there is a valid, leaf page-table entry used to translate @addr, then

 * set the access flag in that entry.

 */

void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr);

void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr,

				enum kvm_pgtable_walk_flags flags);



/**

 * kvm_pgtable_stage2_test_clear_young() - Test and optionally clear the access

arch/arm64/kvm/hyp/pgtable.c

+3 −4
Original line number Diff line number Diff line
@@ -1245,14 +1245,13 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size) 
					NULL, NULL, 0);

}



void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr)

void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr,

				enum kvm_pgtable_walk_flags flags)

{

	int ret;



	ret = stage2_update_leaf_attrs(pgt, addr, 1, KVM_PTE_LEAF_ATTR_LO_S2_AF, 0,

				       NULL, NULL,

				       KVM_PGTABLE_WALK_HANDLE_FAULT |

				       KVM_PGTABLE_WALK_SHARED);

				       NULL, NULL, flags);

	if (!ret)

		dsb(ishst);

}

arch/arm64/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -1718,13 +1718,14 @@ 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)

{

	enum kvm_pgtable_walk_flags flags = KVM_PGTABLE_WALK_HANDLE_FAULT | KVM_PGTABLE_WALK_SHARED;

	struct kvm_s2_mmu *mmu;



	trace_kvm_access_fault(fault_ipa);



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

	mmu = vcpu->arch.hw_mmu;

	kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa);

	kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa, flags);

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

}