[PATCH 1/4] ppgtt rng + timeout
Matthew Auld
matthew.auld at intel.com
Sun Sep 22 21:31:23 UTC 2019
---
.../gpu/drm/i915/gem/selftests/huge_pages.c | 103 ++++++++++--------
1 file changed, 55 insertions(+), 48 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index c5cea4379216..d19f4f07449c 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1183,20 +1183,33 @@ static int igt_ppgtt_exhaust_huge(void *arg)
return err;
}
+static u32 igt_random_size(struct rnd_state *prng,
+ u32 min_page_size,
+ u32 max_page_size)
+{
+ u32 size;
+ u32 mask;
+
+ GEM_BUG_ON(!is_power_of_2(min_page_size));
+ GEM_BUG_ON(!is_power_of_2(max_page_size));
+ GEM_BUG_ON(min_page_size < PAGE_SIZE);
+ GEM_BUG_ON(min_page_size > max_page_size);
+
+ mask = GENMASK_ULL(ilog2(max_page_size), PAGE_SHIFT);
+ size = prandom_u32_state(prng) & mask;
+ if (size < min_page_size)
+ size |= min_page_size;
+
+ return size;
+}
+
static int igt_ppgtt_internal_huge(void *arg)
{
struct i915_gem_context *ctx = arg;
struct drm_i915_private *i915 = ctx->i915;
struct drm_i915_gem_object *obj;
- static const unsigned int sizes[] = {
- SZ_64K,
- SZ_128K,
- SZ_256K,
- SZ_512K,
- SZ_1M,
- SZ_2M,
- };
- int i;
+ I915_RND_STATE(prng);
+ IGT_TIMEOUT(end_time);
int err;
/*
@@ -1204,8 +1217,8 @@ static int igt_ppgtt_internal_huge(void *arg)
* -- ensure that our writes land in the right place.
*/
- for (i = 0; i < ARRAY_SIZE(sizes); ++i) {
- unsigned int size = sizes[i];
+ do {
+ u32 size = igt_random_size(&prng, SZ_64K, SZ_2M);
obj = i915_gem_object_create_internal(i915, size);
if (IS_ERR(obj))
@@ -1216,29 +1229,29 @@ static int igt_ppgtt_internal_huge(void *arg)
goto out_put;
if (obj->mm.page_sizes.phys < I915_GTT_PAGE_SIZE_64K) {
- pr_info("internal unable to allocate huge-page(s) with size=%u\n",
- size);
- goto out_unpin;
+ pr_info("%s unable to allocate huge-page(s) with size=%u\n",
+ __func__, size);
+ err = -ENOMEM;
+ break;
}
err = igt_write_huge(ctx, obj);
if (err) {
- pr_err("internal write-huge failed with size=%u\n",
- size);
+ pr_err("%s write-huge failed with size=%u\n",
+ __func__, size);
goto out_unpin;
}
-
+out_unpin:
i915_gem_object_unpin_pages(obj);
__i915_gem_object_put_pages(obj, I915_MM_NORMAL);
+out_put:
i915_gem_object_put(obj);
- }
-
- return 0;
+ if (err)
+ break;
+ } while (!__igt_timeout(end_time, NULL));
-out_unpin:
- i915_gem_object_unpin_pages(obj);
-out_put:
- i915_gem_object_put(obj);
+ if (err == -ENOMEM)
+ err = 0;
return err;
}
@@ -1253,14 +1266,8 @@ static int igt_ppgtt_gemfs_huge(void *arg)
struct i915_gem_context *ctx = arg;
struct drm_i915_private *i915 = ctx->i915;
struct drm_i915_gem_object *obj;
- static const unsigned int sizes[] = {
- SZ_2M,
- SZ_4M,
- SZ_8M,
- SZ_16M,
- SZ_32M,
- };
- int i;
+ I915_RND_STATE(prng);
+ IGT_TIMEOUT(end_time);
int err;
/*
@@ -1269,12 +1276,12 @@ static int igt_ppgtt_gemfs_huge(void *arg)
*/
if (!igt_can_allocate_thp(i915)) {
- pr_info("missing THP support, skipping\n");
+ pr_info("%s missing THP support, skipping\n", __func__);
return 0;
}
- for (i = 0; i < ARRAY_SIZE(sizes); ++i) {
- unsigned int size = sizes[i];
+ do {
+ u32 size = igt_random_size(&prng, SZ_2M, SZ_32M);
obj = i915_gem_object_create_shmem(i915, size);
if (IS_ERR(obj))
@@ -1285,29 +1292,29 @@ static int igt_ppgtt_gemfs_huge(void *arg)
goto out_put;
if (obj->mm.page_sizes.phys < I915_GTT_PAGE_SIZE_2M) {
- pr_info("finishing test early, gemfs unable to allocate huge-page(s) with size=%u\n",
- size);
- goto out_unpin;
+ pr_info("%s finishing test early, gemfs unable to allocate huge-page(s) with size=%u\n",
+ __func__, size);
+ err = -ENOMEM;
+ break;
}
err = igt_write_huge(ctx, obj);
if (err) {
- pr_err("gemfs write-huge failed with size=%u\n",
- size);
+ pr_err("%s write-huge failed with size=%u\n",
+ __func__, size);
goto out_unpin;
}
-
+out_unpin:
i915_gem_object_unpin_pages(obj);
__i915_gem_object_put_pages(obj, I915_MM_NORMAL);
+out_put:
i915_gem_object_put(obj);
- }
-
- return 0;
+ if (err)
+ break;
+ } while (!__igt_timeout(end_time, NULL));
-out_unpin:
- i915_gem_object_unpin_pages(obj);
-out_put:
- i915_gem_object_put(obj);
+ if (err == -ENOMEM)
+ err = 0;
return err;
}
--
2.20.1
More information about the Intel-gfx-trybot
mailing list