Merge branch kvm-arm64/pkvm-features-6.20 into kvmarm-master/next

Browse source

* kvm-arm64/pkvm-features-6.20:
  : .
  : pKVM guest feature trapping fixes, courtesy of Fuad Tabba.
  : .
  KVM: arm64: Prevent host from managing timer offsets for protected VMs
  KVM: arm64: Check whether a VM IOCTL is allowed in pKVM
  KVM: arm64: Track KVM IOCTLs and their associated KVM caps
  KVM: arm64: Do not allow KVM_CAP_ARM_MTE for any guest in pKVM
  KVM: arm64: Include VM type when checking VM capabilities in pKVM
  KVM: arm64: Introduce helper to calculate fault IPA offset
  KVM: arm64: Fix MTE flag initialization for protected VMs
  KVM: arm64: Fix Trace Buffer trap polarity for protected VMs
  KVM: arm64: Fix Trace Buffer trapping for protected VMs

Signed-off-by: Marc Zyngier <maz@kernel.org>

...

This commit is contained in:

Marc Zyngier 2026-01-23 10:04:47 +00:00

parent cb6cd8a86d f7d05ee84a

commit c983b3e276

9 changed files with 108 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm64/include/asm/kvm_arm.h

View file

2

arch/arm64/include/asm/kvm_host.h

View file

32

arch/arm64/include/asm/kvm_pkvm.h

View file

18

arch/arm64/kvm/arch_timer.c

View file

52

arch/arm64/kvm/arm.c

View file

18

arch/arm64/kvm/hyp/nvhe/pkvm.c

View file

2

arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c

View file

2

arch/arm64/kvm/inject_fault.c

View file

4

arch/arm64/kvm/mmu.c

View file