Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2398195pxj; Mon, 10 May 2021 01:49:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCkNV0Gdo7xdw7c519DQ6OHHTe5EphIL0VMHFGCAdKZ0liLdegLOK3xqrSDDVEDD5AyATC X-Received: by 2002:a6b:d11a:: with SMTP id l26mr17167514iob.88.1620636590657; Mon, 10 May 2021 01:49:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620636590; cv=none; d=google.com; s=arc-20160816; b=GuTjWwY5tqZlTQjHKZt5WOVt3Ly9OCUnb0MlrmzteFjSS9u7h18u8z4OBRMQhInRy8 MeaUK6ri+/jV1MV+0x1/l6ktsrPKvfT6G+Hh/VQcWCG8Tv3ICOZb9VG62udNT7v2lSZC IypXddsDG2uMI2/BBwXssA84zF7cNygWYmHjpn9m4Y5pHg5QFEJVnZWwAYvWxBOECNdj uB+8WXFXcSMkMecmCDjokL8MbGyZOMwoQNJVEosKb4+Yv3vSGnSsHTuKtTDbbDaSv3MW e5jIGBdVnrGXnAlsSxwYVtsrgujGF+s4BDKrtKDlWMFPvJytah5sWgZYZpvQkurCiam3 56VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=vnGpvIn/OC6naRdou+qWD5vB8Pajw3E3BttE4VJxDus=; b=OlaXWzMcCrdg3Y/FYh7ekhFZCjnUDb/ikSvDtlJ7AByr9WO51/BHGHbSImc1atgx+/ MQVmW9dnmoZ9xO636jNqtGUHFkzNjBq6R36jIhbRlIYXC+Xm79ntF9WmWRHuPQLabhju m2f9kzT6dQTDQcR50AzB1hi3D4pkLKAwdHF1zf8lp8j7guwXlJmoaX0OdFr7Rw7oTBBL TQphED4kZR4jfVakkitOvuF/4CZ8zkphvkbQOPoSoppBNhHQ5KGQfNfoXxDXMeDYjiYA ty6kxHjJcoO4KsNgFoSjMASFUJaNYy2kzc4vBPowECRcwfJicZ4a1i0pZODg7+TA1P6G F1gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q9LuQ8sC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x7si16420594ilv.97.2021.05.10.01.49.38; Mon, 10 May 2021 01:49:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q9LuQ8sC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230213AbhEJItw (ORCPT + 99 others); Mon, 10 May 2021 04:49:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37041 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230181AbhEJItv (ORCPT ); Mon, 10 May 2021 04:49:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620636527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vnGpvIn/OC6naRdou+qWD5vB8Pajw3E3BttE4VJxDus=; b=Q9LuQ8sCaSB4885NQHA3CVLgfHwiljSEw9tyjdO194mekw0f/0CASTd8ebBrQVVb35SnQX 3u5VodBvyr0lve/De05Pyd3QUAZaEqBA7rRR1IXivZF1uNzcSS4PdE6VbJh+JNF+HMwIA7 ytR41y7hQgiu7JErreSThCSc2zQjG7Y= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-lJCMRQFDOga9XLqid_EWRQ-1; Mon, 10 May 2021 04:48:45 -0400 X-MC-Unique: lJCMRQFDOga9XLqid_EWRQ-1 Received: by mail-wm1-f71.google.com with SMTP id 7-20020a05600c2307b02901432673350dso3250054wmo.9 for ; Mon, 10 May 2021 01:48:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=vnGpvIn/OC6naRdou+qWD5vB8Pajw3E3BttE4VJxDus=; b=kpSB1WZm8ANN71G2zFdF7LrkAbCk5PUQRmaFP4qcyGXG54QnM04Ou5ZmwwQZPMHQsn tMBS7AxNU+lf1YsgW5yE9/gmeq8gGwnp0MKXalNRyNqWzwqLXSrqH/vdRQ6ppIYxmVBo 2mD8grcNcyHKEGwpACe1d6HozE/kOJzgZ9nAel0dhHIJfkuZjiIjhxsWF3YGhbnDLact LY/TXH805oCFIALm13rYyyDx2Ff1pTWDf0fnnWJDUHSCou9zE+22NKRAP/aWUynGj0op 5b9Ova7cajn1KLJzuBPmbsMR74ITgk+b+Vf35jdtbk+5uMIlsTOZ4hPHGG8IgbSFropB L5nA== X-Gm-Message-State: AOAM533R9QJq65maDKC5zss6fGvKk1VqqBt8mxmikdpTLIHehkgsiZDs /NzPBlLWjtqqRgFNO/0qv4XD1z3AHr01W/VX9F5XWDwBnHfyg32lgEVuhk2NWEMqPYNVr/4hoyw mtB16WlwYG3jWN9tZesg3ZgxT X-Received: by 2002:a1c:9a95:: with SMTP id c143mr25302399wme.143.1620636524073; Mon, 10 May 2021 01:48:44 -0700 (PDT) X-Received: by 2002:a1c:9a95:: with SMTP id c143mr25302389wme.143.1620636523907; Mon, 10 May 2021 01:48:43 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id j13sm21697404wrw.93.2021.05.10.01.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 01:48:43 -0700 (PDT) From: Vitaly Kuznetsov To: Wanpeng Li Cc: Paolo Bonzini , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH] KVM: x86: hyper-v: Task srcu lock when accessing kvm_memslots() In-Reply-To: <1620634919-4563-1-git-send-email-wanpengli@tencent.com> References: <1620634919-4563-1-git-send-email-wanpengli@tencent.com> Date: Mon, 10 May 2021 10:48:42 +0200 Message-ID: <87mtt3vus5.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wanpeng Li writes: > From: Wanpeng Li > > 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 > --- > 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()? -- Vitaly