public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915/selftests: Rework context handling in hugepages selftests

Browse source 
In the next commit, we don't evict when refcount = 0, so we need to
call drain freed objects, because we want to pin new bo's in the same
place, causing a test failure.

Furthermore, since each subtest is separated, it's a lot better to use
i915_live_selftests, so each subtest starts with a clean slate, and a
clean address space.

v2(Reported-by: kernel test robot <lkp@intel.com>):
  - Make hugepage_ctx static.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211028125855.3281674-9-matthew.auld@intel.com
This commit is contained in:
Maarten Lankhorst 2021-10-28 13:58:53 +01:00 • committed by Matthew Auld
parent 52a743f1c1
commit c10a652e23
1 changed files with 80 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
View file

@ -22,6 +22,22 @@
#include "selftests/mock_region.h" #include "selftests/mock_region.h"
#include "selftests/i915_random.h" #include "selftests/i915_random.h"
static struct i915_gem_context *hugepage_ctx(struct drm_i915_private *i915,
struct file *file)
{
struct i915_gem_context *ctx = live_context(i915, file);
struct i915_address_space *vm;
if (IS_ERR(ctx))
return ctx;
vm = ctx->vm;
if (vm)
WRITE_ONCE(vm->scrub_64K, true);
return ctx;
}
static const unsigned int page_sizes[] = { static const unsigned int page_sizes[] = {
I915_GTT_PAGE_SIZE_2M, I915_GTT_PAGE_SIZE_2M,
I915_GTT_PAGE_SIZE_64K, I915_GTT_PAGE_SIZE_64K,
@ -959,6 +975,8 @@ static int igt_mock_ppgtt_64K(void *arg)
__i915_gem_object_put_pages(obj); __i915_gem_object_put_pages(obj);
i915_gem_object_unlock(obj); i915_gem_object_unlock(obj);
i915_gem_object_put(obj); i915_gem_object_put(obj);
i915_gem_drain_freed_objects(i915);
} }
} }
@ -1080,10 +1098,6 @@ static int __igt_write_huge(struct intel_context *ce,
if (IS_ERR(vma)) if (IS_ERR(vma))
return PTR_ERR(vma); return PTR_ERR(vma);
err = i915_vma_unbind(vma);
if (err)
return err;
err = i915_vma_pin(vma, size, 0, flags | offset); err = i915_vma_pin(vma, size, 0, flags | offset);
if (err) { if (err) {
/* /*
@ -1117,7 +1131,7 @@ out_vma_unpin:
return err; return err;
} }
static int igt_write_huge(struct i915_gem_context *ctx, static int igt_write_huge(struct drm_i915_private *i915,
struct drm_i915_gem_object *obj) struct drm_i915_gem_object *obj)
{ {
struct i915_gem_engines *engines; struct i915_gem_engines *engines;
@ -1127,6 +1141,8 @@ static int igt_write_huge(struct i915_gem_context *ctx,
IGT_TIMEOUT(end_time); IGT_TIMEOUT(end_time);
unsigned int max_page_size; unsigned int max_page_size;
unsigned int count; unsigned int count;
struct i915_gem_context *ctx;
struct file *file;
u64 max; u64 max;
u64 num; u64 num;
u64 size; u64 size;
@ -1134,6 +1150,16 @@ static int igt_write_huge(struct i915_gem_context *ctx,
int i, n; int i, n;
int err = 0; int err = 0;
file = mock_file(i915);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = hugepage_ctx(i915, file);
if (IS_ERR(ctx)) {
err = PTR_ERR(ctx);
goto out;
}
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj)); GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
size = obj->base.size; size = obj->base.size;
@ -1153,7 +1179,7 @@ static int igt_write_huge(struct i915_gem_context *ctx,
} }
i915_gem_context_unlock_engines(ctx); i915_gem_context_unlock_engines(ctx);
if (!n) if (!n)
return 0; goto out;
/* /*
* To keep things interesting when alternating between engines in our * To keep things interesting when alternating between engines in our
@ -1215,6 +1241,8 @@ static int igt_write_huge(struct i915_gem_context *ctx,
kfree(order); kfree(order);
out:
fput(file);
return err; return err;
} }
@ -1277,8 +1305,7 @@ static u32 igt_random_size(struct rnd_state *prng,
static int igt_ppgtt_smoke_huge(void *arg) static int igt_ppgtt_smoke_huge(void *arg)
{ {
struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = arg;
struct drm_i915_private *i915 = ctx->i915;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
I915_RND_STATE(prng); I915_RND_STATE(prng);
struct { struct {
@ -1302,6 +1329,7 @@ static int igt_ppgtt_smoke_huge(void *arg)
u32 min = backends[i].min; u32 min = backends[i].min;
u32 max = backends[i].max; u32 max = backends[i].max;
u32 size = max; u32 size = max;
try_again: try_again:
size = igt_random_size(&prng, min, rounddown_pow_of_two(size)); size = igt_random_size(&prng, min, rounddown_pow_of_two(size));
@ -1336,7 +1364,7 @@ try_again:
goto out_unpin; goto out_unpin;
} }
err = igt_write_huge(ctx, obj); err = igt_write_huge(i915, obj);
if (err) { if (err) {
pr_err("%s write-huge failed with size=%u, i=%d\n", pr_err("%s write-huge failed with size=%u, i=%d\n",
__func__, size, i); __func__, size, i);
@ -1363,8 +1391,7 @@ out_put:
static int igt_ppgtt_sanity_check(void *arg) static int igt_ppgtt_sanity_check(void *arg)
{ {
struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = arg;
struct drm_i915_private *i915 = ctx->i915;
unsigned int supported = INTEL_INFO(i915)->page_sizes; unsigned int supported = INTEL_INFO(i915)->page_sizes;
struct { struct {
igt_create_fn fn; igt_create_fn fn;
@ -1431,7 +1458,7 @@ static int igt_ppgtt_sanity_check(void *arg)
if (pages) if (pages)
obj->mm.page_sizes.sg = pages; obj->mm.page_sizes.sg = pages;
err = igt_write_huge(ctx, obj); err = igt_write_huge(i915, obj);
i915_gem_object_lock(obj, NULL); i915_gem_object_lock(obj, NULL);
i915_gem_object_unpin_pages(obj); i915_gem_object_unpin_pages(obj);
@ -1458,15 +1485,27 @@ out:
static int igt_tmpfs_fallback(void *arg) static int igt_tmpfs_fallback(void *arg)
{ {
struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = arg;
struct drm_i915_private *i915 = ctx->i915; struct i915_address_space *vm;
struct i915_gem_context *ctx;
struct vfsmount *gemfs = i915->mm.gemfs; struct vfsmount *gemfs = i915->mm.gemfs;
struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx);
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct i915_vma *vma; struct i915_vma *vma;
struct file *file;
u32 *vaddr; u32 *vaddr;
int err = 0; int err = 0;
file = mock_file(i915);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = hugepage_ctx(i915, file);
if (IS_ERR(ctx)) {
err = PTR_ERR(ctx);
goto out;
}
vm = i915_gem_context_get_eb_vm(ctx);
/* /*
* Make sure that we don't burst into a ball of flames upon falling back * Make sure that we don't burst into a ball of flames upon falling back
* to tmpfs, which we rely on if on the off-chance we encouter a failure * to tmpfs, which we rely on if on the off-chance we encouter a failure
@ -1510,33 +1549,47 @@ out_restore:
i915->mm.gemfs = gemfs; i915->mm.gemfs = gemfs;
i915_vm_put(vm); i915_vm_put(vm);
out:
fput(file);
return err; return err;
} }
static int igt_shrink_thp(void *arg) static int igt_shrink_thp(void *arg)
{ {
struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = arg;
struct drm_i915_private *i915 = ctx->i915; struct i915_address_space *vm;
struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); struct i915_gem_context *ctx;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct i915_gem_engines_iter it; struct i915_gem_engines_iter it;
struct intel_context *ce; struct intel_context *ce;
struct i915_vma *vma; struct i915_vma *vma;
struct file *file;
unsigned int flags = PIN_USER; unsigned int flags = PIN_USER;
unsigned int n; unsigned int n;
bool should_swap; bool should_swap;
int err = 0; int err;
if (!igt_can_allocate_thp(i915)) {
pr_info("missing THP support, skipping\n");
return 0;
}
file = mock_file(i915);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = hugepage_ctx(i915, file);
if (IS_ERR(ctx)) {
err = PTR_ERR(ctx);
goto out;
}
vm = i915_gem_context_get_eb_vm(ctx);
/* /*
* Sanity check shrinking huge-paged object -- make sure nothing blows * Sanity check shrinking huge-paged object -- make sure nothing blows
* up. * up.
*/ */
if (!igt_can_allocate_thp(i915)) {
pr_info("missing THP support, skipping\n");
goto out_vm;
}
obj = i915_gem_object_create_shmem(i915, SZ_2M); obj = i915_gem_object_create_shmem(i915, SZ_2M);
if (IS_ERR(obj)) { if (IS_ERR(obj)) {
err = PTR_ERR(obj); err = PTR_ERR(obj);
@ -1626,7 +1679,8 @@ out_put:
i915_gem_object_put(obj); i915_gem_object_put(obj);
out_vm: out_vm:
i915_vm_put(vm); i915_vm_put(vm);
out:
fput(file);
return err; return err;
} }
@ -1687,10 +1741,6 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
SUBTEST(igt_ppgtt_smoke_huge), SUBTEST(igt_ppgtt_smoke_huge),
SUBTEST(igt_ppgtt_sanity_check), SUBTEST(igt_ppgtt_sanity_check),
}; };
struct i915_gem_context *ctx;
struct i915_address_space *vm;
struct file *file;
int err;
if (!HAS_PPGTT(i915)) { if (!HAS_PPGTT(i915)) {
pr_info("PPGTT not supported, skipping live-selftests\n"); pr_info("PPGTT not supported, skipping live-selftests\n");
@ -1700,23 +1750,5 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
if (intel_gt_is_wedged(&i915->gt)) if (intel_gt_is_wedged(&i915->gt))
return 0; return 0;
file = mock_file(i915); return i915_live_subtests(tests, i915);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = live_context(i915, file);
if (IS_ERR(ctx)) {
err = PTR_ERR(ctx);
goto out_file;
}
vm = ctx->vm;
if (vm)
WRITE_ONCE(vm->scrub_64K, true);
err = i915_subtests(tests, ctx);
out_file:
fput(file);
return err;
} }