From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: Patch "drm/i915: Do not drop pagetables when empty" has been added to the 4.11-stable tree Date: Thu, 15 Jun 2017 08:43:51 +0200 Message-ID: <14975090317234@kroah.com> References: <20170526082906.8982-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20170526082906.8982-1-daniel.vetter@ffwll.ch> Sender: stable-owner@vger.kernel.org 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 Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org 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 --- 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; } 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48734 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbdFOGoA (ORCPT ); Thu, 15 Jun 2017 02:44:00 -0400 Subject: Patch "drm/i915: Do not drop pagetables when empty" has been added to the 4.11-stable tree 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 Cc: , 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 --- 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; } 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