diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-11-10 13:11:38 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-11-10 13:11:38 +0000 |
| commit | 590925a178a3c8e9b694bce8e55bf9851c4b92f4 (patch) | |
| tree | a9417773853221761622d40e8fd65dafb5887baa /virt | |
| parent | 30a0b95b1335e12efef89dd78518ed3e4a71a763 (diff) | |
| parent | be0ddf5293a7895a8c9096e1a8560930c6a0ab3f (diff) | |
Merge tag 'kvmarm-fixes-6.1-3' into kvm-arm64/dirty-ring
KVM/arm64 fixes for 6.1, take #3
- Fix the pKVM stage-1 walker erronously using the stage-2 accessor
- Correctly convert vcpu->kvm to a hyp pointer when generating
an exception in a nVHE+MTE configuration
- Check that KVM_CAP_DIRTY_LOG_* are valid before enabling them
- Fix SMPRI_EL1/TPIDR2_EL0 trapping on VHE
- Document the boot requirements for FGT when entering the kernel
at EL1
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1376a47fedee..46e8ed1ae647 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4585,6 +4585,9 @@ static int kvm_vm_ioctl_enable_cap_generic(struct kvm *kvm, } case KVM_CAP_DIRTY_LOG_RING: case KVM_CAP_DIRTY_LOG_RING_ACQ_REL: + if (!kvm_vm_ioctl_check_extension_generic(kvm, cap->cap)) + return -EINVAL; + return kvm_vm_ioctl_enable_dirty_log_ring(kvm, cap->args[0]); default: return kvm_vm_ioctl_enable_cap(kvm, cap); |