From patchwork Fri Jul 1 16:23:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9210157 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 B56B6607D8 for ; Fri, 1 Jul 2016 16:23:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4FEA284EE for ; Fri, 1 Jul 2016 16:23:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 976FE286A4; Fri, 1 Jul 2016 16:23:43 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DB33284EE for ; Fri, 1 Jul 2016 16:23:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AAB856E1B0; Fri, 1 Jul 2016 16:23:40 +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 20AAB6E1B0 for ; Fri, 1 Jul 2016 16:23:38 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r201so6423890wme.0 for ; Fri, 01 Jul 2016 09:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id; bh=wTwCkILuS7agZwn7b0dDkMqHL3OrZkwCOcdxY4RlrEI=; b=fq+Y6n2LWWCDx+TsDmIHX/kJBdO+lnRnxE1W8DTXzAIrbG/ZDkc4rCuiSbuMdSdP1X X9m25KOlN9NIJOgDPzpKtbrEoavUEmSaVvvP+IuMWqRkgVfh8fYTbCg02Af5KEQhJLDa 9JY0D/37mpTNfrkOvcjP9nYkgN6Sfz0GgVKF8PdCXfnSAyH69CkXuQysdoZjAhEI13K6 kIOuq4gjWeMoM0yJBhcW7IBKbiEY7A+fFCsh/kLPQeAuYeS72fMZwxRKrjbiJQscxKk/ WQxF/lyj3/86WoeryfZpcsorAyvzAtWoQ8lhreaeXgghCmpgrzvBHYaSyeM8OcW+6pLo KmjA== 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:subject:date:message-id; bh=wTwCkILuS7agZwn7b0dDkMqHL3OrZkwCOcdxY4RlrEI=; b=QUnUSdWTFKk3jejp6WHUiPy7qwG7vbfImldA62BhY2kiyyEiull97AdKv1sHBP5ZEt qtW2TwYWZP6kSf8svvJJm5I9JpxEHXiiePTX0kkmdXdc1o9iEOTz3HDt/CD8k3Ql4uyI iKO39K8EGDQig6V0vY9tMd5knbeqsmczo/UHpQtxKVU22d2L93gsO8W5f0tMmLkrDnMN DV/fWwfBqaj5f2hjqMb3T6bSqjDyNEkRLk5A1qFCqx0aB0kLZ8UtAt7iV3UcfU+CvxGK a/so7MFaXA9HmGiIO5PBwFv0Ta903ZSkxzOqrhEKmBi2si9HDPvLNcS4AfKZnhLpqMYf Aw2g== X-Gm-Message-State: ALyK8tLRUM3e2K41cOT6PsWi1xvQiva8LDeJOvTECEAlLiop/8D9siztbbKpUf9osnea6Q== X-Received: by 10.28.223.215 with SMTP id w206mr347132wmg.61.1467390216252; Fri, 01 Jul 2016 09:23:36 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id yr4sm6357408wjc.18.2016.07.01.09.23.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 09:23:34 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 1 Jul 2016 17:23:10 +0100 Message-Id: <1467390209-3576-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 Subject: [Intel-gfx] [CI 01/20] drm/i915/shrinker: Flush active on objects before counting 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 As we inspect obj->active to decide how many objects we can shrink (we only shrink idle objects), it helps to flush the active lists first in order to have a more accurate count of available objects. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index 886a8797566d..1bf14544d8ad 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -265,6 +265,8 @@ i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) if (!i915_gem_shrinker_lock(dev, &unlock)) return 0; + i915_gem_retire_requests(dev_priv); + count = 0; list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) if (can_release_pages(obj))