Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757776AbcDEJDZ (ORCPT ); Tue, 5 Apr 2016 05:03:25 -0400 Received: from mail.fireflyinternet.com ([87.106.93.118]:51810 "EHLO fireflyinternet.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756749AbcDEJDW (ORCPT ); Tue, 5 Apr 2016 05:03:22 -0400 X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Date: Tue, 5 Apr 2016 10:03:08 +0100 From: Chris Wilson To: Joonas Lahtinen Cc: intel-gfx@lists.freedesktop.org, Andrew Morton , David Rientjes , Roman Pen , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin , Mika Kahola Subject: Re: [PATCH v2 3/3] drm/i915/shrinker: Hook up vmap allocation failure notifier Message-ID: <20160405090308.GE24026@nuc-i3427.alporthouse.com> Mail-Followup-To: Chris Wilson , Joonas Lahtinen , intel-gfx@lists.freedesktop.org, Andrew Morton , David Rientjes , Roman Pen , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin , Mika Kahola References: <1459777603-23618-1-git-send-email-chris@chris-wilson.co.uk> <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> <1459844378.5564.12.camel@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1459844378.5564.12.camel@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3546 Lines: 95 On Tue, Apr 05, 2016 at 11:19:38AM +0300, Joonas Lahtinen wrote: > On ma, 2016-04-04 at 14:46 +0100, Chris Wilson wrote: > > If the core runs out of vmap address space, it will call a notifier in > > case any driver can reap some of its vmaps. As i915.ko is possibily > > holding onto vmap address space that could be recovered, hook into the > > notifier chain and try and reap objects holding onto vmaps. > > > > Signed-off-by: Chris Wilson > > Cc: Andrew Morton > > Cc: David Rientjes > > Cc: Roman Pen > > Cc: Mel Gorman > > Cc: linux-mm@kvack.org > > Cc: linux-kernel@vger.kernel.org > > Cc: Joonas Lahtinen > > A comment below. But regardless; > > Reviewed-by: Joonas Lahtinen > > > Cc: Tvrtko Ursulin > > Cc: Mika Kahola > > --- > > ?drivers/gpu/drm/i915/i915_drv.h??????????|??1 + > > ?drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++ > > ?2 files changed, 40 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index dd187727c813..6443745d4182 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -1257,6 +1257,7 @@ struct i915_gem_mm { > > ? struct i915_hw_ppgtt *aliasing_ppgtt; > > ? > > ? struct notifier_block oom_notifier; > > + struct notifier_block vmap_notifier; > > ? struct shrinker shrinker; > > ? bool shrinker_no_lock_stealing; > > ? > > diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c > > index e391ee3ec486..be7501afb59e 100644 > > --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c > > +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c > > @@ -28,6 +28,7 @@ > > ?#include > > ?#include > > ?#include > > +#include > > ?#include > > ?#include > > ? > > @@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) > > ? return NOTIFY_DONE; > > ?} > > ? > > +static int > > +i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) > > +{ > > + struct drm_i915_private *dev_priv = > > + container_of(nb, struct drm_i915_private, mm.vmap_notifier); > > + struct drm_device *dev = dev_priv->dev; > > + unsigned long timeout = msecs_to_jiffies(5000) + 1; > > + unsigned long freed_pages; > > + bool was_interruptible; > > + bool unlock; > > + > > + while (!i915_gem_shrinker_lock(dev, &unlock) && --timeout) { > > + schedule_timeout_killable(1); > > + if (fatal_signal_pending(current)) > > + return NOTIFY_DONE; > > + } > > + if (timeout == 0) { > > + pr_err("Unable to purge GPU vmaps due to lock contention.\n"); > > + return NOTIFY_DONE; > > + } > > + > > + was_interruptible = dev_priv->mm.interruptible; > > + dev_priv->mm.interruptible = false; > > + > > + freed_pages = i915_gem_shrink_all(dev_priv); > > + > > + dev_priv->mm.interruptible = was_interruptible; > > Up until here this is same function as the oom shrinker, so I would > combine these two and here do "if (vmap) goto out;" sort of thing. > > Would just need a way to distinct between two calling sites. I did not > come up with a quick solution as both are passing 0 as event. Less thrilled about merging the two notifier callbacks, but we could wrap i915_gem_shrinker_lock_killable(). -Chris -- Chris Wilson, Intel Open Source Technology Centre