Skip to content

KVM: arm64: Introduce pKVM hyp VM and vCPU state at EL2

Will Deacon kvm kvmarm linux-arm-kernel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest26 patches 8 repliesIn review
  2. v525 patches 9 repliesSuperseded
  3. v425 patches 27 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v325 patches2 repliesSuperseded
v224 patches20 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/26KVM: arm64: Move hyp refcount manipulation helpers to common header filearch/arm64/kvm/hyp/include/nvhe/memory.h arch/arm64/kvm/hyp/nvhe/page_alloc.c+22 -190 replies
2/26KVM: arm64: Allow attaching of non-coalescable pages to a hyp poolarch/arm64/kvm/hyp/nvhe/page_alloc.c+6 -00 replies
3/26KVM: arm64: Back the hypervisor 'struct hyp_page' array for all memoryarch/arm64/include/asm/kvm_pkvm.h arch/arm64/kvm/hyp/include/nvhe/mm.h arch/arm64/kvm/hyp/nvhe/mm.c +3 more+60 -400 replies
4/26KVM: arm64: Fix-up hyp stage-1 refcounts for all pages mapped at EL2arch/arm64/kvm/hyp/nvhe/setup.c+43 -190 replies
5/26KVM: arm64: Unify identifiers used to distinguish host and hypervisorarch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/nvhe/mem_protect.c arch/arm64/kvm/hyp/nvhe/setup.c+6 -100 replies
6/26KVM: arm64: Implement do_donate() helper for donating memoryarch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/nvhe/mem_protect.c+241 -00 replies
7/26KVM: arm64: Prevent the donation of no-map pagesarch/arm64/kvm/hyp/nvhe/mem_protect.c+16 -60 replies
8/26KVM: arm64: Add helpers to pin memory shared with the hypervisor at EL2arch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/include/nvhe/memory.h arch/arm64/kvm/hyp/nvhe/mem_protect.c+57 -10 replies
9/26KVM: arm64: Include asm/kvm_mmu.h in nvhe/mem_protect.harch/arm64/kvm/hyp/include/nvhe/mem_protect.h+1 -00 replies
10/26KVM: arm64: Add hyp_spinlock_t static initializerarch/arm64/kvm/hyp/include/nvhe/spinlock.h+9 -10 replies
11/26KVM: arm64: Rename 'host_kvm' to 'host_mmu'arch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/nvhe/mem_protect.c+26 -260 replies
12/26KVM: arm64: Add infrastructure to create and track pKVM instances at EL2arch/arm64/include/asm/kvm_asm.h arch/arm64/include/asm/kvm_host.h arch/arm64/include/asm/kvm_pgtable.h +9 more+531 -01 reply
13/26KVM: arm64: Instantiate pKVM hypervisor VM and vCPU structures from EL1arch/arm64/include/asm/kvm_host.h arch/arm64/include/asm/kvm_pkvm.h arch/arm64/kvm/arm.c +3 more+182 -60 replies
14/26KVM: arm64: Add per-cpu fixmap infrastructure at EL2arch/arm64/include/asm/kvm_pgtable.h arch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/include/nvhe/mm.h +4 more+128 -130 replies
15/26KVM: arm64: Initialise hypervisor copies of host symbols unconditionallyarch/arm64/kvm/arm.c+9 -60 replies
16/26KVM: arm64: Provide I-cache invalidation by virtual address at EL2arch/arm64/include/asm/kvm_hyp.h arch/arm64/kernel/image-vars.h arch/arm64/kvm/arm.c +2 more+16 -30 replies
17/26KVM: arm64: Add generic hyp_memcache helpersarch/arm64/include/asm/kvm_host.h arch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/nvhe/mm.c +1 more+118 -00 replies
18/26KVM: arm64: Consolidate stage-2 initialisation into a single functionarch/arm64/include/asm/kvm_arm.h arch/arm64/include/asm/kvm_host.h arch/arm64/include/asm/kvm_mmu.h +3 more+41 -480 replies
19/26KVM: arm64: Instantiate guest stage-2 page-tables at EL2arch/arm64/kvm/hyp/include/nvhe/pkvm.h arch/arm64/kvm/hyp/nvhe/mem_protect.c arch/arm64/kvm/mmu.c+132 -30 replies
20/26KVM: arm64: Return guest memory from EL2 via dedicated teardown memcachearch/arm64/include/asm/kvm_host.h arch/arm64/kvm/hyp/include/nvhe/mem_protect.h arch/arm64/kvm/hyp/nvhe/mem_protect.c +2 more+39 -430 replies
21/26KVM: arm64: Unmap 'kvm_arm_hyp_percpu_base' from the hostarch/arm64/include/asm/kvm_asm.h arch/arm64/kernel/image-vars.h arch/arm64/kvm/arm.c +1 more+8 -100 replies
22/26KVM: arm64: Maintain a copy of 'kvm_arm_vmid_bits' at EL2arch/arm64/include/asm/kvm_hyp.h arch/arm64/kernel/image-vars.h arch/arm64/kvm/arm.c +1 more+6 -30 replies
23/26KVM: arm64: Explicitly map 'kvm_vgic_global_state' at EL2arch/arm64/kvm/hyp/nvhe/setup.c+5 -00 replies
24/26KVM: arm64: Don't unnecessarily map host kernel sections at EL2arch/arm64/kernel/image-vars.h arch/arm64/kvm/hyp/nvhe/setup.c+3 -170 replies
25/26KVM: arm64: Clean out the odd handling of completer_addrarch/arm64/kvm/hyp/nvhe/mem_protect.c+48 -820 replies
26/26KVM: arm64: Use the pKVM hyp vCPU structure in handle___kvm_vcpu_run()arch/arm64/kvm/hyp/include/nvhe/pkvm.h arch/arm64/kvm/hyp/nvhe/hyp-main.c arch/arm64/kvm/hyp/nvhe/pkvm.c+109 -20 replies

Reviews trailers per patch

8 of 26 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéOliver UptonVincent Donnefort
1/26R-b R-b T-b
2/26T-b
3/26T-b
4/26R-b T-b
5/26R-b R-b T-b
6/26T-b
7/26R-b T-b
8/26T-b
9/26R-b T-b
10/26R-b T-b
11/26R-b T-b
12/26T-b
13/26T-b
14/26T-b
15/26R-b T-b
16/26T-b
17/26T-b
18/26T-b
19/26T-b
20/26T-b
21/26T-b
22/26T-b
23/26T-b
24/26T-b
25/26
26/26T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v6 thread

Cover letter [PATCH v6 00/26] KVM: arm64: Introduce pKVM hyp VM and vCPU state at EL2

Hi all,

This is version six of the pKVM EL2 state series, extending the pKVM hypervisor code so that it can dynamically instantiate and manage VM data structures without the host being able to access them directly. These structures consist of a hyp VM, a set of hyp vCPUs and the stage-2 page-table for the MMU. The pages used to hold the hypervisor structures are returned to the host when the VM is destroyed.

Previous versions are archived at:

Mega-patch: https://lore.kernel.org/kvmarm/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/kvmarm/[email protected]/
v4: https://lore.kernel.org/kvm/[email protected]/
v5: https://lore.kernel.org/r/[email protected]

The changes since v5 include:

* Fix teardown ordering so that the host 'kvm' structure remains pins while the memcache is being filled.

* Fixed a kerneldoc typo.

* Included a patch from Oliver to rework the 'pkvm_mem_transition' structure and it's handling of the completer address.

* Tweaked some commit messages and added new R-b tags.

As before, the final patch is RFC since it illustrates a very naive use of the new hypervisor structures and subsequent changes will improve on this once we have the guest private memory story sorted out.

Oliver: I'm pretty sure we're going to need to revert your completer address cleanup as soon as we have guest-host sharing. We want to keep the 'pkvm_mem_transition' structure 'const', but we will only know the host address (PA) after walking the guest stage-2 and so we're going to want to track that separately. Anyway, I've included it here at the end so Marc can decide what he wants to do!

Cheers,

Will, Quentin and Fuad

Cc Sean Christopherson <[email protected]>
Cc Will Deacon <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Alexandru Elisei <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Philippe Mathieu-Daudé <[email protected]>
Cc James Morse <[email protected]>
Cc Chao Peng <[email protected]>
Cc Quentin Perret <[email protected]>
Cc Suzuki K Poulose <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Fuad Tabba <[email protected]>
Cc Oliver Upton <[email protected]>
Cc Marc Zyngier <[email protected]>

--->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

Oliver Upton (1):
KVM: arm64: Clean out the odd handling of completer_addr

Quentin Perret (14):
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: 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 (8):
KVM: arm64: Unify identifiers used to distinguish host and hypervisor
KVM: arm64: Implement do_donate() helper for donating memory
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             |  72 ++-
 arch/arm64/include/asm/kvm_hyp.h              |   3 +
 arch/arm64/include/asm/kvm_mmu.h              |   2 +-
 arch/arm64/include/asm/kvm_pgtable.h          |  22 +
 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      |  27 +
 arch/arm64/kvm/hyp/include/nvhe/mm.h          |  18 +-
 arch/arm64/kvm/hyp/include/nvhe/pkvm.h        |  68 +++
 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         | 558 +++++++++++++++---
 arch/arm64/kvm/hyp/nvhe/mm.c                  | 168 +++++-
 arch/arm64/kvm/hyp/nvhe/page_alloc.c          |  29 +-
 arch/arm64/kvm/hyp/nvhe/pkvm.c                | 436 ++++++++++++++
 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, 1765 insertions(+), 261 deletions(-)
 create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h
Signature · 1 line
2.38.1.431.g37b22c650d-goog