aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Luczaj <[email protected]>2023-01-07 01:12:54 +0100
committerSean Christopherson <[email protected]>2023-02-03 15:30:39 -0800
commit1fdefb8bd862d7c17fc2526ec9fdfb080c15da45 (patch)
treeb3b9e05d75b62526bc3fc6137fdf722190651b19
parent4d85cfcaa82f0ceb5dcb7ad369a2cc7efb32c65c (diff)
KVM: x86: Explicitly state lockdep condition of msr_filter update
Replace `1` with the actual mutex_is_locked() check. Suggested-by: Sean Christopherson <[email protected]> Signed-off-by: Michal Luczaj <[email protected]> Link: https://lore.kernel.org/r/[email protected] [sean: delete the comment that explained the hardocded '1'] Signed-off-by: Sean Christopherson <[email protected]>
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9c66cb3657b4..00e4bf16bbfd 100644
--- 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);