Re: [PATCH v3 03/36] KVM: arm64: Rename __pkvm_pgtable_stage2_unmap()

Fuad Tabba
2026-03-11T12:50:03Z

On Thu, 5 Mar 2026 at 14:44, Will Deacon <will@kernel.org> wrote:
>
> 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.
>
> Signed-off-by: Will Deacon <will@kernel.org>

Reviewed-by: Fuad Tabba <tabba@google.com>

Cheers,
/fuad

> ---
> arch/arm64/kvm/pkvm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c
> index 7797813f4dbe..42f6e50825ac 100644
> --- a/arch/arm64/kvm/pkvm.c
> +++ b/arch/arm64/kvm/pkvm.c
> @@ -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)
> --
> 2.53.0.473.g4a7958ca14-goog
>