[PATCH v5 15/18] KVM: arm64: Rename vCPU pkvm_memcache to stage2_mc
Fuad Tabba
fuad.tabba at linux.dev
Tue Sep 1 10:59:00 PDT 2026
On Tue, 1 Sept 2026 at 09:10, Vincent Donnefort <vdonnefort at google.com> wrote:
>
> With the introduction of the pKVM hyp allocator, the memcache for vCPUs
> is now only used for carrying pages dedicated to the stage-2 page tables.
> Rename pkvm_memcache to stage2_mc to reflect its purpose.
>
> Signed-off-by: Vincent Donnefort <vdonnefort at google.com>
Reviewed-by: Fuad Tabba <fuad.tabba at linux.dev>
Tested-by: Fuad Tabba < fuad.tabba at linux.dev>
Cheers,
/fuad
>
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index fe5364b507f9..7aaa139ac89b 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -939,7 +939,7 @@ struct kvm_vcpu_arch {
> struct kvm_mmu_memory_cache mmu_page_cache;
>
> /* Pages to top-up the pKVM/EL2 guest pool */
> - struct kvm_hyp_memcache pkvm_memcache;
> + struct kvm_hyp_memcache stage2_mc;
>
> /* Virtual SError ESR to restore when HCR_EL2.VSE is set */
> u64 vsesr_el2;
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 09ae5431ce58..fa77abf8cff6 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -591,7 +591,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
> if (!is_protected_kvm_enabled())
> kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);
> else
> - free_hyp_memcache(&vcpu->arch.pkvm_memcache);
> + free_hyp_memcache(&vcpu->arch.stage2_mc);
> kvm_timer_vcpu_terminate(vcpu);
> kvm_pmu_vcpu_destroy(vcpu);
> kvm_vgic_vcpu_destroy(vcpu);
> diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> index bc54f477c147..fc3a624b0c4c 100644
> --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> @@ -407,9 +407,9 @@ static int pkvm_refill_memcache(struct pkvm_hyp_vcpu *hyp_vcpu)
> {
> struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;
>
> - return refill_memcache(&hyp_vcpu->vcpu.arch.pkvm_memcache,
> - host_vcpu->arch.pkvm_memcache.nr_pages,
> - &host_vcpu->arch.pkvm_memcache);
> + return refill_memcache(&hyp_vcpu->vcpu.arch.stage2_mc,
> + host_vcpu->arch.stage2_mc.nr_pages,
> + &host_vcpu->arch.stage2_mc);
> }
>
> static void handle___pkvm_host_donate_guest(struct kvm_cpu_context *host_ctxt)
> diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> index 39aa8911f62c..dadd48431036 100644
> --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> @@ -1023,7 +1023,7 @@ int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn)
> ret = 0;
> WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, PAGE_SIZE, phys,
> pkvm_mkstate(KVM_PGTABLE_PROT_RWX, PKVM_PAGE_SHARED_OWNED),
> - &vcpu->vcpu.arch.pkvm_memcache, 0));
> + &vcpu->vcpu.arch.stage2_mc, 0));
> WARN_ON(__host_set_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_SHARED_BORROWED));
> unlock:
> guest_unlock_component(vm);
> @@ -1058,7 +1058,7 @@ int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn)
> PKVM_ID_GUEST, meta));
> WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, PAGE_SIZE, phys,
> pkvm_mkstate(KVM_PGTABLE_PROT_RWX, PKVM_PAGE_OWNED),
> - &vcpu->vcpu.arch.pkvm_memcache, 0));
> + &vcpu->vcpu.arch.stage2_mc, 0));
> unlock:
> guest_unlock_component(vm);
> host_unlock_component();
> @@ -1422,7 +1422,7 @@ static int __guest_check_pgtable_memcache(struct pkvm_hyp_vcpu *vcpu)
> {
> struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu);
>
> - if (vcpu->vcpu.arch.pkvm_memcache.nr_pages < kvm_mmu_cache_min_pages(vm->pgt.mmu))
> + if (vcpu->vcpu.arch.stage2_mc.nr_pages < kvm_mmu_cache_min_pages(vm->pgt.mmu))
> return -ENOMEM;
>
> return 0;
> @@ -1456,7 +1456,7 @@ int __pkvm_host_donate_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu)
> PKVM_ID_GUEST, meta));
> WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, PAGE_SIZE, phys,
> pkvm_mkstate(KVM_PGTABLE_PROT_RWX, PKVM_PAGE_OWNED),
> - &vcpu->vcpu.arch.pkvm_memcache, 0));
> + &vcpu->vcpu.arch.stage2_mc, 0));
>
> unlock:
> guest_unlock_component(vm);
> @@ -1527,7 +1527,7 @@ int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu
>
> WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, size, phys,
> pkvm_mkstate(prot, PKVM_PAGE_SHARED_BORROWED),
> - &vcpu->vcpu.arch.pkvm_memcache, 0));
> + &vcpu->vcpu.arch.stage2_mc, 0));
>
> unlock:
> guest_unlock_component(vm);
> diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
> index ee2060aa1131..8a8b694ca00f 100644
> --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
> +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
> @@ -760,7 +760,7 @@ struct pkvm_hyp_vcpu *init_selftest_vm(void *virt)
> continue;
> p[i].refcount = 1;
> if (seeded < min_pages) {
> - push_hyp_memcache(&selftest_vcpu.vcpu.arch.pkvm_memcache,
> + push_hyp_memcache(&selftest_vcpu.vcpu.arch.stage2_mc,
> hyp_page_to_virt(&p[i]), hyp_virt_to_phys);
> seeded++;
> } else {
> @@ -1002,7 +1002,7 @@ int __pkvm_finalize_teardown_vm(pkvm_handle_t handle)
> if (!hyp_vcpu)
> continue;
>
> - vcpu_mc = &hyp_vcpu->vcpu.arch.pkvm_memcache;
> + vcpu_mc = &hyp_vcpu->vcpu.arch.stage2_mc;
>
> while (vcpu_mc->nr_pages) {
> void *addr = pop_hyp_memcache(vcpu_mc, hyp_phys_to_virt);
> diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
> index 3163502cc7d2..afde0894ab15 100644
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@ -1553,7 +1553,7 @@ static void *get_mmu_memcache(struct kvm_vcpu *vcpu)
> if (!is_protected_kvm_enabled())
> return &vcpu->arch.mmu_page_cache;
> else
> - return &vcpu->arch.pkvm_memcache;
> + return &vcpu->arch.stage2_mc;
> }
>
> static int topup_mmu_memcache(struct kvm_vcpu *vcpu, void *memcache)
> diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c
> index 36e677e51f7d..83e18c0e30b5 100644
> --- a/arch/arm64/kvm/pkvm.c
> +++ b/arch/arm64/kvm/pkvm.c
> @@ -182,7 +182,7 @@ static int __pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu)
> pkvm_handle_t handle = vcpu->kvm->arch.pkvm.handle;
> int ret;
>
> - init_hyp_stage2_memcache(&vcpu->arch.pkvm_memcache);
> + init_hyp_stage2_memcache(&vcpu->arch.stage2_mc);
>
> ret = pkvm_call_hyp_req(__pkvm_init_vcpu, handle, vcpu);
> if (!ret)
> --
> 2.55.0.897.gb25b4bd76c-goog
>
More information about the linux-arm-kernel
mailing list