KVM: x86: Explicitly state lockdep condition of msr_filter update

Replace `1` with the actual mutex_is_locked() check.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://lore.kernel.org/r/20230107001256.2365304-5-mhal@rbox.co
[sean: delete the comment that explained the hardocded '1']
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9c66cb3657b45c57d4c2ea31d3ac2a2ca29029f4..00e4bf16bbfd7f2f5d934e7eaecde57b9e3a3f6d 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6492,8 +6492,8 @@ static int kvm_vm_ioctl_set_msr_filter(struct kvm *kvm,
        }
 
        mutex_lock(&kvm->lock);
-       /* The per-VM filter is protected by kvm->lock... */
-       old_filter = rcu_replace_pointer(kvm->arch.msr_filter, new_filter, 1);
+       old_filter = rcu_replace_pointer(kvm->arch.msr_filter, new_filter,
+                                        mutex_is_locked(&kvm->lock));
        mutex_unlock(&kvm->lock);
        synchronize_srcu(&kvm->srcu);