diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-01-18 16:52:20 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-01-18 16:52:20 -0800 |
| commit | bd86d2ea369be2e768b58cba590e70b8bdc6f86a (patch) | |
| tree | 4cd68e21041237c0a4d7e0299f9bb3eeb1ac1e2c /virt/kvm/kvm_main.c | |
| parent | 19fa92fb72f8bc542f1673862058f3b078114004 (diff) | |
| parent | 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 (diff) | |
| download | linux-next-bd86d2ea369be2e768b58cba590e70b8bdc6f86a.tar.gz linux-next-bd86d2ea369be2e768b58cba590e70b8bdc6f86a.zip | |
Sync with v6.2-rc4
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 13e88297f999..9c60384b5ae0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3954,6 +3954,13 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) } mutex_lock(&kvm->lock); + +#ifdef CONFIG_LOCKDEP + /* Ensure that lockdep knows vcpu->mutex is taken *inside* kvm->lock */ + mutex_lock(&vcpu->mutex); + mutex_unlock(&vcpu->mutex); +#endif + if (kvm_get_vcpu_by_id(kvm, id)) { r = -EEXIST; goto unlock_vcpu_destroy; |