From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org,
"Tvrtko Ursulin" <tvrtko.ursulin@intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: fixup igt_shrink_thp
Date: Mon, 6 Sep 2021 13:19:38 +0100 [thread overview]
Message-ID: <60a47a43-2443-1077-1510-34644c09d93b@linux.intel.com> (raw)
In-Reply-To: <20210906091729.2093312-1-matthew.auld@intel.com>
On 06/09/2021 10:17, 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.
>
> v2: Some machine in the shard runs doesn't seem to have any available
> swap when running this test. Try to handle this.
>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> #v1
> ---
> .../gpu/drm/i915/gem/selftests/huge_pages.c | 31 ++++++++++++++-----
> 1 file changed, 24 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index a094f3ce1a90..46ea1997c114 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1519,6 +1519,7 @@ static int igt_shrink_thp(void *arg)
> struct i915_vma *vma;
> unsigned int flags = PIN_USER;
> unsigned int n;
> + bool should_swap;
> int err = 0;
>
> /*
> @@ -1567,23 +1568,39 @@ static int igt_shrink_thp(void *arg)
> break;
> }
> i915_gem_context_unlock_engines(ctx);
> + /*
> + * Nuke everything *before* we unpin the pages so we can be reasonably
> + * sure that when later checking get_nr_swap_pages() that some random
> + * leftover object doesn't steal the remaining swap space.
> + */
> + i915_gem_shrink(NULL, i915, -1UL, NULL,
> + I915_SHRINK_BOUND |
> + I915_SHRINK_UNBOUND |
> + I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> goto out_put;
>
> +
> /*
> - * Now that the pages are *unpinned* shrink-all should invoke
> - * shmem to truncate our pages.
> + * Now that the pages are *unpinned* shrinking should invoke
> + * shmem to truncate our pages, if we have available swap.
> */
> - i915_gem_shrink_all(i915);
> - if (i915_gem_object_has_pages(obj)) {
> - pr_err("shrink-all didn't truncate the pages\n");
> + should_swap = get_nr_swap_pages() > 0;
> + i915_gem_shrink(NULL, i915, -1UL, NULL,
> + I915_SHRINK_BOUND |
> + I915_SHRINK_UNBOUND |
> + I915_SHRINK_ACTIVE);
> + if (should_swap == i915_gem_object_has_pages(obj)) {
Hmm is there any value running the test if no swap (given objects used
by the test are "willneed"), or you could simplify and just do early skip?
Regards,
Tvrtko
> + pr_err("unexpected pages mismatch, should_swap=%s\n",
> + yesno(should_swap));
> err = -EINVAL;
> goto out_put;
> }
>
> - if (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys) {
> - pr_err("residual page-size bits left\n");
> + if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> + pr_err("unexpected residual page-size bits, should_swap=%s\n",
> + yesno(should_swap));
> err = -EINVAL;
> goto out_put;
> }
>
next prev parent reply other threads:[~2021-09-06 12:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 9:17 [Intel-gfx] [PATCH] drm/i915/selftests: fixup igt_shrink_thp Matthew Auld
2021-09-06 9:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/selftests: fixup igt_shrink_thp (rev2) Patchwork
2021-09-06 10:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-06 12:02 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-09-06 12:19 ` Tvrtko Ursulin [this message]
2021-09-06 12:30 ` [Intel-gfx] [PATCH] drm/i915/selftests: fixup igt_shrink_thp Matthew Auld
2021-09-06 12:53 ` Tvrtko Ursulin
2021-09-06 13:48 ` Matthew Auld
2021-09-06 15:52 ` Tvrtko Ursulin
-- strict thread matches above, loose matches on Subject: below --
2021-07-28 15:50 Matthew Auld
2021-07-29 10:53 ` Tvrtko Ursulin
2021-07-29 10:55 ` Matthew Auld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60a47a43-2443-1077-1510-34644c09d93b@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tvrtko.ursulin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).