All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH v3 12/38] drm: kselftest for drm_mm_insert_node_in_range()
Date: Fri, 16 Dec 2016 19:25:24 +0000	[thread overview]
Message-ID: <20161216192550.8352-13-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20161216192550.8352-1-chris@chris-wilson.co.uk>

Exercise drm_mm_insert_node_in_range(), check that we only allocate from
the specified range.

v2: Use all allocation flags

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/selftests/drm_mm_selftests.h |   1 +
 drivers/gpu/drm/selftests/test-drm_mm.c      | 264 +++++++++++++++++++++++++++
 2 files changed, 265 insertions(+)

diff --git a/drivers/gpu/drm/selftests/drm_mm_selftests.h b/drivers/gpu/drm/selftests/drm_mm_selftests.h
index dca726baa65d..92b2c1cb10fa 100644
--- a/drivers/gpu/drm/selftests/drm_mm_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_mm_selftests.h
@@ -11,3 +11,4 @@ selftest(debug, igt_debug)
 selftest(reserve, igt_reserve)
 selftest(insert, igt_insert)
 selftest(replace, igt_replace)
+selftest(insert_range, igt_insert_range)
diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c
index fa5b12c57161..cbd4f09e6b2f 100644
--- a/drivers/gpu/drm/selftests/test-drm_mm.c
+++ b/drivers/gpu/drm/selftests/test-drm_mm.c
@@ -738,6 +738,270 @@ static int igt_replace(void *ignored)
 	return 0;
 }
 
+static bool expect_insert_in_range(struct drm_mm *mm, struct drm_mm_node *node,
+				   u64 size, u64 alignment, unsigned long color,
+				   u64 range_start, u64 range_end,
+				   const struct insert_mode *mode)
+{
+	int err;
+
+	err = drm_mm_insert_node_in_range_generic(mm, node,
+						  size, alignment, color,
+						  range_start, range_end,
+						  mode->search_flags,
+						  mode->create_flags);
+	if (err) {
+		pr_err("insert (size=%llu, alignment=%llu, color=%lu, mode=%s) nto range [%llx, %llx] failed with err=%d\n",
+		       size, alignment, color, mode->name,
+		       range_start, range_end, err);
+		return false;
+	}
+
+	if (!assert_node(node, mm, size, alignment, color)) {
+		drm_mm_remove_node(node);
+		return false;
+	}
+
+	return true;
+}
+
+static bool expect_insert_in_range_fail(struct drm_mm *mm,
+					u64 size,
+					u64 range_start,
+					u64 range_end)
+{
+	struct drm_mm_node tmp = {};
+	int err;
+
+	err = drm_mm_insert_node_in_range_generic(mm, &tmp,
+						  size, 0, 0,
+						  range_start, range_end,
+						  DRM_MM_SEARCH_DEFAULT,
+						  DRM_MM_CREATE_DEFAULT);
+	if (likely(err == -ENOSPC))
+		return true;
+
+	if (!err) {
+		pr_err("impossible insert succeeded, node %llx + %llu, range [%llx, %llx]\n",
+		       tmp.start, tmp.size, range_start, range_end);
+		drm_mm_remove_node(&tmp);
+	} else {
+		pr_err("impossible insert failed with wrong error %d [expected %d], size %llu, range [%llx, %llx]\n",
+		       err, -ENOSPC, size, range_start, range_end);
+	}
+
+	return false;
+}
+
+static bool assert_contiguous_in_range(struct drm_mm *mm,
+				       u64 size,
+				       u64 start,
+				       u64 end)
+{
+	struct drm_mm_node *node;
+	unsigned int n;
+
+	if (!expect_insert_in_range_fail(mm, size, start, end))
+		return false;
+
+	n = div64_u64(start + size - 1, size);
+	drm_mm_for_each_node(node, mm) {
+		if (node->start < start || node->start + node->size > end) {
+			pr_err("node %d out of range, address [%llx + %llu], range [%llx, %llx]\n",
+			       n, node->start, node->start + node->size, start, end);
+			return false;
+		}
+
+		if (node->start != n * size) {
+			pr_err("node %d out of order, expected start %llx, found %llx\n",
+			       n, n * size, node->start);
+			return false;
+		}
+
+		if (node->size != size) {
+			pr_err("node %d has wrong size, expected size %llx, found %llx\n",
+			       n, size, node->size);
+			return false;
+		}
+
+		if (node->hole_follows && drm_mm_hole_node_end(node) < end) {
+			pr_err("node %d is followed by a hole!\n", n);
+			return false;
+		}
+
+		n++;
+	}
+
+	drm_mm_for_each_node_in_range(node, mm, 0, start) {
+		if (node) {
+			pr_err("node before start: node=%llx+%llu, start=%llx\n",
+			       node->start, node->size, start);
+			return false;
+		}
+	}
+
+	drm_mm_for_each_node_in_range(node, mm, end, U64_MAX) {
+		if (node) {
+			pr_err("node after end: node=%llx+%llu, end=%llx\n",
+			       node->start, node->size, end);
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static int __igt_insert_range(unsigned int count, u64 size, u64 start, u64 end)
+{
+	const struct insert_mode *mode;
+	struct drm_mm mm;
+	struct drm_mm_node *nodes, *node, *next;
+	unsigned int n, start_n, end_n;
+	int ret;
+
+	DRM_MM_BUG_ON(!count);
+	DRM_MM_BUG_ON(!size);
+	DRM_MM_BUG_ON(end <= start);
+
+	/* Very similar to __igt_insert(), but now instead of populating the
+	 * full range of the drm_mm, we try to fill a small portion of it.
+	 */
+
+	ret = -ENOMEM;
+	nodes = vzalloc(count * sizeof(*nodes));
+	if (!nodes)
+		goto err;
+
+	ret = -EINVAL;
+	drm_mm_init(&mm, 0, count * size);
+
+	start_n = div64_u64(start + size - 1, size);
+	end_n = div64_u64(end - size, size);
+
+	for (mode = insert_modes; mode->name; mode++) {
+		for (n = start_n; n <= end_n; n++) {
+			if (!expect_insert_in_range(&mm, &nodes[n],
+						    size, size, n,
+						    start, end, mode)) {
+				pr_err("%s insert failed, size %llu, step %d [%d, %d], range [%llx, %llx]\n",
+				       mode->name, size, n,
+				       start_n, end_n,
+				       start, end);
+				goto out;
+			}
+		}
+
+		if (!assert_contiguous_in_range(&mm, size, start, end)) {
+			pr_err("%s: range [%llx, %llx] not full after initialisation, size=%llu\n",
+			       mode->name, start, end, size);
+			goto out;
+		}
+
+		/* Remove one and reinsert, it should refill itself */
+		for (n = start_n; n <= end_n; n++) {
+			u64 addr = nodes[n].start;
+
+			drm_mm_remove_node(&nodes[n]);
+			if (!expect_insert_in_range(&mm, &nodes[n],
+						    size, size, n,
+						    start, end, mode)) {
+				pr_err("%s reinsert failed, step %d\n", mode->name, n);
+				goto out;
+			}
+
+			if (nodes[n].start != addr) {
+				pr_err("%s reinsert node moved, step %d, expected %llx, found %llx\n",
+				       mode->name, n, addr, nodes[n].start);
+				goto out;
+			}
+		}
+
+		if (!assert_contiguous_in_range(&mm, size, start, end)) {
+			pr_err("%s: range [%llx, %llx] not full after reinsertion, size=%llu\n",
+			       mode->name, start, end, size);
+			goto out;
+		}
+
+		drm_mm_for_each_node_safe(node, next, &mm)
+			drm_mm_remove_node(node);
+		DRM_MM_BUG_ON(!drm_mm_clean(&mm));
+	}
+
+	ret = 0;
+out:
+	drm_mm_for_each_node_safe(node, next, &mm)
+		drm_mm_remove_node(node);
+	drm_mm_takedown(&mm);
+	vfree(nodes);
+err:
+	return ret;
+}
+
+static int insert_outside_range(void)
+{
+	struct drm_mm mm;
+	const unsigned int start = 1024;
+	const unsigned int end = 2048;
+	const unsigned int size = end - start;
+
+	drm_mm_init(&mm, start, size);
+
+	if (!expect_insert_in_range_fail(&mm, 1, 0, start))
+		return -EINVAL;
+
+	if (!expect_insert_in_range_fail(&mm, 1, end, end - size))
+		return -EINVAL;
+
+	if (!expect_insert_in_range_fail(&mm, 1, end, end + size))
+		return -EINVAL;
+
+	drm_mm_takedown(&mm);
+	return 0;
+}
+
+static int igt_insert_range(void *ignored)
+{
+	const unsigned int count = min_t(unsigned int, BIT(13), max_iterations);
+	unsigned int n;
+	int ret;
+
+	/* Check that requests outside the bounds of drm_mm are rejected. */
+	ret = insert_outside_range();
+	if (ret)
+		return ret;
+
+	for_each_prime_number(n, 50) {
+		const u64 size = BIT_ULL(n);
+		const u64 max = count * size;
+
+		ret = __igt_insert_range(count, size, 0, max);
+		if (ret)
+			return ret;
+
+		ret = __igt_insert_range(count, size, 1, max);
+		if (ret)
+			return ret;
+
+		ret = __igt_insert_range(count, size, 0, max - 1);
+		if (ret)
+			return ret;
+
+		ret = __igt_insert_range(count, size, 0, max/2);
+		if (ret)
+			return ret;
+
+		ret = __igt_insert_range(count, size, max/2, max);
+		if (ret)
+			return ret;
+
+		ret = __igt_insert_range(count, size, max/4+1, 3*max/4-1);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
 #include "drm_selftest.c"
 
 static int __init test_drm_mm_init(void)
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2016-12-16 19:25 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-16 19:25 drm_mm fixes, take 3, final? Chris Wilson
2016-12-16 19:25 ` [PATCH v3 01/38] drm/i915: Use the MRU stack search after evicting Chris Wilson
2016-12-19 12:55   ` Chris Wilson
2016-12-16 19:25 ` [PATCH v3 02/38] drm: Use drm_mm_nodes() as shorthand for the list of nodes under struct drm_mm Chris Wilson
2016-12-16 19:25 ` [PATCH v3 03/38] drm: Compile time enabling for asserts in drm_mm Chris Wilson
2016-12-16 19:25 ` [PATCH v3 04/38] lib: Add a simple prime number generator Chris Wilson
2016-12-16 19:38   ` Chris Wilson
2016-12-17 12:41   ` [PATCH] " Chris Wilson
2016-12-19 10:05     ` [PATCH v6] " Chris Wilson
2016-12-16 19:25 ` [PATCH v3 05/38] drm: Add a simple generator of random permutations Chris Wilson
2016-12-16 19:25 ` [PATCH v3 06/38] drm: Add some kselftests for the DRM range manager (struct drm_mm) Chris Wilson
2016-12-16 19:25 ` [PATCH v3 07/38] drm: kselftest for drm_mm_init() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 08/38] drm: kselftest for drm_mm_debug() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 09/38] drm: kselftest for drm_mm_reserve_node() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 10/38] drm: kselftest for drm_mm_insert_node() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 11/38] drm: kselftest for drm_mm_replace_node() Chris Wilson
2016-12-16 19:25 ` Chris Wilson [this message]
2016-12-17 10:16   ` [PATCH] drm: kselftest for drm_mm_insert_node_in_range() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 13/38] drm: kselftest for drm_mm and alignment Chris Wilson
2016-12-16 19:25 ` [PATCH v3 14/38] drm: kselftest for drm_mm and eviction Chris Wilson
2016-12-16 19:25 ` [PATCH v3 15/38] drm: kselftest for drm_mm and range restricted eviction Chris Wilson
2016-12-16 19:25 ` [PATCH v3 16/38] drm: kselftest for drm_mm and top-down allocation Chris Wilson
2016-12-17 10:17   ` [PATCH] " Chris Wilson
2016-12-16 19:25 ` [PATCH v3 17/38] drm: kselftest for drm_mm and color adjustment Chris Wilson
2016-12-16 19:25 ` [PATCH v3 18/38] drm: kselftest for drm_mm and color eviction Chris Wilson
2016-12-16 19:25 ` [PATCH v3 19/38] drm: kselftest for drm_mm and restricted " Chris Wilson
2016-12-16 19:25 ` [PATCH v3 20/38] drm/i915: Build DRM range manager selftests for CI Chris Wilson
2016-12-16 19:25 ` [PATCH v3 21/38] drm: Promote drm_mm alignment to u64 Chris Wilson
2016-12-16 19:25 ` [PATCH v3 22/38] drm: Fix kerneldoc for drm_mm_scan_remove_block() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 23/38] drm: Detect overflow in drm_mm_reserve_node() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 24/38] drm: Simplify drm_mm_clean() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 25/38] drm: Add asserts to catch overflow in drm_mm_init() and drm_mm_init_scan() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 26/38] drm: Extract struct drm_mm_scan from struct drm_mm Chris Wilson
2016-12-16 19:25 ` [PATCH v3 27/38] drm: Rename prev_node to hole in drm_mm_scan_add_block() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 28/38] drm: Unconditionally do the range check " Chris Wilson
2016-12-16 19:25 ` [PATCH v3 29/38] drm: Fix application of color vs range restriction when scanning drm_mm Chris Wilson
2016-12-16 19:25 ` [PATCH v3 30/38] drm: Compute tight evictions for drm_mm_scan Chris Wilson
2016-12-16 19:25 ` [PATCH v3 31/38] drm: Optimise power-of-two alignments in drm_mm_scan_add_block() Chris Wilson
2016-12-16 19:25 ` [PATCH v3 32/38] drm: Simplify drm_mm scan-list manipulation Chris Wilson
2016-12-16 19:25 ` [PATCH v3 33/38] drm: Apply tight eviction scanning to color_adjust Chris Wilson
2016-12-16 19:25 ` [PATCH v3 34/38] drm: Wrap drm_mm_node.hole_follows Chris Wilson
2016-12-16 19:25 ` [PATCH v3 35/38] drm: Apply range restriction after color adjustment when allocation Chris Wilson
2016-12-16 19:25 ` [PATCH v3 36/38] drm: Use drm_mm_insert_node_in_range_generic() for everyone Chris Wilson
2016-12-16 19:25 ` [PATCH v3 37/38] drm: Improve drm_mm search (and fix topdown allocation) with rbtrees Chris Wilson
2016-12-20 14:20   ` [PATCH v3] " Chris Wilson
2016-12-16 19:25 ` [PATCH v3 38/38] drm: kselftest for drm_mm and bottom-up allocation Chris Wilson
2016-12-16 20:23 ` ✗ Fi.CI.BAT: warning for series starting with [v3,01/38] drm/i915: Use the MRU stack search after evicting Patchwork
2016-12-17 10:45 ` ✓ Fi.CI.BAT: success for series starting with [v3,01/38] drm/i915: Use the MRU stack search after evicting (rev3) Patchwork
2016-12-17 13:15 ` ✗ Fi.CI.BAT: warning for series starting with [v3,01/38] drm/i915: Use the MRU stack search after evicting (rev4) Patchwork
2016-12-19 10:45 ` ✗ Fi.CI.BAT: failure for series starting with [v3,01/38] drm/i915: Use the MRU stack search after evicting (rev5) Patchwork
2016-12-20 16:45 ` ✓ Fi.CI.BAT: success for series starting with [v3,01/38] drm/i915: Use the MRU stack search after evicting (rev6) Patchwork
2016-12-23  4:07 ` drm_mm crash with multi threads Mark yao
2016-12-23  5:57   ` [Intel-gfx] " Rob Clark
2016-12-23  6:31     ` Mark yao

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=20161216192550.8352-13-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=dri-devel@lists.freedesktop.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.