kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wanpeng Li <kernellwp@gmail.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Sean Christopherson <seanjc@google.com>,
	Wanpeng Li <wanpengli@tencent.com>,
	Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
	LKML <linux-kernel@vger.kernel.org>, kvm <kvm@vger.kernel.org>
Subject: Re: [PATCH] KVM: x86: hyper-v: Task srcu lock when accessing kvm_memslots()
Date: Mon, 10 May 2021 16:51:19 +0800	[thread overview]
Message-ID: <CANRm+Cw-MdiZKt7rPKGM=7ZudW3c_H5--CGg82t7eChSBkn-FQ@mail.gmail.com> (raw)
In-Reply-To: <87mtt3vus5.fsf@vitty.brq.redhat.com>

On Mon, 10 May 2021 at 16:48, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>
> Wanpeng Li <kernellwp@gmail.com> writes:
>
> > From: Wanpeng Li <wanpengli@tencent.com>
> >
> >  WARNING: suspicious RCU usage
> >  5.13.0-rc1 #4 Not tainted
> >  -----------------------------
> >  ./include/linux/kvm_host.h:710 suspicious rcu_dereference_check() usage!
> >
> > other info that might help us debug this:
> >
> > rcu_scheduler_active = 2, debug_locks = 1
> >  1 lock held by hyperv_clock/8318:
> >   #0: ffffb6b8cb05a7d8 (&hv->hv_lock){+.+.}-{3:3}, at: kvm_hv_invalidate_tsc_page+0x3e/0xa0 [kvm]
> >
> > stack backtrace:
> > CPU: 3 PID: 8318 Comm: hyperv_clock Not tainted 5.13.0-rc1 #4
> > Call Trace:
> >  dump_stack+0x87/0xb7
> >  lockdep_rcu_suspicious+0xce/0xf0
> >  kvm_write_guest_page+0x1c1/0x1d0 [kvm]
> >  kvm_write_guest+0x50/0x90 [kvm]
> >  kvm_hv_invalidate_tsc_page+0x79/0xa0 [kvm]
> >  kvm_gen_update_masterclock+0x1d/0x110 [kvm]
> >  kvm_arch_vm_ioctl+0x2a7/0xc50 [kvm]
> >  kvm_vm_ioctl+0x123/0x11d0 [kvm]
> >  __x64_sys_ioctl+0x3ed/0x9d0
> >  do_syscall_64+0x3d/0x80
> >  entry_SYSCALL_64_after_hwframe+0x44/0xae
> >
> > kvm_memslots() will be called by kvm_write_guest(), so we should take the srcu lock.
> >
> > Fixes: e880c6ea5 (KVM: x86: hyper-v: Prevent using not-yet-updated TSC page by secondary CPUs)
> > Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> > ---
> >  arch/x86/kvm/hyperv.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
> > index f98370a3..f00830e 100644
> > --- a/arch/x86/kvm/hyperv.c
> > +++ b/arch/x86/kvm/hyperv.c
> > @@ -1172,6 +1172,7 @@ void kvm_hv_invalidate_tsc_page(struct kvm *kvm)
> >  {
> >       struct kvm_hv *hv = to_kvm_hv(kvm);
> >       u64 gfn;
> > +     int idx;
> >
> >       if (hv->hv_tsc_page_status == HV_TSC_PAGE_BROKEN ||
> >           hv->hv_tsc_page_status == HV_TSC_PAGE_UNSET ||
> > @@ -1190,9 +1191,16 @@ void kvm_hv_invalidate_tsc_page(struct kvm *kvm)
> >       gfn = hv->hv_tsc_page >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT;
> >
> >       hv->tsc_ref.tsc_sequence = 0;
> > +
> > +     /*
> > +      * Take the srcu lock as memslots will be accessed to check the gfn
> > +      * cache generation against the memslots generation.
> > +      */
> > +     idx = srcu_read_lock(&kvm->srcu);
> >       if (kvm_write_guest(kvm, gfn_to_gpa(gfn),
> >                           &hv->tsc_ref, sizeof(hv->tsc_ref.tsc_sequence)))
> >               hv->hv_tsc_page_status = HV_TSC_PAGE_BROKEN;
> > +     srcu_read_unlock(&kvm->srcu, idx);
> >
> >  out_unlock:
> >       mutex_unlock(&hv->hv_lock);
>
> Thanks!
>
> Do we need to do the same in kvm_hv_setup_tsc_page()?

kvm_hv_setup_tsc_page() is called in vcpu_enter_guest() path which has
already held kvm->srcu lock.

    Wanpeng

  reply	other threads:[~2021-05-10  8:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-10  8:21 [PATCH] KVM: x86: hyper-v: Task srcu lock when accessing kvm_memslots() Wanpeng Li
2021-05-10  8:48 ` Vitaly Kuznetsov
2021-05-10  8:51   ` Wanpeng Li [this message]
2021-05-10 11:15     ` Vitaly Kuznetsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANRm+Cw-MdiZKt7rPKGM=7ZudW3c_H5--CGg82t7eChSBkn-FQ@mail.gmail.com' \
    --to=kernellwp@gmail.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).