From patchwork Mon Dec 12 11:53:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9470549 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 A804B60760 for ; Mon, 12 Dec 2016 11:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CC2528472 for ; Mon, 12 Dec 2016 11:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91D1D28478; Mon, 12 Dec 2016 11:54: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=unavailable 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 4C72928472 for ; Mon, 12 Dec 2016 11:54:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBAB56E2F4; Mon, 12 Dec 2016 11:54:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5CB196E2C7; Mon, 12 Dec 2016 11:54:06 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id g23so10769912wme.1; Mon, 12 Dec 2016 03:54:06 -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=PkMnrGhNr86BKhHm8qn0OghRWpQo2TzIf/UiNbfQMLM=; b=YlBzc70YQVetjRLPfZppPGn704CquNZlOPAlQ7l5aOpE3LttqLw7sNEf+dTANQdonT M/A7cjIzJC/lvz1D87InVKp3t+Mg7/yGYg25Khhh/jzqBy5tw8NrHMIAYfn4ifzFzp+R l+KaJhAfEKwraSq3gH32DKSlOphvdpkVQ7VEkeMcWpuaBGKtGqNHYS4h+K0DHbCKpoma ySCdCm48dYDxiJv+Ukc1LInFfGt57PZd0tDZBgds8+VXh5fN80PVPrtk8/xzag21LoaR wXKKC0jXy49ejQl0UMzpn4A3XH9uJGtgToJh2WBpkFPsRp5m/a1AjgNiCRSN445lFt1U j9CQ== 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=PkMnrGhNr86BKhHm8qn0OghRWpQo2TzIf/UiNbfQMLM=; b=YI9+O+lu2ewg7xOY5NJYpI4Yu/hpVdqKWcDqcDAwJ2cG/2LD6325e+7teRI5ZpFsQw QlrYyGhoGqgq9JnI6RDW+fbN7cT025eG+IjzLd0lk5r6dvI6ugHlW/WjdPIt9vuCdlBg KE16vPTqwkzPO7HqV75Y5UTcrf9gv3kdQzpOko7RQYD7a8DQi8qEgeTs7Q5okt5mFke1 HRUNs1gDYu6Uvr/Kxc46RiZKrNQQIPslETNpBgBuOSlaTD66LCC+5M9d41Uw+sN89aK/ 2QzK1SFL8K1Iekfeh+ZCJIv6DzNvmzhckMhIqXy1hXnFMezQ49YdqgZ+LZcbZIY3NumM 0x1w== X-Gm-Message-State: AKaTC00FjEODLc1M2djnkfJhtaG1i5sXednoWH/mOGhGe4cV4kgsNu1Pr5H4c+3TomdXoA== X-Received: by 10.28.133.144 with SMTP id h138mr9700345wmd.12.1481543644441; Mon, 12 Dec 2016 03:54:04 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id u81sm35077381wmu.10.2016.12.12.03.54.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 03:54:03 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Date: Mon, 12 Dec 2016 11:53:24 +0000 Message-Id: <20161212115350.780-9-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161212115350.780-1-chris@chris-wilson.co.uk> References: <20161212115350.780-1-chris@chris-wilson.co.uk> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 08/34] drm: kselftest for drm_mm_reserve_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_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 Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/selftests/drm_mm_selftests.h | 1 + drivers/gpu/drm/selftests/test-drm_mm.c | 132 +++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) 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..13b2cfdb4d44 100644 --- a/drivers/gpu/drm/selftests/test-drm_mm.c +++ b/drivers/gpu/drm/selftests/test-drm_mm.c @@ -11,6 +11,9 @@ #include +#include "../lib/drm_rand.h" +#include "../lib/drm_prime_numbers.h" + #define TESTS "drm_mm_selftests.h" #include "drm_selftest.h" @@ -105,6 +108,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 = drm_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 */ + drm_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(10); + int n, ret; + + drm_for_each_prime(n, 54) { + 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)