On 03/10/19 03:43, paul...@kernel.org wrote: > From: "Paul E. McKenney" <paul...@kernel.org> > > This commit replaces the use of rcu_swap_protected() with the more > intuitively appealing rcu_replace() as a step towards removing > rcu_swap_protected(). > > Link: > https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=z7-ggtm6wcvtyytxza1+bhqta4gg...@mail.gmail.com/ > Reported-by: Linus Torvalds <torva...@linux-foundation.org> > Signed-off-by: Paul E. McKenney <paul...@kernel.org> > Cc: Paolo Bonzini <pbonz...@redhat.com> > Cc: "Radim Krčmář" <rkrc...@redhat.com> > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: Borislav Petkov <b...@alien8.de> > Cc: "H. Peter Anvin" <h...@zytor.com> > Cc: <x...@kernel.org> > Cc: <k...@vger.kernel.org> > --- > arch/x86/kvm/pmu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c > index 46875bb..4c37266 100644 > --- a/arch/x86/kvm/pmu.c > +++ b/arch/x86/kvm/pmu.c > @@ -416,8 +416,8 @@ int kvm_vm_ioctl_set_pmu_event_filter(struct kvm *kvm, > void __user *argp) > *filter = tmp; > > mutex_lock(&kvm->lock); > - rcu_swap_protected(kvm->arch.pmu_event_filter, filter, > - mutex_is_locked(&kvm->lock)); > + filter = rcu_replace(kvm->arch.pmu_event_filter, filter, > + mutex_is_locked(&kvm->lock)); > mutex_unlock(&kvm->lock); > > synchronize_srcu_expedited(&kvm->srcu); >
Should go without saying, but Acked-by: Paolo Bonzini <pbonz...@redhat.com> Paolo
