]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge branch kvm-arm64/pkvm-features-6.20 into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 23 Jan 2026 10:04:47 +0000 (10:04 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 23 Jan 2026 10:04:47 +0000 (10:04 +0000)
commitc983b3e276859edfeb836ba9f981ed71eee249df
tree9912995e4ce5699ac4ab9e65e780ad4d0cb618de
parentcb6cd8a86d5b024f181b5520bcb948a27a257914
parentf7d05ee84a6a8d3775e0f0c3070d9380bed844a9
Merge branch kvm-arm64/pkvm-features-6.20 into kvmarm-master/next

* 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>
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/pkvm.c
arch/arm64/kvm/inject_fault.c
arch/arm64/kvm/mmu.c