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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 CBD9FC3F37E for ; Thu, 27 Feb 2020 14:25:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F33A2468F for ; Thu, 27 Feb 2020 14:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813530; bh=0t2kYAsODT2lhOl+jQme+GSvt5/Gi8zhsfODqfavzOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KuW545/h36TB+/MznzYvTBfkGdAcgqi9YyirtRQYvQ4srJITIoGYHCxPf98M4wQWo MBzW62cBt6L0gvApDI72DyQnOkvFH8nRn3YEgvyn97bRc9TFkSrK2gFJuRpsx0praq 3sQpQr302G9CyU9Nb9kModnFNgtElXS9He8M6ASQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389198AbgB0OZ3 (ORCPT ); Thu, 27 Feb 2020 09:25:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:49792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387722AbgB0OLT (ORCPT ); Thu, 27 Feb 2020 09:11:19 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A9A0F24697; Thu, 27 Feb 2020 14:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812679; bh=0t2kYAsODT2lhOl+jQme+GSvt5/Gi8zhsfODqfavzOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLe78Qu+qLrtsoXVUHN88HYUEd2uo+7v4zNBuSDjyVY0lQ2jOhtuDEav0C9EWRjWk sjwv2Y1MIgtjitNrNw5w4v3X85cUG71POrh/6HomvhzTufj32HnHplp2QzgNiTrYQm /CwCVf/1U38E+NQUTACNCWiWhPTaOMa9Bbg48oW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Igor Druzhinin , Zhenyu Wang Subject: [PATCH 5.4 103/135] drm/i915/gvt: more locking for ppgtt mm LRU list Date: Thu, 27 Feb 2020 14:37:23 +0100 Message-Id: <20200227132244.712729602@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132228.710492098@linuxfoundation.org> References: <20200227132228.710492098@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Igor Druzhinin commit 0e9d7bb293f3f9c3ee376b126141407efb265f31 upstream. When the lock was introduced in commit 72aabfb862e40 ("drm/i915/gvt: Add mutual lock for ppgtt mm LRU list") one place got lost. Fixes: 72aabfb862e4 ("drm/i915/gvt: Add mutual lock for ppgtt mm LRU list") Signed-off-by: Igor Druzhinin Reviewed-by: Zhenyu Wang Signed-off-by: Zhenyu Wang Link: http://patchwork.freedesktop.org/patch/msgid/1580742421-25194-1-git-send-email-igor.druzhinin@citrix.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gvt/gtt.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1956,7 +1956,11 @@ void _intel_vgpu_mm_release(struct kref if (mm->type == INTEL_GVT_MM_PPGTT) { list_del(&mm->ppgtt_mm.list); + + mutex_lock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock); list_del(&mm->ppgtt_mm.lru_list); + mutex_unlock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock); + invalidate_ppgtt_mm(mm); } else { vfree(mm->ggtt_mm.virtual_ggtt);