path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-19 08:21:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-19 08:21:29 -0800
commit45d36906e256fe9f8e976461b4c559722c3cbe2a (patch)
tree649e00cec719720c378fd518f84a53d299a357e7 /Documentation
parentf1e9132444a97b52b20d07f352323926b2df7c32 (diff)
parentef85b67385436ddc1998f45f1d6a210f935b3388 (diff)
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini: "Early fixes for x86. Instead of the (botched) revert, the lockdep/might_sleep splat has a real fix provided by Andrea" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF) kvm: take srcu lock around kvm_steal_time_set_preempted() kvm: fix schedule in atomic in kvm_steal_time_set_preempted() KVM: hyperv: fix locking of struct kvm_hv fields KVM: x86: Expose Intel AVX512IFMA/AVX512VBMI/SHA features to guest. kvm: nVMX: Correct a VMX instruction error code for VMPTRLD
Diffstat (limited to 'Documentation')
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/virtual/kvm/locking.txt b/Documentation/virtual/kvm/locking.txt
index e5dd9f4d6100..fd013bf4115b 100644
--- a/Documentation/virtual/kvm/locking.txt
+++ b/Documentation/virtual/kvm/locking.txt
@@ -13,8 +13,12 @@ The acquisition orders for mutexes are as follows:
- kvm->slots_lock is taken outside kvm->irq_lock, though acquiring
them together is quite rare.
-For spinlocks, kvm_lock is taken outside kvm->mmu_lock. Everything
-else is a leaf: no other lock is taken inside the critical sections.
+On x86, vcpu->mutex is taken outside kvm->arch.hyperv.hv_lock.
+For spinlocks, kvm_lock is taken outside kvm->mmu_lock.
+Everything else is a leaf: no other lock is taken inside the critical
2: Exception