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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D3B2FC11F66 for ; Mon, 28 Jun 2021 19:14:55 +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 7C8D461C92 for ; Mon, 28 Jun 2021 19:14:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C8D461C92 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 C57036E520; Mon, 28 Jun 2021 19:14:53 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id E77616E134; Mon, 28 Jun 2021 19:14:51 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10029"; a="205012172" X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="205012172" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2021 12:14:51 -0700 X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="488996130" Received: from danielmi-mobl2.ger.corp.intel.com (HELO [10.249.254.242]) ([10.249.254.242]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2021 12:14:49 -0700 Message-ID: Subject: Re: [Intel-gfx] [PATCH v3 2/5] drm/i915/gem: Introduce a selftest for the gem object migrate functionality From: Thomas =?ISO-8859-1?Q?Hellstr=F6m?= To: "Ruhl, Michael J" , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" Date: Mon, 28 Jun 2021 21:14:47 +0200 In-Reply-To: <1cd06e51484c44a985e4a467007d1752@intel.com> References: <20210628144626.76126-1-thomas.hellstrom@linux.intel.com> <20210628144626.76126-3-thomas.hellstrom@linux.intel.com> <1cd06e51484c44a985e4a467007d1752@intel.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.1 (3.40.1-1.fc34) MIME-Version: 1.0 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: , Cc: "Auld, Matthew" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, 2021-06-28 at 18:53 +0000, Ruhl, Michael J wrote: > > -----Original Message----- > > From: Intel-gfx On Behalf > > Of > > Thomas Hellström > > Sent: Monday, June 28, 2021 10:46 AM > > To: intel-gfx@lists.freedesktop.org; > > dri-devel@lists.freedesktop.org > > Cc: Thomas Hellström ; Auld, > > Matthew > > > > Subject: [Intel-gfx] [PATCH v3 2/5] drm/i915/gem: Introduce a > > selftest for the > > gem object migrate functionality > > > > 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)) { > > I don't see any  testing of the parameter num_allowed. > > Is that done somewhere else? > > Mike That's a user-space submitted parameter only, dictating what region the object is allowed in when bound to the GPU. It's not exercised in this selftest. Thanks, Thomas