diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-31 21:37:07 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-31 21:37:07 +0100 |
| commit | 45b890f7689eb0aba454fc5831d2d79763781677 (patch) | |
| tree | 71ab007123eaedd8553d570d6411dfde1062748e /arch/arm64/kvm/pkvm.c | |
| parent | Merge tag 'kvm-x86-svm-6.7' of https://github.com/kvm-x86/linux into HEAD (diff) | |
| parent | Merge branch kvm-arm64/pmu_pmcr_n into kvmarm/next (diff) | |
| download | linux-45b890f7689eb0aba454fc5831d2d79763781677.tar.xz linux-45b890f7689eb0aba454fc5831d2d79763781677.zip | |
Merge tag 'kvmarm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 updates for 6.7
- Generalized infrastructure for 'writable' ID registers, effectively
allowing userspace to opt-out of certain vCPU features for its guest
- Optimization for vSGI injection, opportunistically compressing MPIDR
to vCPU mapping into a table
- Improvements to KVM's PMU emulation, allowing userspace to select
the number of PMCs available to a VM
- Guest support for memory operation instructions (FEAT_MOPS)
- Cleanups to handling feature flags in KVM_ARM_VCPU_INIT, squashing
bugs and getting rid of useless code
- Changes to the way the SMCCC filter is constructed, avoiding wasted
memory allocations when not in use
- Load the stage-2 MMU context at vcpu_load() for VHE systems, reducing
the overhead of errata mitigations
- Miscellaneous kernel and selftest fixes
Diffstat (limited to 'arch/arm64/kvm/pkvm.c')
| -rw-r--r-- | arch/arm64/kvm/pkvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 6ff3ec18c925..8350fb8fee0b 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -123,7 +123,7 @@ static int __pkvm_create_hyp_vm(struct kvm *host_kvm) if (host_kvm->created_vcpus < 1) return -EINVAL; - pgd_sz = kvm_pgtable_stage2_pgd_size(host_kvm->arch.vtcr); + pgd_sz = kvm_pgtable_stage2_pgd_size(host_kvm->arch.mmu.vtcr); /* * The PGD pages will be reclaimed using a hyp_memcache which implies |