From patchwork Wed Apr 20 11:09:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8888641 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6DB0BF440 for ; Wed, 20 Apr 2016 11:10:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 204AB20165 for ; Wed, 20 Apr 2016 11:10:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4614520172 for ; Wed, 20 Apr 2016 11:10:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D71FD6E96A; Wed, 20 Apr 2016 11:10:07 +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 DC8AD6E966 for ; Wed, 20 Apr 2016 11:10:04 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l6so12707187wml.3 for ; Wed, 20 Apr 2016 04:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=ShxJZq0QVBUFzd8l1nYveo96zyHzz/nyN0R72u/lf7s=; b=NIG2Se0kz5ie02Vqrx3fGf59Ba8Dwy7CpT5gCI5kjUgvkYqQfBiDfLja7Bkcz10Qr2 SwALOzzPGYHy3R16WMYo0O5WuEz0JSZO3t8ioNY9/yHkbB5l0qP00CIK53kv4aNF3b/o vsXsAgaG2rKXiV630qmy+tOmL95zAGn1GP9rABVOHttx5mRQrUwSu/aa0NOrjjVSLN0c dooP8h2Ku42VuFQkPz9RIVTKyIoE+Ubh43ksrffobPvqCfFLIJ8q0wioXYAXD4jYsB5U OX/+Ax3ogJjIxdd9nU1r7B4Ry5fTGFVHoCGkmQFSoQ7R4vnTZ5Flnt3rNxjK+jFm5T3z Jd7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ShxJZq0QVBUFzd8l1nYveo96zyHzz/nyN0R72u/lf7s=; b=asZ6ckaab5z9VM+0V/n/E/ZvXdIDl0RbzXQ7KrujAGqSGEfm5/44/SDgzu2PGPHEbA AJ5R3ajDnaoqfQaHIc4I78pehvarShL6Fe5UvWjXt1ucLbf+PePMX7+WSp0nhPfmZj9Q N8gO7Yo28qYlOyAQzy3R3zK/yGsK8S6/3DBHDcID284NAhm8OnyKgccqWX6AzDleOq2G Re9NkH20jnreWqQCg51dNJCCvpM+QsVI4yKI7wb0q2KCpM65i0VjCkh7sQxaiU/6rOmC TkpZwO5qSLaFdkGsCrmuawSDwsLmpEe/IUUoGhEO3ZgxGpFzQ/fJM66DjFz4NeiCvD8H T43Q== X-Gm-Message-State: AOPr4FXPKmeLBrXC4a6GNLLAjrNF2hv1sjtO9zuDnJqc1zlWQDhXSN7Fy44Fw7ZJp1qagA== X-Received: by 10.194.63.226 with SMTP id j2mr8066760wjs.27.1461150603357; Wed, 20 Apr 2016 04:10:03 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 186sm9149771wmk.2.2016.04.20.04.10.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 04:10:02 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Apr 2016 12:09:50 +0100 Message-Id: <1461150592-27818-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 Cc: Akash Goel Subject: [Intel-gfx] [PATCH v2 1/3] drm/i915/shrinker: Only report objects with extra pinned pages as pinned 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When iterating over the bound list, we expect all objects there to have their pages pinned (by the bound VMA). So only report those objects with additional pin count on their pages as "pinned". These should be those objects used for display and hardware access. Reported-by: Akash Goel Signed-off-by: Chris Wilson Cc: Akash Goel Cc: Joonas Lahtinen Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index d46388f25e04..4e4fcfa76b4c 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -361,7 +361,7 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) if (!obj->base.filp) continue; - if (obj->pages_pin_count) + if (obj->pages_pin_count > num_vma_bound(obj)) pinned += obj->base.size; else bound += obj->base.size;