Merge branch kvm-arm64/pkvm-fixed-features-6.14 into kvmarm-master/next
* kvm-arm64/pkvm-fixed-features-6.14: (24 commits)
: .
: Complete rework of the pKVM handling of features, catching up
: with the rest of the code deals with it these days.
: Patches courtesy of Fuad Tabba. From the cover letter:
:
: "This patch series uses the vm's feature id registers to track the
: supported features, a framework similar to nested virt to set the
: trap values, and removes the need to store cptr_el2 per vcpu in
: favor of setting its value when traps are activated, as VHE mode
: does."
:
: This branch drags the arm64/for-next/cpufeature branch to solve
: ugly conflicts in -next.
: .
KVM: arm64: Fix FEAT_MTE in pKVM
KVM: arm64: Use kvm_vcpu_has_feature() directly for struct kvm
KVM: arm64: Convert the SVE guest vcpu flag to a vm flag
KVM: arm64: Remove PtrAuth guest vcpu flag
KVM: arm64: Fix the value of the CPTR_EL2 RES1 bitmask for nVHE
KVM: arm64: Refactor kvm_reset_cptr_el2()
KVM: arm64: Calculate cptr_el2 traps on activating traps
KVM: arm64: Remove redundant setting of HCR_EL2 trap bit
KVM: arm64: Remove fixed_config.h header
KVM: arm64: Rework specifying restricted features for protected VMs
KVM: arm64: Set protected VM traps based on its view of feature registers
KVM: arm64: Fix RAS trapping in pKVM for protected VMs
KVM: arm64: Initialize feature id registers for protected VMs
KVM: arm64: Use KVM extension checks for allowed protected VM capabilities
KVM: arm64: Remove KVM_ARM_VCPU_POWER_OFF from protected VMs allowed features in pKVM
KVM: arm64: Move checking protected vcpu features to a separate function
KVM: arm64: Group setting traps for protected VMs by control register
KVM: arm64: Consolidate allowed and restricted VM feature checks
arm64/sysreg: Get rid of CPACR_ELx SysregFields
arm64/sysreg: Convert *_EL12 accessors to Mapping
...
Signed-off-by:
Marc Zyngier <maz@kernel.org>
# Conflicts:
# arch/arm64/kvm/fpsimd.c
# arch/arm64/kvm/hyp/nvhe/pkvm.c
No related branches found
No related tags found
Showing
- arch/arm64/include/asm/cpucaps.h 2 additions, 0 deletionsarch/arm64/include/asm/cpucaps.h
- arch/arm64/include/asm/cpufeature.h 1 addition, 2 deletionsarch/arm64/include/asm/cpufeature.h
- arch/arm64/include/asm/el2_setup.h 3 additions, 3 deletionsarch/arm64/include/asm/el2_setup.h
- arch/arm64/include/asm/kvm_arm.h 1 addition, 3 deletionsarch/arm64/include/asm/kvm_arm.h
- arch/arm64/include/asm/kvm_emulate.h 32 additions, 37 deletionsarch/arm64/include/asm/kvm_emulate.h
- arch/arm64/include/asm/kvm_host.h 15 additions, 10 deletionsarch/arm64/include/asm/kvm_host.h
- arch/arm64/include/asm/kvm_nested.h 4 additions, 4 deletionsarch/arm64/include/asm/kvm_nested.h
- arch/arm64/include/asm/kvm_pkvm.h 25 additions, 0 deletionsarch/arm64/include/asm/kvm_pkvm.h
- arch/arm64/kernel/cpufeature.c 8 additions, 9 deletionsarch/arm64/kernel/cpufeature.c
- arch/arm64/kvm/arm.c 2 additions, 28 deletionsarch/arm64/kvm/arm.c
- arch/arm64/kvm/at.c 3 additions, 3 deletionsarch/arm64/kvm/at.c
- arch/arm64/kvm/emulate-nested.c 1 addition, 1 deletionarch/arm64/kvm/emulate-nested.c
- arch/arm64/kvm/fpsimd.c 1 addition, 1 deletionarch/arm64/kvm/fpsimd.c
- arch/arm64/kvm/hyp/include/hyp/switch.h 2 additions, 2 deletionsarch/arm64/kvm/hyp/include/hyp/switch.h
- arch/arm64/kvm/hyp/include/nvhe/fixed_config.h 0 additions, 223 deletionsarch/arm64/kvm/hyp/include/nvhe/fixed_config.h
- arch/arm64/kvm/hyp/include/nvhe/pkvm.h 7 additions, 0 deletionsarch/arm64/kvm/hyp/include/nvhe/pkvm.h
- arch/arm64/kvm/hyp/nvhe/hyp-main.c 2 additions, 2 deletionsarch/arm64/kvm/hyp/nvhe/hyp-main.c
- arch/arm64/kvm/hyp/nvhe/pkvm.c 125 additions, 220 deletionsarch/arm64/kvm/hyp/nvhe/pkvm.c
- arch/arm64/kvm/hyp/nvhe/setup.c 0 additions, 1 deletionarch/arm64/kvm/hyp/nvhe/setup.c
- arch/arm64/kvm/hyp/nvhe/switch.c 33 additions, 21 deletionsarch/arm64/kvm/hyp/nvhe/switch.c
Loading
Please register or sign in to comment