From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34ADDC432BE for ; Thu, 29 Jul 2021 10:56:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFE2C60EC0 for ; Thu, 29 Jul 2021 10:56:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EFE2C60EC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB9F66ED17; Thu, 29 Jul 2021 10:55:58 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 803BC6E0CF; Thu, 29 Jul 2021 10:55:57 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="234748533" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="234748533" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 03:55:57 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="664336706" Received: from badunne-mobl5.ger.corp.intel.com (HELO [10.252.9.201]) ([10.252.9.201]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 03:55:56 -0700 Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: fixup igt_shrink_thp To: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org References: <20210728155013.1741657-1-matthew.auld@intel.com> From: Matthew Auld Message-ID: <8c6468ab-a266-cb19-7b1e-e7840fa514c0@intel.com> Date: Thu, 29 Jul 2021 11:55:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 29/07/2021 11:53, Tvrtko Ursulin wrote: > > Hi Matt, > > On 28/07/2021 16:50, Matthew Auld wrote: >> Since the object might still be active here, the shrink_all will simply >> ignore it, which blows up in the test, since the pages will still be >> there. Currently THP is disabled which should result in the test being >> skipped, but if we ever re-enable THP we might start seeing the failure. >> Fix this by forcing I915_SHRINK_ACTIVE. >> >> Signed-off-by: Matthew Auld >> Cc: Tvrtko Ursulin >> --- >>   drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 5 ++++- >>   1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >> b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >> index a094f3ce1a90..7a67e880b562 100644 >> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >> @@ -1575,7 +1575,10 @@ static int igt_shrink_thp(void *arg) >>        * Now that the pages are *unpinned* shrink-all should invoke >>        * shmem to truncate our pages. >>        */ >> -    i915_gem_shrink_all(i915); >> +    i915_gem_shrink(NULL, i915, -1UL, NULL, >> +            I915_SHRINK_BOUND | >> +            I915_SHRINK_UNBOUND | >> +            I915_SHRINK_ACTIVE); >>       if (i915_gem_object_has_pages(obj)) { >>           pr_err("shrink-all didn't truncate the pages\n"); >>           err = -EINVAL; >> > > I did s/shrink-all/shrinking/ locally in the comment above, and in > pr_err below the call to shrinker. Are you okay if I repost like that > and with my r-b as part of my series? Sure. > > Regards, > > Tvrtko