From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.2 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,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 08586C432BE for ; Tue, 31 Aug 2021 09:45:30 +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 B923760F46 for ; Tue, 31 Aug 2021 09:45:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B923760F46 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=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DBF589B27; Tue, 31 Aug 2021 09:45:29 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FC7A89A16; Tue, 31 Aug 2021 09:45:26 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="218157984" X-IronPort-AV: E=Sophos;i="5.84,366,1620716400"; d="scan'208";a="218157984" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 02:45:23 -0700 X-IronPort-AV: E=Sophos;i="5.84,366,1620716400"; d="scan'208";a="531029971" Received: from wenqitan-mobl1.ger.corp.intel.com (HELO [10.252.59.180]) ([10.252.59.180]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 02:45:21 -0700 To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210826072414.384945-1-thomas.hellstrom@linux.intel.com> From: Maarten Lankhorst Message-ID: Date: Tue, 31 Aug 2021 11:45:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210826072414.384945-1-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH] drm/i915/gem: Fix the mman selftest X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" Op 26-08-2021 om 09:24 schreef Thomas Hellström: > Using the I915_MMAP_TYPE_FIXED mmap type requires the TTM backend, so > for that mmap type, use __i915_gem_object_create_user() instead of > i915_gem_object_create_internal(), as we really want to tests objects > mmap-able by user-space. > > This also means that the out-of-space error happens at object creation > and returns -ENXIO rather than -ENOSPC, so fix the code up to expect > that on out-of-offset-space errors. > > Finally only use I915_MMAP_TYPE_FIXED for LMEM and SMEM for now if > testing on LMEM-capable devices. For stolen LMEM, we still take the > same path as for integrated, as that haven't been moved over to TTM yet, > and user-space should not be able to create out of stolen LMEM anyway. > > Fixes: 7961c5b60f23 ("drm/i915: Add TTM offset argument to mmap.") > Cc: Maarten Lankhorst > Signed-off-by: Thomas Hellström > --- > .../drm/i915/gem/selftests/i915_gem_mman.c | 26 +++++++++++++++---- > 1 file changed, 21 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > index b20f5621f62b..68da25e66b69 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > @@ -581,6 +581,20 @@ static enum i915_mmap_type default_mapping(struct drm_i915_private *i915) > return I915_MMAP_TYPE_GTT; > } > > +static struct drm_i915_gem_object * > +create_sys_or_internal(struct drm_i915_private *i915, > + unsigned long size) > +{ > + if (HAS_LMEM(i915)) { > + struct intel_memory_region *sys_region = > + i915->mm.regions[INTEL_REGION_SMEM]; > + > + return __i915_gem_object_create_user(i915, size, &sys_region, 1); > + } > + > + return i915_gem_object_create_internal(i915, size); > +} > + > static bool assert_mmap_offset(struct drm_i915_private *i915, > unsigned long size, > int expected) > @@ -589,7 +603,7 @@ static bool assert_mmap_offset(struct drm_i915_private *i915, > u64 offset; > int ret; > > - obj = i915_gem_object_create_internal(i915, size); > + obj = create_sys_or_internal(i915, size); > if (IS_ERR(obj)) > return expected && expected == PTR_ERR(obj); > > @@ -633,6 +647,7 @@ static int igt_mmap_offset_exhaustion(void *arg) > struct drm_mm_node *hole, *next; > int loop, err = 0; > u64 offset; > + int enospc = HAS_LMEM(i915) ? -ENXIO : -ENOSPC; > > /* Disable background reaper */ > disable_retire_worker(i915); > @@ -683,14 +698,14 @@ static int igt_mmap_offset_exhaustion(void *arg) > } > > /* Too large */ > - if (!assert_mmap_offset(i915, 2 * PAGE_SIZE, -ENOSPC)) { > + if (!assert_mmap_offset(i915, 2 * PAGE_SIZE, enospc)) { > pr_err("Unexpectedly succeeded in inserting too large object into single page hole\n"); > err = -EINVAL; > goto out; > } > > /* Fill the hole, further allocation attempts should then fail */ > - obj = i915_gem_object_create_internal(i915, PAGE_SIZE); > + obj = create_sys_or_internal(i915, PAGE_SIZE); > if (IS_ERR(obj)) { > err = PTR_ERR(obj); > pr_err("Unable to create object for reclaimed hole\n"); > @@ -703,7 +718,7 @@ static int igt_mmap_offset_exhaustion(void *arg) > goto err_obj; > } > > - if (!assert_mmap_offset(i915, PAGE_SIZE, -ENOSPC)) { > + if (!assert_mmap_offset(i915, PAGE_SIZE, enospc)) { > pr_err("Unexpectedly succeeded in inserting object into no holes!\n"); > err = -EINVAL; > goto err_obj; > @@ -842,7 +857,8 @@ static bool can_mmap(struct drm_i915_gem_object *obj, enum i915_mmap_type type) > struct drm_i915_private *i915 = to_i915(obj->base.dev); > bool no_map; > > - if (HAS_LMEM(i915)) > + if (HAS_LMEM(i915) && (obj->mm.region->id == INTEL_REGION_SMEM || > + obj->mm.region->id == INTEL_REGION_LMEM)) Ooh just noticed, make the whole line "if (obj->ops->mmap_offset)" instead to match i915_gem_mman.c? Otherwise looks good. Reviewed-by: Maarten Lankhorst > return type == I915_MMAP_TYPE_FIXED; > else if (type == I915_MMAP_TYPE_FIXED) > return false;