[PATCH 06/31] drm: kselftest for drm_mm_reserve_node()
Chris Wilson
chris at chris-wilson.co.uk
Mon Dec 12 08:41:36 UTC 2016
Exercise drm_mm_reserve_node(), check that we can't reserve an already
occupied range and that the lists are correct after reserving/removing.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/Kconfig | 5 +
drivers/gpu/drm/Makefile | 1 +
drivers/gpu/drm/lib/rand.c | 51 +++++++++++
drivers/gpu/drm/lib/rand.h | 9 ++
drivers/gpu/drm/selftests/drm_mm_selftests.h | 1 +
drivers/gpu/drm/selftests/test-drm_mm.c | 131 +++++++++++++++++++++++++++
6 files changed, 198 insertions(+)
create mode 100644 drivers/gpu/drm/lib/rand.c
create mode 100644 drivers/gpu/drm/lib/rand.h
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index fd341ab69c46..04d1d0a32c5c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -48,10 +48,15 @@ config DRM_DEBUG_MM
If in doubt, say "N".
+config DRM_LIB_RAND
+ bool
+ default n
+
config DRM_DEBUG_MM_SELFTEST
tristate "kselftests for DRM range manager (struct drm_mm)"
depends on DRM
depends on DEBUG_KERNEL
+ select DRM_LIB_RAND
default n
help
This option provides a kernel module that can be used to test
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index c8aed3688b20..13f5ef896934 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -18,6 +18,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
drm_plane.o drm_color_mgmt.o drm_print.o \
drm_dumb_buffers.o drm_mode_config.o
+drm-$(CONFIG_DRM_LIB_RAND) += lib/rand.o
obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/test-drm_mm.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
diff --git a/drivers/gpu/drm/lib/rand.c b/drivers/gpu/drm/lib/rand.c
new file mode 100644
index 000000000000..db94c634e513
--- /dev/null
+++ b/drivers/gpu/drm/lib/rand.c
@@ -0,0 +1,51 @@
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+#include "rand.h"
+
+u32 lcg_random(u32 *state)
+{
+ u32 s = *state;
+
+#define rol(x, k) ((x << k) | (x >> (32 - k)))
+ s = (s ^ rol(s, 5) ^ rol(s, 24)) + 0x37798849;
+#undef rol
+
+ *state = s;
+ return s;
+}
+EXPORT_SYMBOL(lcg_random);
+
+int *random_reorder(int *order, int count, u32 *state)
+{
+ int n;
+
+ for (n = count-1; n > 1; n--) {
+ int r = lcg_random(state) % (n + 1);
+ if (r != n) {
+ int tmp = order[n];
+ order[n] = order[r];
+ order[r] = tmp;
+ }
+ }
+
+ return order;
+}
+EXPORT_SYMBOL(random_reorder);
+
+int *random_order(int count, u32 *state)
+{
+ int *order;
+ int n;
+
+ order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+ if (!order)
+ return order;
+
+ for (n = 0; n < count; n++)
+ order[n] = n;
+
+ return random_reorder(order, count, state);
+}
+EXPORT_SYMBOL(random_order);
diff --git a/drivers/gpu/drm/lib/rand.h b/drivers/gpu/drm/lib/rand.h
new file mode 100644
index 000000000000..18d0735b8d3b
--- /dev/null
+++ b/drivers/gpu/drm/lib/rand.h
@@ -0,0 +1,9 @@
+#ifndef __RAND_H__
+#define __RAND_H
+
+u32 lcg_random(u32 *state);
+
+int *random_reorder(int *order, int count, u32 *state);
+int *random_order(int count, u32 *state);
+
+#endif /* __RAND_H__ */
diff --git a/drivers/gpu/drm/selftests/drm_mm_selftests.h b/drivers/gpu/drm/selftests/drm_mm_selftests.h
index fddf2c01c97f..639913a69101 100644
--- a/drivers/gpu/drm/selftests/drm_mm_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_mm_selftests.h
@@ -5,6 +5,7 @@
*
* Tests are executed in reverse order by igt/drm_mm
*/
+selftest(reserve, igt_reserve)
selftest(debug, igt_debug)
selftest(init, igt_init)
selftest(sanitycheck, igt_sanitycheck) /* keep last */
diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c
index 1fe104cc05d5..32024d152b92 100644
--- a/drivers/gpu/drm/selftests/test-drm_mm.c
+++ b/drivers/gpu/drm/selftests/test-drm_mm.c
@@ -11,6 +11,8 @@
#include <drm/drm_mm.h>
+#include "../lib/rand.h"
+
#define TESTS "drm_mm_selftests.h"
#include "drm_selftest.h"
@@ -105,6 +107,135 @@ static int igt_debug(void *ignored)
return 0;
}
+static int __igt_reserve(int count, u64 size)
+{
+ u32 lcg_state = random_seed;
+ struct drm_mm mm;
+ struct drm_mm_node *node, *next;
+ int *order, n;
+ int ret;
+
+ /* Fill a range with lots of nodes, check it doesn't fail too early */
+
+ ret = -ENOMEM;
+ order = random_order(count, &lcg_state);
+ if (!order)
+ goto err;
+
+ ret = -EINVAL;
+ drm_mm_init(&mm, 0, count * size);
+ if (!drm_mm_clean(&mm)) {
+ pr_err("mm not empty on creation\n");
+ goto out;
+ }
+
+ for (n = 0; n < count; n++) {
+ int err;
+
+ node = kzalloc(sizeof(*node), GFP_KERNEL);
+ if (!node) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ node->start = order[n] * size;
+ node->size = size;
+
+ err = drm_mm_reserve_node(&mm, node);
+ if (err) {
+ pr_err("reserve failed, step %d, start %llu\n",
+ n, node->start);
+ ret = err;
+ goto out;
+ }
+
+ if (!drm_mm_node_allocated(node)) {
+ pr_err("reserved node not allocated! step %d, start %llu\n",
+ n, node->start);
+ goto out;
+ }
+ }
+
+ /* Repeated use should then fail */
+ random_reorder(order, count, &lcg_state);
+ for (n = 0; n < count; n++) {
+ struct drm_mm_node tmp = {
+ .start = order[n] * size,
+ .size = 1
+ };
+
+ if (!drm_mm_reserve_node(&mm, &tmp)) {
+ drm_mm_remove_node(&tmp);
+ pr_err("impossible reserve succeeded, step %d, start %llu\n",
+ n, tmp.start);
+ goto out;
+ }
+ }
+
+ /* Overlapping use should then fail */
+ for (n = 0; n < count; n++) {
+ struct drm_mm_node tmp = {
+ .start = 0,
+ .size = size * count,
+ };
+
+ if (!drm_mm_reserve_node(&mm, &tmp)) {
+ drm_mm_remove_node(&tmp);
+ pr_err("impossible reserve succeeded, step %d, start %llu\n",
+ n, tmp.start);
+ goto out;
+ }
+ }
+ for (n = 0; n < count; n++) {
+ struct drm_mm_node tmp = {
+ .start = size * n,
+ .size = size * (count - n),
+ };
+
+ if (!drm_mm_reserve_node(&mm, &tmp)) {
+ drm_mm_remove_node(&tmp);
+ pr_err("impossible reserve succeeded, step %d, start %llu\n",
+ n, tmp.start);
+ goto out;
+ }
+ }
+
+ ret = 0;
+out:
+ drm_mm_for_each_node_safe(node, next, &mm) {
+ drm_mm_remove_node(node);
+ kfree(node);
+ }
+ drm_mm_takedown(&mm);
+ kfree(order);
+err:
+ return ret;
+}
+
+static int igt_reserve(void *ignored)
+{
+ const unsigned int count = BIT(13);
+ int n, ret;
+
+ for (n = 1; n < 50; n++) {
+ u64 size = BIT_ULL(n);
+
+ ret = __igt_reserve(count, size - 1);
+ if (ret)
+ return ret;
+
+ ret = __igt_reserve(count, size);
+ if (ret)
+ return ret;
+
+ ret = __igt_reserve(count, size + 1);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
#include "drm_selftest.c"
static int __init test_drm_mm_init(void)
--
2.11.0
More information about the Intel-gfx-trybot
mailing list