Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A5DAC2B9F4 for ; Mon, 28 Jun 2021 15:52:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB967619BE for ; Mon, 28 Jun 2021 15:52:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB967619BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64B5A6E4A5; Mon, 28 Jun 2021 15:52:35 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 129366E4A5; Mon, 28 Jun 2021 15:52:34 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10029"; a="271839011" X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="271839011" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2021 08:51:46 -0700 X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="419214738" Received: from vipulcha-mobl.ger.corp.intel.com (HELO [10.213.225.54]) ([10.213.225.54]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2021 08:51:44 -0700 Subject: Re: [PATCH v3 2/5] drm/i915/gem: Introduce a selftest for the gem object migrate functionality To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210628144626.76126-1-thomas.hellstrom@linux.intel.com> <20210628144626.76126-3-thomas.hellstrom@linux.intel.com> From: Matthew Auld Message-ID: Date: Mon, 28 Jun 2021 16:51:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210628144626.76126-3-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 28/06/2021 15:46, Thomas Hellström wrote: > From: Matthew Auld > > A selftest for the gem object migrate functionality. Slightly adapted > from the original by Matthew to the new interface and new fill blit > code. > > Co-developed-by: Thomas Hellström > Signed-off-by: Thomas Hellström > Signed-off-by: Matthew Auld > --- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + > .../drm/i915/gem/selftests/i915_gem_migrate.c | 237 ++++++++++++++++++ > .../drm/i915/selftests/i915_live_selftests.h | 1 + > 3 files changed, 239 insertions(+) > create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c > index 1c18be067b58..ff147fd59874 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -649,6 +649,7 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > #include "selftests/huge_gem_object.c" > #include "selftests/huge_pages.c" > +#include "selftests/i915_gem_migrate.c" > #include "selftests/i915_gem_object.c" > #include "selftests/i915_gem_coherency.c" > #endif > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > new file mode 100644 > index 000000000000..a437b66f64d9 > --- /dev/null > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > @@ -0,0 +1,237 @@ > +// SPDX-License-Identifier: MIT > +/* > + * Copyright © 2020-2021 Intel Corporation > + */ > + > +#include "gt/intel_migrate.h" > + > +static int igt_smem_create_migrate(void *arg) > +{ > + struct intel_gt *gt = arg; > + struct drm_i915_private *i915 = gt->i915; > + struct drm_i915_gem_object *obj; > + struct i915_gem_ww_ctx ww; > + int err = 0; > + > + /* Switch object backing-store on create */ > + obj = i915_gem_object_create_lmem(i915, PAGE_SIZE, 0); > + if (IS_ERR(obj)) > + return PTR_ERR(obj); > + > + for_i915_gem_ww(&ww, err, true) { > + err = i915_gem_object_lock(obj, &ww); > + if (err) > + continue; > + > + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) { > + err = -EINVAL; > + continue; > + } > + > + err = i915_gem_object_migrate(obj, &ww, INTEL_REGION_SMEM); > + if (err) > + continue; > + > + err = i915_gem_object_pin_pages(obj); > + if (err) > + continue; > + > + if (i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) > + err = -EINVAL; > + > + i915_gem_object_unpin_pages(obj); > + } > + i915_gem_object_put(obj); > + > + return err; > +} > + > +static int igt_lmem_create_migrate(void *arg) > +{ > + struct intel_gt *gt = arg; > + struct drm_i915_private *i915 = gt->i915; > + struct drm_i915_gem_object *obj; > + struct i915_gem_ww_ctx ww; > + int err = 0; > + > + /* Switch object backing-store on create */ > + obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); > + if (IS_ERR(obj)) > + return PTR_ERR(obj); > + > + for_i915_gem_ww(&ww, err, true) { > + err = i915_gem_object_lock(obj, &ww); > + if (err) > + continue; > + > + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) { > + err = -EINVAL; > + continue; > + } > + > + err = i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM); > + if (err) > + continue; > + > + err = i915_gem_object_pin_pages(obj); > + if (err) > + continue; > + > + if (i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) > + err = -EINVAL; > + > + i915_gem_object_unpin_pages(obj); > + } > + i915_gem_object_put(obj); > + > + return err; > +} > + > +static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, > + struct drm_i915_gem_object *obj) > +{ > + int err; > + > + err = i915_gem_object_lock(obj, ww); > + if (err) > + return err; > + > + err = i915_gem_object_wait(obj, > + I915_WAIT_INTERRUPTIBLE | > + I915_WAIT_PRIORITY | > + I915_WAIT_ALL, > + MAX_SCHEDULE_TIMEOUT); > + if (err) > + return err; > + > + if (i915_gem_object_is_lmem(obj)) { > + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) { > + pr_err("object can't migrate to smem.\n"); > + return -EINVAL; > + } > + > + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_SMEM); > + if (err) { > + pr_err("Object failed migration to smem\n"); > + if (err) > + return err; > + } > + > + if (i915_gem_object_is_lmem(obj)) { > + pr_err("object still backed by lmem\n"); > + err = -EINVAL; > + } > + > + if (!i915_gem_object_has_struct_page(obj)) { > + pr_err("object not backed by struct page\n"); > + err = -EINVAL; > + } > + > + } else { > + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) { > + pr_err("object can't migrate to lmem.\n"); > + return -EINVAL; > + } > + > + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM); > + if (err) { > + pr_err("Object failed migration to lmem\n"); > + if (err) > + return err; > + } > + > + if (i915_gem_object_has_struct_page(obj)) { > + pr_err("object still backed by struct page\n"); > + err = -EINVAL; > + } > + > + if (!i915_gem_object_is_lmem(obj)) { > + pr_err("object not backed by lmem\n"); > + err = -EINVAL; > + } > + } > + > + return err; > +} > + > +static int igt_lmem_pages_migrate(void *arg) > +{ > + struct intel_gt *gt = arg; > + struct drm_i915_private *i915 = gt->i915; > + struct drm_i915_gem_object *obj; > + struct i915_gem_ww_ctx ww; > + struct i915_request *rq; > + int err; > + int i; > + > + /* From LMEM to shmem and back again */ > + > + obj = i915_gem_object_create_lmem(i915, SZ_2M, 0); > + if (IS_ERR(obj)) > + return PTR_ERR(obj); > + > + err = i915_gem_object_lock(obj, NULL); > + if (err) > + goto out_put; > + > + err = ____i915_gem_object_get_pages(obj); > + if (err) { > + i915_gem_object_unlock(obj); > + goto out_put; > + } > + > + err = intel_context_migrate_clear(gt->migrate.context, NULL, > + obj->mm.pages->sgl, obj->cache_level, > + i915_gem_object_is_lmem(obj), > + 0, &rq); > + if (rq) { > + dma_resv_add_excl_fence(obj->base.resv, &rq->fence); > + i915_request_put(rq); > + } > + i915_gem_object_unlock(obj); > + if (err) > + goto out_put; > + > + for (i = 1; i <= 4; ++i) { > + for_i915_gem_ww(&ww, err, true) { > + err = lmem_pages_migrate_one(&ww, obj); > + if (err) > + continue; > + > + err = i915_gem_object_wait_migration(obj, true); > + if (err) > + continue; > + > + err = intel_migrate_clear(>->migrate, &ww, NULL, > + obj->mm.pages->sgl, > + obj->cache_level, > + i915_gem_object_is_lmem(obj), > + 0xdeadbeaf, &rq); > + if (rq) { > + dma_resv_add_excl_fence(obj->base.resv, > + &rq->fence); > + i915_request_put(rq); > + } > + } > + if (err) > + break; > + } > +out_put: > + i915_gem_object_put(obj); > + > + return err; > +} > + > +int i915_gem_migrate_live_selftests(struct drm_i915_private *i915) > +{ > + static const struct i915_subtest tests[] = { > + SUBTEST(igt_smem_create_migrate), > + SUBTEST(igt_lmem_create_migrate), > + SUBTEST(igt_lmem_pages_migrate), Might be good to dirty the pages before the migration, and then verify they still match at the end? > + }; > + > + if (!HAS_LMEM(i915)) > + return 0; > + > + return intel_gt_live_subtests(tests, &i915->gt); > +} > diff --git a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h > index a68197cf1044..e2fd1b61af71 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h > +++ b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h > @@ -40,6 +40,7 @@ selftest(hugepages, i915_gem_huge_page_live_selftests) > selftest(gem_contexts, i915_gem_context_live_selftests) > selftest(gem_execbuf, i915_gem_execbuffer_live_selftests) > selftest(client, i915_gem_client_blt_live_selftests) > +selftest(gem_migrate, i915_gem_migrate_live_selftests) > selftest(reset, intel_reset_live_selftests) > selftest(memory_region, intel_memory_region_live_selftests) > selftest(hangcheck, intel_hangcheck_live_selftests) >