From patchwork Mon Dec 12 11:53:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9470539 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 1244060760 for ; Mon, 12 Dec 2016 11:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 069F628477 for ; Mon, 12 Dec 2016 11:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF5F82847C; Mon, 12 Dec 2016 11:54:45 +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 859C028477 for ; Mon, 12 Dec 2016 11:54:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F05DC6E2E7; Mon, 12 Dec 2016 11:54:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x242.google.com (mail-wj0-x242.google.com [IPv6:2a00:1450:400c:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C80976E2E1; Mon, 12 Dec 2016 11:54:16 +0000 (UTC) Received: by mail-wj0-x242.google.com with SMTP id xy5so11067748wjc.1; Mon, 12 Dec 2016 03:54:16 -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=s1klOy9qw+JLoMbl6M1Yvh3Zryptf6kXhfSnBXZxyoA=; b=KwL5pBf9p9OcZSaG8h7mMdv8vH5aT0354IqcKZGB6I0hVbcrRFnS3IvWV8ch2H6QVn WYO3g5x2n7h8oqly99lIySKkvkQ/sv9vHbMvAO4sFXlNYQh8Hbb19CQnZWcW8w9bqPSB UKul4JiqTcxx4oKIfQlI/oxAsuoekL5ufPZpx5F85yI0q/e+eAoJ808QsYqqrQRiMMuV d3Q7J2gURO5ESPcosbQAR+lyc13cKTjsgqTPPQk3EjzY9wJpXprUibULaCT+giUlGCIX 4np3MWTSTt7u+CtkdA5LMcSth3Fvoot5vOUCf5VUn4XK9UGyZ0yqhwSWHamzYJbmaGZx WrWA== 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=s1klOy9qw+JLoMbl6M1Yvh3Zryptf6kXhfSnBXZxyoA=; b=JBLAuHb72GbCMrUnkwvr9xmXYaUEgBD5JmJoyZZUyGjd3S0mlvz40qXNqA+vLL+c8o or9nRUwrNI+jRuKSPfsUFLbFHxU+gT8GtWnqYBhRfKcbBAoL3Uhda/0tp0eMFagW0drh G03Rv2OiMIYB71o+27rXvo3WnxgyLraAB0Qzat5Wd7kYtfqPJrXW1R/wRHGpNikSyaJ6 53b7lRa5CyXy85KSTKoknevnvQHFhPfhuDqzYgqCMnijeqTQpLt9F1RCMdZePQuOplBP HJ5CR/+dgQ7HTz9pEerHKAmKHkMrqe3KxkKO0Em5GAtANo02kWFdT058ynYI6cl6iUFT Tjkg== X-Gm-Message-State: AKaTC01LxlbJbFZUjJF+exCJbHCI+NjT4+E57V6uVZwTLqraJ15NeaO2rAgW9d2+OpSbaw== X-Received: by 10.194.171.200 with SMTP id aw8mr77172073wjc.79.1481543654793; Mon, 12 Dec 2016 03:54:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 03:54:14 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH 18/34] drm: kselftest for drm_mm and color eviction Date: Mon, 12 Dec 2016 11:53:34 +0000 Message-Id: <20161212115350.780-19-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, joonas.lahtinen@linux.intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Check that after applying the driver's color adjustment, eviction scanning find a suitable hole. Signed-off-by: Chris Wilson --- drivers/gpu/drm/selftests/drm_mm_selftests.h | 1 + drivers/gpu/drm/selftests/test-drm_mm.c | 198 +++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) diff --git a/drivers/gpu/drm/selftests/drm_mm_selftests.h b/drivers/gpu/drm/selftests/drm_mm_selftests.h index 408083b54177..cdb7c72ecadf 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(color_evict, igt_color_evict) selftest(color, igt_color) selftest(topdown_align, igt_topdown_align) selftest(topdown, igt_topdown) diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c index 0fe5344fe789..663db5408b3a 100644 --- a/drivers/gpu/drm/selftests/test-drm_mm.c +++ b/drivers/gpu/drm/selftests/test-drm_mm.c @@ -1586,6 +1586,204 @@ static int igt_color(void *ignored) return ret; } +static int igt_color_evict(void *ignored) +{ + u32 lcg_state = random_seed; + const int total_size = 8192; + unsigned long color = 0; + struct drm_mm mm; + struct evict_node { + struct drm_mm_node node; + struct list_head link; + } *nodes; + struct drm_mm_node *node, *next; + int *order, n, m; + int ret; + + ret = -ENOMEM; + nodes = vzalloc(total_size * sizeof(*nodes)); + if (!nodes) + goto err; + + order = drm_random_order(total_size, &lcg_state); + if (!order) + goto err_nodes; + + ret = -EINVAL; + drm_mm_init(&mm, 0, 2*total_size - 1); + mm.color_adjust = no_color_touching; + for (n = 0; n < total_size; n++) { + int err; + + err = drm_mm_insert_node_generic(&mm, &nodes[n].node, + 1, 0, color++, + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); + if (err) { + pr_err("insert failed, step %d\n", n); + ret = err; + goto out; + } + } + + for (n = 1; n <= total_size; n <<= 1) { + const int nsize = total_size - 1; + unsigned int c = color++; + LIST_HEAD(evict_list); + struct evict_node *e, *en; + struct drm_mm_node tmp; + int err; + + drm_mm_init_scan(&mm, nsize, n, c); + drm_random_reorder(order, total_size, &lcg_state); + for (m = 0; m < total_size; m++) { + e = &nodes[order[m]]; + list_add(&e->link, &evict_list); + if (drm_mm_scan_add_block(&e->node)) + break; + } + list_for_each_entry_safe(e, en, &evict_list, link) { + if (!drm_mm_scan_remove_block(&e->node)) + list_del(&e->link); + } + if (list_empty(&evict_list)) { + pr_err("Failed to find eviction: size=%d, align=%d, color=%d\n", + nsize, n, c); + goto out; + } + + list_for_each_entry(e, &evict_list, link) + drm_mm_remove_node(&e->node); + + memset(&tmp, 0, sizeof(tmp)); + err = drm_mm_insert_node_generic(&mm, &tmp, nsize, n, c, + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); + if (err) { + pr_err("Failed to insert into eviction hole: size=%d, align=%d, color=%d, err=%d\n", + nsize, n, c, err); + show_scan(&mm); + show_holes(&mm, 3); + ret = err; + goto out; + } + + if ((int)tmp.start % n || tmp.size != nsize) { + pr_err("Inserted did not fit the eviction hole: size=%lld [%d], align=%d [rem=%d], start=%llx\n", + tmp.size, nsize, n, (int)tmp.start % n, tmp.start); + + drm_mm_remove_node(&tmp); + goto out; + } + + if (!tmp.hole_follows && + list_next_entry(&tmp, node_list)->allocated) { + pr_err("colors abutt; %ld [%llx + %llx] is next to %ld [%llx + %llx]!\n", + tmp.color, tmp.start, tmp.size, + list_next_entry(&tmp, node_list)->color, + list_next_entry(&tmp, node_list)->start, + list_next_entry(&tmp, node_list)->size); + goto out; + } + + drm_mm_remove_node(&tmp); + list_for_each_entry(e, &evict_list, link) { + err = drm_mm_reserve_node(&mm, &e->node); + if (err) { + pr_err("Failed to reinsert node after eviction: start=%llx\n", + e->node.start); + ret = err; + goto out; + } + } + } + + drm_for_each_prime(n, total_size) { + LIST_HEAD(evict_list); + unsigned int c = color++; + struct evict_node *e, *en; + struct drm_mm_node tmp; + int nsize = (total_size - n + 1) / 2; + int err; + + drm_mm_init_scan(&mm, nsize, n, c); + drm_random_reorder(order, total_size, &lcg_state); + for (m = 0; m < total_size; m++) { + e = &nodes[order[m]]; + list_add(&e->link, &evict_list); + if (drm_mm_scan_add_block(&e->node)) + break; + } + list_for_each_entry_safe(e, en, &evict_list, link) { + if (!drm_mm_scan_remove_block(&e->node)) + list_del(&e->link); + } + if (list_empty(&evict_list)) { + pr_err("Failed to find eviction: size=%d, align=%d (prime), color=%d\n", + nsize, n, c); + goto out; + } + + list_for_each_entry(e, &evict_list, link) + drm_mm_remove_node(&e->node); + + memset(&tmp, 0, sizeof(tmp)); + err = drm_mm_insert_node_generic(&mm, &tmp, nsize, n, c, + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); + if (err) { + pr_err("Failed to insert into eviction hole: size=%d, align=%d (prime), color=%d, err=%d\n", + nsize, n, c, err); + show_scan(&mm); + show_holes(&mm, 3); + ret = err; + goto out; + } + + if ((int)tmp.start % n || tmp.size != nsize) { + pr_err("Inserted did not fit the eviction hole: size=%lld [%d], align=%d [rem=%d] (prime), start=%llx\n", + tmp.size, nsize, n, (int)tmp.start % n, tmp.start); + + drm_mm_remove_node(&tmp); + goto out; + } + + if (!tmp.hole_follows && + list_next_entry(&tmp, node_list)->allocated) { + pr_err("colors abutt; %ld [%llx + %llx] is next to %ld [%llx + %llx]!\n", + tmp.color, tmp.start, tmp.size, + list_next_entry(&tmp, node_list)->color, + list_next_entry(&tmp, node_list)->start, + list_next_entry(&tmp, node_list)->size); + goto out; + } + + drm_mm_remove_node(&tmp); + list_for_each_entry(e, &evict_list, link) { + err = drm_mm_reserve_node(&mm, &e->node); + if (err) { + pr_err("Failed to reinsert node after eviction: start=%llx\n", + e->node.start); + ret = err; + goto out; + } + } + } + + ret = 0; +out: + if (ret) + drm_mm_debug_table(&mm, __func__); + drm_mm_for_each_node_safe(node, next, &mm) + drm_mm_remove_node(node); + drm_mm_takedown(&mm); + kfree(order); +err_nodes: + vfree(nodes); +err: + return ret; +} + #include "drm_selftest.c" static int __init test_drm_mm_init(void)