From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 13/18] drm/i915/selftests: exercise 4K and 64K mm insertion
Date: Tue, 4 Apr 2017 23:11:23 +0100 [thread overview]
Message-ID: <20170404221128.3943-14-matthew.auld@intel.com> (raw)
In-Reply-To: <20170404221128.3943-1-matthew.auld@intel.com>
Mock test filling an address space with 4K and 64K objects, in the hope
of exercising the page color adjust fun.
v2: s/roundup/round_up
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 68 +++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index 259b5e139df1..0963dcb67996 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -31,6 +31,7 @@
#include "mock_context.h"
#include "mock_drm.h"
#include "mock_gem_device.h"
+#include "mock_gtt.h"
static void fake_free_pages(struct drm_i915_gem_object *obj,
struct sg_table *pages)
@@ -1307,6 +1308,72 @@ static int igt_gtt_reserve(void *arg)
return err;
}
+static int igt_ppgtt_page_color(void *arg)
+{
+ struct drm_mm mm;
+ struct drm_mm_node *node, *prev, *next;
+ unsigned long page_colors[] = {
+ I915_GTT_PAGE_SIZE,
+ I915_GTT_PAGE_SIZE_64K,
+ };
+ int idx = 0;
+ u64 count = 0;
+ u64 size;
+
+ drm_mm_init(&mm, 0, U64_MAX);
+ mm.color_adjust = i915_page_color_adjust;
+
+ /* Running out of memory is okay. */
+
+ for_each_prime_number_from(size, 0, U64_MAX) {
+ node = kzalloc(sizeof(*node), GFP_KERNEL);
+ if (!node) {
+ pr_info("finished test early, unable to allocate node, count=%llu\n", count);
+ break;
+ }
+
+ size = round_up(size, page_colors[idx]);
+
+ if (drm_mm_insert_node_in_range(&mm, node, size,
+ page_colors[idx],
+ page_colors[idx],
+ 0, U64_MAX,
+ DRM_MM_INSERT_BEST)) {
+ pr_info("test finished, unable to insert node: color=%lu, size=%llx, count=%llu\n",
+ page_colors[idx], size, count);
+ kfree(node);
+ break;
+ }
+
+ GEM_BUG_ON(!IS_ALIGNED(node->start, node->color));
+ GEM_BUG_ON(!IS_ALIGNED(node->size, node->color));
+
+ /* We can't mix 4K and 64K pte's in the same pt. */
+
+ prev = list_prev_entry(node, node_list);
+ if (i915_node_color_differs(prev, node->color))
+ GEM_BUG_ON(prev->start >> GEN8_PDE_SHIFT ==
+ node->start >> GEN8_PDE_SHIFT);
+
+ next = list_next_entry(node, node_list);
+ if (i915_node_color_differs(next, node->color))
+ GEM_BUG_ON(((next->start + next->size) >> GEN8_PDE_SHIFT) ==
+ ((node->start + node->size) >> GEN8_PDE_SHIFT));
+
+ idx ^= 1;
+ ++count;
+ }
+
+ drm_mm_for_each_node_safe(node, next, &mm) {
+ drm_mm_remove_node(node);
+ kfree(node);
+ }
+
+ drm_mm_takedown(&mm);
+
+ return 0;
+}
+
static int igt_gtt_insert(void *arg)
{
struct drm_i915_private *i915 = arg;
@@ -1523,6 +1590,7 @@ int i915_gem_gtt_mock_selftests(void)
SUBTEST(igt_mock_fill),
SUBTEST(igt_gtt_reserve),
SUBTEST(igt_gtt_insert),
+ SUBTEST(igt_ppgtt_page_color),
};
struct drm_i915_private *i915;
int err;
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-04-04 22:11 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 22:11 [RFC PATCH 00/18] drm/i915: initial support for huge gtt pages V2 Matthew Auld
2017-04-04 22:11 ` [PATCH 01/18] drm/i915: add page_size_mask to dev_info Matthew Auld
2017-04-05 6:19 ` Joonas Lahtinen
2017-04-05 8:45 ` Chris Wilson
2017-04-05 12:57 ` Joonas Lahtinen
2017-04-05 8:43 ` Chris Wilson
2017-04-04 22:11 ` [PATCH 02/18] drm/i915: introduce drm_i915_gem_object page_size members Matthew Auld
2017-04-05 6:26 ` Joonas Lahtinen
2017-04-05 6:49 ` Daniel Vetter
2017-04-05 8:48 ` Chris Wilson
2017-04-05 10:07 ` Matthew Auld
2017-04-05 12:15 ` Daniel Vetter
2017-04-05 12:32 ` Chris Wilson
2017-04-05 12:39 ` Chris Wilson
2017-04-04 22:11 ` [PATCH 03/18] drm/i915: pass page_size to insert_entries Matthew Auld
2017-04-04 22:11 ` [PATCH 04/18] drm/i915: s/i915_gtt_color_adjust/i915_ggtt_color_adjust Matthew Auld
2017-04-05 6:30 ` Joonas Lahtinen
2017-04-04 22:11 ` [PATCH 05/18] drm/i915: clean up cache coloring Matthew Auld
2017-04-05 6:35 ` Joonas Lahtinen
2017-04-04 22:11 ` [PATCH 06/18] drm/i915: export color_differs Matthew Auld
2017-04-05 6:39 ` Joonas Lahtinen
2017-04-04 22:11 ` [PATCH 07/18] drm/i915: introduce ppgtt page coloring Matthew Auld
2017-04-05 13:41 ` Chris Wilson
2017-04-05 13:50 ` Matthew Auld
2017-04-05 14:02 ` Chris Wilson
2017-04-05 15:05 ` Matthew Auld
2017-04-10 12:08 ` Matthew Auld
2017-04-04 22:11 ` [PATCH 08/18] drm/i915: handle evict-for-node with " Matthew Auld
2017-04-04 22:11 ` [PATCH 09/18] drm/i915: support inserting 64K pages in the ppgtt Matthew Auld
2017-04-06 3:25 ` kbuild test robot
2017-04-09 0:27 ` kbuild test robot
2017-04-04 22:11 ` [PATCH 10/18] drm/i915: support inserting 2M " Matthew Auld
2017-04-04 22:11 ` [PATCH 11/18] drm/i915: support inserting 1G " Matthew Auld
2017-04-04 22:11 ` [PATCH 12/18] drm/i915: disable GTT cache for huge-pages Matthew Auld
2017-04-04 22:11 ` Matthew Auld [this message]
2017-04-04 22:11 ` [PATCH 14/18] drm/i915/selftests: modify the gtt tests to also exercise huge pages Matthew Auld
2017-04-04 22:11 ` [PATCH 15/18] drm/i915/selftests: exercise evict-for-node page coloring Matthew Auld
2017-04-04 22:11 ` [PATCH 16/18] drm/i915/debugfs: include some huge-page metrics Matthew Auld
2017-04-04 22:11 ` [PATCH 17/18] mm/shmem: tweak the huge-page interface Matthew Auld
2017-04-05 6:42 ` Daniel Vetter
2017-04-04 22:11 ` [PATCH 18/18] drm/i915: support transparent-huge-pages through shmemfs Matthew Auld
2017-04-05 8:53 ` [RFC PATCH 00/18] drm/i915: initial support for huge gtt pages V2 Chris Wilson
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=20170404221128.3943-14-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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