From patchwork Tue Nov 1 13:28:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9407387 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 E156860234 for ; Tue, 1 Nov 2016 13:28:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BACF92989A for ; Tue, 1 Nov 2016 13:28:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF176298A3; Tue, 1 Nov 2016 13:28:26 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 00EBF2989A for ; Tue, 1 Nov 2016 13:28:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC8056E1D9; Tue, 1 Nov 2016 13:28:25 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDD8B6E1D9 for ; Tue, 1 Nov 2016 13:28:23 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p190so16492733wmp.1 for ; Tue, 01 Nov 2016 06:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=NuOTsSmrEcqyCXGjY9DrHikm2s/zwzuAUM2K9mD/m3c=; b=JTucQ0vKJcJA0PvAEI/YT5YNYs/Cax+pKpgYR8puY3S0hzOJWlIlBC5NPOlM5KQC66 eNyUnzusty3AjmFfu/Re2HZ5NZCgegJO3VB8MRc8zFCo+WCXMDVSPzFyNsnCLS/0xHyP CzMG3nRbFWqd0J9LvP3PLQ4b8UC4Ym+4sHDoVyH575//FOrN7O6j9KtIpHCsDsTb7xS/ mJx9M2YZbZrEKHL4PgqXoj5+8eO0ksGfXg9KBjWK2XkhI7Udb0J9b49dXOZciwBNhQ/V lyhGJxMLyG6hfcynlfLGelcJzbIZ1YfxsToZ8mm+2zZHtXjzrk23jqAds/6oVPxufQpO Zpxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NuOTsSmrEcqyCXGjY9DrHikm2s/zwzuAUM2K9mD/m3c=; b=YxAfh0G4OwT9lHYfGePpTI1hEobU3m4S5lMbtcJZwBnynm3KBcdoiqe2tESlM0LjS0 9dg8idmEag7hysEUjka11yvMusQo70waoKNMW78pFKVJfmuHjodJZspiAZaVVqgD/0Ca QOhGcrCMl76/7DVLot9ftXXmw8jYZt6kglo6Jvu5fr0y4/llLrwAnItmvtXXHT1IbzFn Dy6snwswvnJwJGKcHNC/ksM5EOS3JapWRoQzrNs71GfuuFI8SeN3/lDSe0Z454XZpO8E jTyYE8fIwNsBMFMTTBZr+2pgxtBIoc/faWY7qWuxGdHqJPRxb/C1PzsNn1rszBoLTl1y 5JAA== X-Gm-Message-State: ABUngvdpR5+Bp9KusCkUeFEF1wGGlsd6tYCjM0h355dwDcNh+x9z37OiTh6E1qHPWbyKuw== X-Received: by 10.194.87.230 with SMTP id bb6mr1167172wjb.163.1478006902256; Tue, 01 Nov 2016 06:28:22 -0700 (PDT) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id jg6sm2774419wjb.22.2016.11.01.06.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Nov 2016 06:28:21 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 1 Nov 2016 13:28:06 +0000 Message-Id: <1478006886-4489-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 Cc: Mika Kuoppala , stable@vger.kernel.org Subject: [Intel-gfx] [PATCH] drm/i915: Allow shrinking of userptr objects once again 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Commit 1bec9b0bda3d ("drm/i915/shrinker: Only shmemfs objects are backed by swap") stopped considering the userptr objects in shrinker callbacks. Restore that so idle userptr objects can be discarded in order to free up memory. One change further to what was introduced in 1bec9b0bda3d is to start considering userptr objects in oom but that should also be a correct thing to do. Signed-off-by: Tvrtko Ursulin Fixes: 1bec9b0bda3d ("drm/i915/shrinker: Only shmemfs objects are backed by swap") Cc: Chris Wilson Cc: Joonas Lahtinen Cc: Mika Kuoppala Cc: --- drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index 0993afc0e725..dfca1f6b3630 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -83,8 +83,8 @@ static bool can_release_pages(struct drm_i915_gem_object *obj) if (!obj->mm.pages) return false; - /* Only shmemfs objects are backed by swap */ - if (!obj->base.filp) + /* shmemfs and userptr objects are backed by swap */ + if (!obj->base.filp && !obj->userptr.mm) return false; /* Only report true if by unbinding the object and putting its pages