From patchwork Fri Dec 9 13:08:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9468171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59F82607D8 for ; Fri, 9 Dec 2016 13:08:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CB6B2864B for ; Fri, 9 Dec 2016 13:08:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 415EC2864D; Fri, 9 Dec 2016 13:08:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BEB8F28650 for ; Fri, 9 Dec 2016 13:08:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 382946E9BF; Fri, 9 Dec 2016 13:08:46 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E1486E9B6; Fri, 9 Dec 2016 13:08:32 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u144so3968812wmu.0; Fri, 09 Dec 2016 05:08:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3czw/+aYEYlH1xfLvC5fe+5oVi+Hok7MwFE+ZrkuGNQ=; b=aTS6aoi35gpiYFnUtJgVjwBSPzT6eo+Y8PpjscT6z/yfYBrsAq70EAG+bVlhJQqpef E+i+7fw9/ZS5pcK0jU6XTEfCEG0miQI7+p4P0o8Kp7V9Yr5yeM5YkPoVvvXrJlRy8r3T cAdG6eOHf6pv6u0glYAVamSeiOxdlc8rQulqHkYgnzt+fWfvSrFp576/aKf0OIDU4paW rrGHzz8+SNhS9gCkg15k4lOU7TpQfTHcgxoPah+GdTgdNgWCbMyO/vZgkZx8x+BT74Sb IAWbvwkLI9xXQw5m+8ggk1OM4mxND3R5YVf85X6gJI6bg6cNyHZ6O/+BNPh508ZnjwTq +QLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3czw/+aYEYlH1xfLvC5fe+5oVi+Hok7MwFE+ZrkuGNQ=; b=KAtWv+212vMntblHh2kev64GZKcmvFGXmtmc/8QeHuJlg8eyNLFvspXLlJOz29HGlH a1z3dLrE3rqRdRqriupmK4JEbAZBfiWAoUrJCSRMAIDyPZ5Pciq2Y1s/D8KZe9aHCLFx iPJM5pL3dFyTdaVNrvBrmovuBcAfOjdTL1yJcibPtybV715YUFo3tAY4WcBH4FKbZvet mWVzVxVNHwkczuCuhK5ngmP8bVzYwkEJRH+6HjeEKtE33S75AytFLGzPm9D9IIHRwec/ yWuhFj1OCXza+KS3tOOT1TlvxygDoXtifArtp74Ajn6u3jTNI74a41gRYj5f7uMfcBEw QmGA== X-Gm-Message-State: AKaTC02X2+wFhZEWcdE950YFJ5PhS8m/aBsDnpEqMFwwnqZcspdwrqodCW7cRN3unWTNhg== X-Received: by 10.28.187.67 with SMTP id l64mr741612wmf.114.1481288910274; Fri, 09 Dec 2016 05:08:30 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id i2sm42237728wjx.44.2016.12.09.05.08.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2016 05:08:29 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Date: Fri, 9 Dec 2016 13:08:19 +0000 Message-Id: <20161209130825.6854-3-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161209130825.6854-1-chris@chris-wilson.co.uk> References: <20161209130825.6854-1-chris@chris-wilson.co.uk> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 3/9] drm: kselftest for drm_mm_insert_node() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Exercise drm_mm_insert_node(), check that we can't overfill a range and that the lists are correct after reserving/removing. Signed-off-by: Chris Wilson --- drivers/gpu/drm/drm_mm_selftests.h | 1 + drivers/gpu/drm/test-drm_mm.c | 271 +++++++++++++++++++++++++++++++++++++ 2 files changed, 272 insertions(+) diff --git a/drivers/gpu/drm/drm_mm_selftests.h b/drivers/gpu/drm/drm_mm_selftests.h index 204200227b3c..97690bf5add3 100644 --- a/drivers/gpu/drm/drm_mm_selftests.h +++ b/drivers/gpu/drm/drm_mm_selftests.h @@ -5,6 +5,7 @@ * * Tests are executed in reverse order by igt/drm_mm */ +selftest(insert, igt_insert) selftest(reserve, igt_reserve) selftest(init, igt_init) selftest(sanitycheck, igt_sanitycheck) /* keep last */ diff --git a/drivers/gpu/drm/test-drm_mm.c b/drivers/gpu/drm/test-drm_mm.c index d7ab054678a8..679f7e703218 100644 --- a/drivers/gpu/drm/test-drm_mm.c +++ b/drivers/gpu/drm/test-drm_mm.c @@ -14,6 +14,78 @@ #define TESTS "drm_mm_selftests.h" #include "drm_selftest.h" +static unsigned long *primes; +static unsigned long prime_last, prime_sz; + +static unsigned long slow_next_prime_number(unsigned long x) +{ + for (;;) { + unsigned long y = int_sqrt(++x) + 1; + while (y > 1) { + if ((x % y) == 0) + break; + y--; + } + if (y == 1) + return x; + } +} + +static unsigned long mark_multiples(unsigned long x, + unsigned long *p, + unsigned long start, + unsigned long end) +{ + unsigned long m; + + m = 2*x; + if (m < start) + m = (start / x + 1) * x; + + while (m < end) { + __clear_bit(m, p); + m += x; + } + + return x; +} + +static unsigned long next_prime_number(unsigned long x) +{ + if (x == 1) + return 2; + + if (x >= prime_last) { + unsigned long sz, y; + unsigned long *nprimes; + + sz = x*x; + if (sz < x) + return slow_next_prime_number(x); + + sz = round_up(sz, BITS_PER_LONG); + nprimes = krealloc(primes, sz / sizeof(long), GFP_KERNEL); + if (!nprimes) + return slow_next_prime_number(x); + + /* Where memory permits, track the primes using the + * Sieve of Eratosthenes. + */ + memset(nprimes + prime_sz / BITS_PER_LONG, + 0xff, (sz - prime_sz) / sizeof(long)); + for (y = 2UL; y < sz; y = find_next_bit(nprimes, sz, y + 1)) + prime_last = mark_multiples(y, nprimes, prime_sz, sz); + + primes = nprimes; + prime_sz = sz; + } + + return find_next_bit(primes, prime_last, x + 1); +} + +#define for_each_prime(prime, max) \ + for (prime = 1; prime < (max); prime = next_prime_number(prime)) + static int igt_sanitycheck(void *ignored) { pr_info("%s - ok!\n", __func__); @@ -204,6 +276,204 @@ static int igt_reserve(void *ignored) return 0; } +static int __igt_insert(int count, u64 size) +{ + struct drm_mm mm; + struct drm_mm_node *nodes, *node, *next; + int *order, n, o = 0; + int ret; + + /* Fill a range with lots of nodes, check it doesn't fail too early */ + + ret = -ENOMEM; + nodes = vzalloc(count * sizeof(*nodes)); + if (!nodes) + goto err; + + order = random_order(count); + if (!order) + goto err_nodes; + + 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; + + err = drm_mm_insert_node(&mm, &nodes[n], size, 0, + DRM_MM_SEARCH_DEFAULT); + if (err) { + pr_err("insert failed, step %d, start %llu\n", + n, nodes[n].start); + ret = err; + goto out; + } + } + + /* Repeated use should then fail */ + if (1) { + struct drm_mm_node tmp; + + memset(&tmp, 0, sizeof(tmp)); + if (!drm_mm_insert_node(&mm, &tmp, size, 0, + DRM_MM_SEARCH_DEFAULT)) { + drm_mm_remove_node(&tmp); + pr_err("impossible insert succeeded, step %d, start %llu\n", + n, tmp.start); + goto out; + } + } + + n = 0; + drm_mm_for_each_node(node, &mm) { + if (node->start != n * size) { + pr_err("node %d out of order, expected start %llx, found %llx\n", + n, n * size, node->start); + goto out; + } + + if (node->size != size) { + pr_err("node %d has wrong size, expected size %llx, found %llx\n", + n, size, node->size); + goto out; + } + + if (node->hole_follows) { + pr_err("node %d is followed by a hole!\n", n); + goto out; + } + + n++; + } + + for (n = 0; n < count; n++) { + drm_mm_for_each_node_in_range(node, &mm, n * size, (n + 1) * size) { + if (node->start != n * size) { + pr_err("lookup node %d out of order, expected start %llx, found %llx\n", + n, n * size, node->start); + goto out; + } + } + } + + /* Remove one and reinsert, as the only hole it should refill itself */ + for (n = 0; n < count; n++) { + int err; + + drm_mm_remove_node(&nodes[n]); + err = drm_mm_insert_node(&mm, &nodes[n], size, 0, + DRM_MM_SEARCH_DEFAULT); + if (err) { + pr_err("reinsert failed, step %d\n", n); + ret = err; + goto out; + } + + if (nodes[n].start != n * size) { + pr_err("reinsert node moved, step %d, expected %llx, found %llx\n", + n, n * size, nodes[n].start); + goto out; + } + } + + /* Remove several, reinsert, check full */ + for_each_prime(n, min(128, count)) { + int m; + + for (m = 0; m < n; m++) { + node = &nodes[order[(o + m) % count]]; + drm_mm_remove_node(node); + } + + for (m = 0; m < n; m++) { + int err; + + node = &nodes[order[(o + m) % count]]; + err = drm_mm_insert_node(&mm, node, size, 0, + DRM_MM_SEARCH_DEFAULT); + if (err) { + pr_err("insert failed, step %d, start %llu\n", + n, node->start); + ret = err; + goto out; + } + } + + o += n; + + if (1) { + struct drm_mm_node tmp; + + memset(&tmp, 0, sizeof(tmp)); + if (!drm_mm_insert_node(&mm, &tmp, size, 0, + DRM_MM_SEARCH_DEFAULT)) { + drm_mm_remove_node(&tmp); + pr_err("impossible insert succeeded, start %llu\n", + tmp.start); + goto out; + } + } + + m = 0; + drm_mm_for_each_node(node, &mm) { + if (node->start != m * size) { + pr_err("node %d out of order, expected start %llx, found %llx\n", + m, m * size, node->start); + goto out; + } + + if (node->size != size) { + pr_err("node %d has wrong size, expected size %llx, found %llx\n", + m, size, node->size); + goto out; + } + + if (node->hole_follows) { + pr_err("node %d is followed by a hole!\n", m); + goto out; + } + + m++; + } + } + + ret = 0; +out: + list_for_each_entry_safe(node, next, &mm.head_node.node_list, node_list) + drm_mm_remove_node(node); + drm_mm_takedown(&mm); + kfree(order); +err_nodes: + vfree(nodes); +err: + return ret; +} + +static int igt_insert(void *ignored) +{ + int n, ret; + + for (n = 1; n < 50; n++) { + ret = __igt_insert(8192, (1ull << n) - 1); + if (ret) + return ret; + + ret = __igt_insert(8192, 1ull << n); + if (ret) + return ret; + + ret = __igt_insert(8192, (1ull << n) + 1); + if (ret) + return ret; + } + + return 0; +} + #include "drm_selftest.c" static int __init test_drm_mm_init(void) @@ -218,6 +488,7 @@ static int __init test_drm_mm_init(void) static void __exit test_drm_mm_exit(void) { + kfree(primes); } module_init(test_drm_mm_init);