Commit ff1e7f98 authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

KVM: arm64: Rename __pkvm_pgtable_stage2_unmap() 



In preparation for adding support for protected VMs, where pages are
donated rather than shared, rename __pkvm_pgtable_stage2_unmap() to
__pkvm_pgtable_stage2_unshare() to make it clearer about what is going
on.

Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarMostafa Saleh <smostafa@google.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Link: https://patch.msgid.link/20260330144841.26181-5-will@kernel.org


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

arch/arm64/kvm/pkvm.c

+4 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int pkvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, 
	return 0;

}



static int __pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 start, u64 end)

static int __pkvm_pgtable_stage2_unshare(struct kvm_pgtable *pgt, u64 start, u64 end)

{

	struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu);

	pkvm_handle_t handle = kvm->arch.pkvm.handle;
@@ -350,7 +350,7 @@ void pkvm_pgtable_stage2_destroy_range(struct kvm_pgtable *pgt, 
	if (!handle)

		return;



	__pkvm_pgtable_stage2_unmap(pgt, addr, addr + size);

	__pkvm_pgtable_stage2_unshare(pgt, addr, addr + size);

}



void pkvm_pgtable_stage2_destroy_pgd(struct kvm_pgtable *pgt)
@@ -386,7 +386,7 @@ int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, 
			return -EAGAIN;



		/* Remove _any_ pkvm_mapping overlapping with the range, bigger or smaller. */

		ret = __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size);

		ret = __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size);

		if (ret)

			return ret;

		mapping = NULL;
@@ -409,7 +409,7 @@ int pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 addr, u64 size) 
{

	lockdep_assert_held_write(&kvm_s2_mmu_to_kvm(pgt->mmu)->mmu_lock);



	return __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size);

	return __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size);

}



int pkvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size)