From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C9B4C433DB for ; Tue, 9 Feb 2021 01:25:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A02864E6C for ; Tue, 9 Feb 2021 01:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230347AbhBIBZf (ORCPT ); Mon, 8 Feb 2021 20:25:35 -0500 Received: from mga04.intel.com ([192.55.52.120]:52715 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229816AbhBIBZb (ORCPT ); Mon, 8 Feb 2021 20:25:31 -0500 IronPort-SDR: 8uYKV5aeiN4H1dYLReTaQJZO/cwcR6bP3UZPKSFcSyR7VoYozzujmr2co4Fam1LSD+358+HCOa Tx4i/ppG2c9w== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="179251872" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="asc'?scan'208";a="179251872" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 17:23:45 -0800 IronPort-SDR: y+jeXAsnNmZV6FvzVTPdNbgBq1SCupULaKJuXGMmiokZpuvDu8VVocQPqeiT6RBQ1tBYk2t0eg VQzWsvQWIXIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="asc'?scan'208";a="398603670" Received: from zhen-hp.sh.intel.com (HELO zhen-hp) ([10.239.160.147]) by orsmga007.jf.intel.com with ESMTP; 08 Feb 2021 17:23:42 -0800 Date: Tue, 9 Feb 2021 09:08:17 +0800 From: Zhenyu Wang To: Yu Zhang Cc: zhi.a.wang@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie, daniel@ffwll.ch, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH] drm/i915/gvt/kvmgt: Fix the build failure in kvmgt. Message-ID: <20210209010817.GC2043@zhen-hp.sh.intel.com> Reply-To: Zhenyu Wang References: <20210208185210.6002-1-yu.c.zhang@linux.intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f61P+fpdnY2FZS1u" Content-Disposition: inline In-Reply-To: <20210208185210.6002-1-yu.c.zhang@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org --f61P+fpdnY2FZS1u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2021.02.09 02:52:10 +0800, Yu Zhang wrote: > Previously, commit 531810caa9f4 ("KVM: x86/mmu: Use > an rwlock for the x86 MMU") replaced KVM's mmu_lock > with type rwlock_t. This will cause a build failure > in kvmgt, which uses the same lock when trying to add/ > remove some GFNs to/from the page tracker. Fix it with > write_lock/unlocks in kvmgt. Thanks for the fix! I saw Paolo has already carried one in -next, so we are fine. >=20 > Reported-by: Stephen Rothwell > Signed-off-by: Yu Zhang > --- > drivers/gpu/drm/i915/gvt/kvmgt.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/= kvmgt.c > index 60f1a386dd06..b4348256ae95 100644 > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c > @@ -1703,7 +1703,7 @@ static int kvmgt_page_track_add(unsigned long handl= e, u64 gfn) > return -EINVAL; > } > =20 > - spin_lock(&kvm->mmu_lock); > + write_lock(&kvm->mmu_lock); > =20 > if (kvmgt_gfn_is_write_protected(info, gfn)) > goto out; > @@ -1712,7 +1712,7 @@ static int kvmgt_page_track_add(unsigned long handl= e, u64 gfn) > kvmgt_protect_table_add(info, gfn); > =20 > out: > - spin_unlock(&kvm->mmu_lock); > + write_unlock(&kvm->mmu_lock); > srcu_read_unlock(&kvm->srcu, idx); > return 0; > } > @@ -1737,7 +1737,7 @@ static int kvmgt_page_track_remove(unsigned long ha= ndle, u64 gfn) > return -EINVAL; > } > =20 > - spin_lock(&kvm->mmu_lock); > + write_lock(&kvm->mmu_lock); > =20 > if (!kvmgt_gfn_is_write_protected(info, gfn)) > goto out; > @@ -1746,7 +1746,7 @@ static int kvmgt_page_track_remove(unsigned long ha= ndle, u64 gfn) > kvmgt_protect_table_del(info, gfn); > =20 > out: > - spin_unlock(&kvm->mmu_lock); > + write_unlock(&kvm->mmu_lock); > srcu_read_unlock(&kvm->srcu, idx); > return 0; > } > @@ -1772,7 +1772,7 @@ static void kvmgt_page_track_flush_slot(struct kvm = *kvm, > struct kvmgt_guest_info *info =3D container_of(node, > struct kvmgt_guest_info, track_node); > =20 > - spin_lock(&kvm->mmu_lock); > + write_lock(&kvm->mmu_lock); > for (i =3D 0; i < slot->npages; i++) { > gfn =3D slot->base_gfn + i; > if (kvmgt_gfn_is_write_protected(info, gfn)) { > @@ -1781,7 +1781,7 @@ static void kvmgt_page_track_flush_slot(struct kvm = *kvm, > kvmgt_protect_table_del(info, gfn); > } > } > - spin_unlock(&kvm->mmu_lock); > + write_unlock(&kvm->mmu_lock); > } > =20 > static bool __kvmgt_vgpu_exist(struct intel_vgpu *vgpu, struct kvm *kvm) > --=20 > 2.17.1 >=20 --f61P+fpdnY2FZS1u Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQTXuabgHDW6LPt9CICxBBozTXgYJwUCYCHggQAKCRCxBBozTXgY J4FcAJsFxkXndfIuWXcRxMohV8DLfSmIbwCeNihYVZJrpZ/nzUK+LJJnAinbtbE= =YD2h -----END PGP SIGNATURE----- --f61P+fpdnY2FZS1u--