From patchwork Thu Jan 17 14:34:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10768347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 76B6817FB for ; Thu, 17 Jan 2019 14:35:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65990301F8 for ; Thu, 17 Jan 2019 14:35:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63FA2301FE; Thu, 17 Jan 2019 14:35:55 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 09E16301F8 for ; Thu, 17 Jan 2019 14:35:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E39D76F49A; Thu, 17 Jan 2019 14:35:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B6116F481 for ; Thu, 17 Jan 2019 14:35:36 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 15255586-1500050 for multiple; Thu, 17 Jan 2019 14:35:25 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 17 Jan 2019 14:34:52 +0000 Message-Id: <20190117143519.16086-12-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190117143519.16086-1-chris@chris-wilson.co.uk> References: <20190117143519.16086-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 11/23] drm/i915/selftests: Make evict tolerant of foreign objects X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The evict selftests presumed that all objects in use had been allocated by itself. This is a dubious claim and so instead of asserting complete control over the object lists, take (temporary) ownership of them instead. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- .../gpu/drm/i915/selftests/i915_gem_evict.c | 64 +++++++++++++++---- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c index fb7df895afeb..c8deb961a020 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c @@ -31,30 +31,63 @@ static int populate_ggtt(struct drm_i915_private *i915) { - struct drm_i915_gem_object *obj; + struct drm_i915_gem_object *obj, *on; + unsigned long expected_unbound, expected_bound; + unsigned long unbound, bound, count; u64 size; + int err; + + expected_unbound = 0; + list_for_each_entry(obj, &i915->mm.unbound_list, mm.link) { + i915_gem_object_get(obj); + expected_unbound++; + } + + expected_bound = 0; + list_for_each_entry(obj, &i915->mm.bound_list, mm.link) { + i915_gem_object_get(obj); + expected_bound++; + } + count = 0; for (size = 0; size + I915_GTT_PAGE_SIZE <= i915->ggtt.vm.total; size += I915_GTT_PAGE_SIZE) { struct i915_vma *vma; obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE); - if (IS_ERR(obj)) - return PTR_ERR(obj); + if (IS_ERR(obj)) { + err = PTR_ERR(obj); + goto cleanup; + } vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0); - if (IS_ERR(vma)) - return PTR_ERR(vma); + if (IS_ERR(vma)) { + err = PTR_ERR(vma); + goto cleanup; + } + + count++; } - if (!list_empty(&i915->mm.unbound_list)) { - size = 0; - list_for_each_entry(obj, &i915->mm.unbound_list, mm.link) - size++; + unbound = 0; + list_for_each_entry(obj, &i915->mm.unbound_list, mm.link) + unbound++; + if (unbound != expected_unbound) { + pr_err("%s: Found %lu objects unbound, expected %lu!\n", + __func__, unbound, expected_unbound); + err = -EINVAL; + goto cleanup; + } - pr_err("Found %lld objects unbound!\n", size); - return -EINVAL; + bound = 0; + list_for_each_entry(obj, &i915->mm.bound_list, mm.link) + bound++; + if (bound != expected_bound + count) { + pr_err("%s: Found %lu objects bound, expected %lu!\n", + __func__, bound, expected_bound + count); + err = -EINVAL; + goto cleanup; } if (list_empty(&i915->ggtt.vm.bound_list)) { @@ -63,6 +96,15 @@ static int populate_ggtt(struct drm_i915_private *i915) } return 0; + +cleanup: + list_for_each_entry_safe(obj, on, &i915->mm.unbound_list, mm.link) + i915_gem_object_put(obj); + + list_for_each_entry_safe(obj, on, &i915->mm.bound_list, mm.link) + i915_gem_object_put(obj); + + return err; } static void unpin_ggtt(struct drm_i915_private *i915)