Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754500Ab0A0LUl (ORCPT ); Wed, 27 Jan 2010 06:20:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754456Ab0A0LUj (ORCPT ); Wed, 27 Jan 2010 06:20:39 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:44140 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320Ab0A0LUj (ORCPT ); Wed, 27 Jan 2010 06:20:39 -0500 Message-ID: <4B602186.8050303@cs.helsinki.fi> Date: Wed, 27 Jan 2010 13:20:38 +0200 From: Pekka Enberg User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: Chris Wilson CC: Linus Torvalds , Roman Jarosz , A Rojas , "A. Boulan" , michael@reinelt.co.at, jcnengel@googlemail.com, rientjes@google.com, earny@net4u.de, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, KOSAKI Motohiro , Hugh Dickins , Jesse Barnes , Eric Anholt , stable@kernel.org Subject: Re: [PATCH] drm/i915: Selectively enable self-reclaim References: <1264590844-22972-1-git-send-email-chris@chris-wilson.co.uk> In-Reply-To: <1264590844-22972-1-git-send-email-chris@chris-wilson.co.uk> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4464 Lines: 119 Chris Wilson kirjoitti: > Having missed the ENOMEM return via i915_gem_fault(), there are probably > other paths that I also missed. By not enabling NORETRY by default these > paths can run the shrinker and take memory from the system (but not from > our own inactive lists because our shrinker can not run whilst we hold > the struct mutex) and this may allow the system to survive a little longer > whilst our drivers consume all available memory. > > References: > OOM killer unexpectedly called with kernel 2.6.32 > http://bugzilla.kernel.org/show_bug.cgi?id=14933 > > Signed-off-by: Chris Wilson > Cc: KOSAKI Motohiro > Cc: Hugh Dickins > Cc: Jesse Barnes > Cc: Eric Anholt > Cc: stable@kernel.org Roman, can you give this patch a spin? > --- > drivers/gpu/drm/drm_gem.c | 13 ------------- > drivers/gpu/drm/i915/i915_gem.c | 22 ++++++++++------------ > 2 files changed, 10 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index e9dbb48..8bf3770 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -142,19 +142,6 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) > if (IS_ERR(obj->filp)) > goto free; > > - /* Basically we want to disable the OOM killer and handle ENOMEM > - * ourselves by sacrificing pages from cached buffers. > - * XXX shmem_file_[gs]et_gfp_mask() > - */ > - mapping_set_gfp_mask(obj->filp->f_path.dentry->d_inode->i_mapping, > - GFP_HIGHUSER | > - __GFP_COLD | > - __GFP_FS | > - __GFP_RECLAIMABLE | > - __GFP_NORETRY | > - __GFP_NOWARN | > - __GFP_NOMEMALLOC); > - > kref_init(&obj->refcount); > kref_init(&obj->handlecount); > obj->size = size; > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 28b8f03..1ef5b54 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -336,25 +336,25 @@ i915_gem_object_set_page_gfp_mask (struct drm_gem_object *obj, gfp_t gfp) > static int > i915_gem_object_get_pages_or_evict(struct drm_gem_object *obj) > { > + gfp_t gfp; > int ret; > > + gfp = i915_gem_object_get_page_gfp_mask(obj); > + i915_gem_object_set_page_gfp_mask(obj, gfp | __GFP_NORETRY | __GFP_NOWARN); > ret = i915_gem_object_get_pages(obj); > + i915_gem_object_set_page_gfp_mask (obj, gfp); > > /* If we've insufficient memory to map in the pages, attempt > * to make some space by throwing out some old buffers. > */ > if (ret == -ENOMEM) { > struct drm_device *dev = obj->dev; > - gfp_t gfp; > > ret = i915_gem_evict_something(dev, obj->size); > if (ret) > return ret; > > - gfp = i915_gem_object_get_page_gfp_mask(obj); > - i915_gem_object_set_page_gfp_mask(obj, gfp & ~__GFP_NORETRY); > ret = i915_gem_object_get_pages(obj); > - i915_gem_object_set_page_gfp_mask (obj, gfp); > } > > return ret; > @@ -2580,6 +2580,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) > struct drm_i915_gem_object *obj_priv = obj->driver_private; > struct drm_mm_node *free_space; > bool retry_alloc = false; > + gfp_t gfp; > int ret; > > if (obj_priv->madv != I915_MADV_WILLNEED) { > @@ -2623,15 +2624,12 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) > DRM_INFO("Binding object of size %zd at 0x%08x\n", > obj->size, obj_priv->gtt_offset); > #endif > - if (retry_alloc) { > - i915_gem_object_set_page_gfp_mask (obj, > - i915_gem_object_get_page_gfp_mask (obj) & ~__GFP_NORETRY); > - } > + gfp = i915_gem_object_get_page_gfp_mask(obj); > + if (! retry_alloc) > + i915_gem_object_set_page_gfp_mask (obj, gfp | __GFP_NORETRY | __GFP_NOWARN); > ret = i915_gem_object_get_pages(obj); > - if (retry_alloc) { > - i915_gem_object_set_page_gfp_mask (obj, > - i915_gem_object_get_page_gfp_mask (obj) | __GFP_NORETRY); > - } > + i915_gem_object_set_page_gfp_mask (obj, gfp); > + > if (ret) { > drm_mm_put_block(obj_priv->gtt_space); > obj_priv->gtt_space = NULL; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/