From patchwork Thu Jun 15 06:43:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9788137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B4AB660231 for ; Thu, 15 Jun 2017 06:44:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A47C02841C for ; Thu, 15 Jun 2017 06:44:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95B4928420; Thu, 15 Jun 2017 06:44:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE3CB2841C for ; Thu, 15 Jun 2017 06:44:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C568D6E6A0; Thu, 15 Jun 2017 06:44:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B8316E6A0 for ; Thu, 15 Jun 2017 06:44:00 +0000 (UTC) Received: from localhost (LFbn-1-12060-104.w90-92.abo.wanadoo.fr [90.92.122.104]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id BC26F722; Thu, 15 Jun 2017 06:43:59 +0000 (UTC) To: daniel.vetter@ffwll.ch, chris@chris-wilson.co.uk, daniel.vetter@intel.com, gregkh@linuxfoundation.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, mael.lavault@protonmail.com, michal.winiarski@intel.com, michel.thierry@intel.com, mika.kuoppala@intel.com, stable@vger.kernel.org From: Date: Thu, 15 Jun 2017 08:43:51 +0200 In-Reply-To: <20170526082906.8982-1-daniel.vetter@ffwll.ch> Message-ID: <14975090317234@kroah.com> MIME-Version: 1.0 Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: [Intel-gfx] Patch "drm/i915: Do not drop pagetables when empty" has been added to the 4.11-stable tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This is a note to let you know that I've just added the patch titled drm/i915: Do not drop pagetables when empty to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-i915-do-not-drop-pagetables-when-empty.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From daniel.vetter@ffwll.ch Thu Jun 15 08:32:03 2017 From: Daniel Vetter Date: Fri, 26 May 2017 10:29:06 +0200 Subject: drm/i915: Do not drop pagetables when empty To: Intel Graphics Development Cc: Chris Wilson , Michel Thierry , Mika Kuoppala , Joonas Lahtinen , Michał Winiarski , Daniel Vetter , Jani Nikula , "# v4 . 10+" Message-ID: <20170526082906.8982-1-daniel.vetter@ffwll.ch> From: Chris Wilson This is the minimal backport for stable of the upstream commit: commit dd19674bacba227ae5d3ce680cbc5668198894dc Author: Chris Wilson Date: Wed Feb 15 08:43:46 2017 +0000 drm/i915: Remove bitmap tracking for used-ptes Due to a race with the shrinker, when we try to allocate a pagetable, we may end up shrinking it instead. This comes as a nasty surprise as we try to dereference it to fill in the pagetable entries for the object. In linus/master this is fixed by pinning the pagetables prior to allocation, but that backport is roughly drivers/gpu/drm/i915/i915_gem_gtt.c | 10 ---------- 1 file changed, 10 deletions(-) i.e. unsuitable for stable. Instead we neuter the code that tried to free the pagetables. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99295 Fixes: 2ce5179fe826 ("drm/i915/gtt: Free unused lower-level page tables") Signed-off-by: Chris Wilson Cc: Michel Thierry Cc: Mika Kuoppala Cc: Chris Wilson Cc: Joonas Lahtinen Cc: Michał Winiarski Cc: Daniel Vetter Cc: Jani Nikula Cc: intel-gfx@lists.freedesktop.org Cc: # v4.10+ Tested-by: Maël Lavault Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman Patches currently in stable-queue which might be from daniel.vetter@ffwll.ch are queue-4.11/drm-i915-do-not-drop-pagetables-when-empty.patch --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -755,10 +755,6 @@ static bool gen8_ppgtt_clear_pt(struct i GEM_BUG_ON(pte_end > GEN8_PTES); bitmap_clear(pt->used_ptes, pte, num_entries); - if (USES_FULL_PPGTT(vm->i915)) { - if (bitmap_empty(pt->used_ptes, GEN8_PTES)) - return true; - } pt_vaddr = kmap_px(pt); @@ -798,9 +794,6 @@ static bool gen8_ppgtt_clear_pd(struct i } } - if (bitmap_empty(pd->used_pdes, I915_PDES)) - return true; - return false; } @@ -829,9 +822,6 @@ static bool gen8_ppgtt_clear_pdp(struct mark_tlbs_dirty(ppgtt); - if (bitmap_empty(pdp->used_pdpes, I915_PDPES_PER_PDP(dev_priv))) - return true; - return false; }