Hi folks, This is v3 of the series previously posted here: Mega-series: https://lore.kernel.org/kvmarm/20220519134204.5379-1-will@xxxxxxxxxx/ v2: https://lore.kernel.org/all/20220630135747.26983-1-will@xxxxxxxxxx/ There have been some significant changes since v2, including: - Removal of unnecessary backpointer linking a hyp vCPU to its hyp VM in favour of container_of() - Removing confusing use of 'shadow' at EL2 in favour of 'pkvm_hyp' (although this was much more work than a simple sed expression!) - Simplified vm table lookup and removal of redundant table traversal - Rework of the hypervisor fixmap to avoid redundant page-table walks - Splitting of memory donations required to create a guest so that the requirement for physically-contiguous pages is reduced - Fixed a memory leak when the stage-2 pgd is configured with an unsupported size - Dropped rework of 'struct hyp_page' as it is not required by this series - Improved commit messages - Rebased onto v6.0-rc1 Oliver -- as discussed in person, I've left the owner ID enumeration where it is for now since we will need to track the guest *instance* in future and so consolidating this into the pgtable code is unlikely to be beneficial. As with the previous posting, the last patch is marked as RFC because, although it plumbs in the shadow state, it is woefully inefficient and copies to/from the host state on every vCPU run. Without the last patch, the new structures are unused but we move considerably closer to isolating guests from the host. Cheers, Will, Quentin, Fuad and Marc Cc: Sean Christopherson <seanjc@xxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Vincent Donnefort <vdonnefort@xxxxxxxxxx> Cc: Alexandru Elisei <alexandru.elisei@xxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: James Morse <james.morse@xxxxxxx> Cc: Chao Peng <chao.p.peng@xxxxxxxxxxxxxxx> Cc: Quentin Perret <qperret@xxxxxxxxxx> Cc: Suzuki K Poulose <suzuki.poulose@xxxxxxx> Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Fuad Tabba <tabba@xxxxxxxxxx> Cc: Oliver Upton <oliver.upton@xxxxxxxxx> Cc: Marc Zyngier <maz@xxxxxxxxxx> Cc: kernel-team@xxxxxxxxxxx Cc: kvm@xxxxxxxxxxxxxxx Cc: kvmarm@xxxxxxxxxxxxxxxxxxxxx Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx --->8 Fuad Tabba (3): KVM: arm64: Add hyp_spinlock_t static initializer KVM: arm64: Add infrastructure to create and track pKVM instances at EL2 KVM: arm64: Instantiate pKVM hypervisor VM and vCPU structures from EL1 Quentin Perret (15): KVM: arm64: Move hyp refcount manipulation helpers to common header file KVM: arm64: Allow attaching of non-coalescable pages to a hyp pool KVM: arm64: Back the hypervisor 'struct hyp_page' array for all memory KVM: arm64: Fix-up hyp stage-1 refcounts for all pages mapped at EL2 KVM: arm64: Implement do_donate() helper for donating memory KVM: arm64: Prevent the donation of no-map pages KVM: arm64: Add helpers to pin memory shared with the hypervisor at EL2 KVM: arm64: Add per-cpu fixmap infrastructure at EL2 KVM: arm64: Add generic hyp_memcache helpers KVM: arm64: Consolidate stage-2 initialisation into a single function KVM: arm64: Instantiate guest stage-2 page-tables at EL2 KVM: arm64: Return guest memory from EL2 via dedicated teardown memcache KVM: arm64: Unmap 'kvm_arm_hyp_percpu_base' from the host KVM: arm64: Explicitly map 'kvm_vgic_global_state' at EL2 KVM: arm64: Don't unnecessarily map host kernel sections at EL2 Will Deacon (7): KVM: arm64: Unify identifiers used to distinguish host and hypervisor KVM: arm64: Include asm/kvm_mmu.h in nvhe/mem_protect.h KVM: arm64: Rename 'host_kvm' to 'host_mmu' KVM: arm64: Initialise hypervisor copies of host symbols unconditionally KVM: arm64: Provide I-cache invalidation by virtual address at EL2 KVM: arm64: Maintain a copy of 'kvm_arm_vmid_bits' at EL2 KVM: arm64: Use the pKVM hyp vCPU structure in handle___kvm_vcpu_run() arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/include/asm/kvm_asm.h | 7 +- arch/arm64/include/asm/kvm_host.h | 73 ++- arch/arm64/include/asm/kvm_hyp.h | 3 + arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/include/asm/kvm_pgtable.h | 20 + arch/arm64/include/asm/kvm_pkvm.h | 38 ++ arch/arm64/kernel/image-vars.h | 15 - arch/arm64/kvm/arm.c | 61 ++- arch/arm64/kvm/hyp/hyp-constants.c | 3 + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 25 +- arch/arm64/kvm/hyp/include/nvhe/memory.h | 23 + arch/arm64/kvm/hyp/include/nvhe/mm.h | 18 +- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 74 +++ arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 10 +- arch/arm64/kvm/hyp/nvhe/cache.S | 11 + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 110 +++- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 2 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 502 ++++++++++++++++-- arch/arm64/kvm/hyp/nvhe/mm.c | 158 +++++- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 28 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 444 ++++++++++++++++ arch/arm64/kvm/hyp/nvhe/setup.c | 96 ++-- arch/arm64/kvm/hyp/pgtable.c | 21 +- arch/arm64/kvm/mmu.c | 55 +- arch/arm64/kvm/pkvm.c | 138 ++++- arch/arm64/kvm/reset.c | 29 - 27 files changed, 1752 insertions(+), 216 deletions(-) create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h -- 2.37.2.789.g6183377224-goog _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
