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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1F1F2C54EED for ; Mon, 30 Jan 2023 12:12:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE71110E21E; Mon, 30 Jan 2023 12:12:24 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E42610E21E; Mon, 30 Jan 2023 12:12:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675080742; x=1706616742; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=zU/Gb+ZgVKSFYFAxNTVSuZQLQpFU8EKks93Uzs3uGP4=; b=ajjhFrTegEdg3TvSQD7b97a0f+T1RFnkDwbjQBV2d6O+ezKVcDhkTE1B xPWXb0l/aNedF5132HfXNshIm1zYezqwdhhS/+2iTCdlo+6czVc8b/6op UOsxz9EtqtkWz7d5jTsS07HsRCBLGdljQhvczovgx+3zfDRifMZ+9KIgk zssb2b7FwPogErxFUkg03f8zrNh9Z43sCrbjH57E96fjlYFepnQCaN1QT EGKj+kaWInrR9F7wz0NK0mhPnLXUcIr2JAYqWaPq4KXQPKCL27nnOmeRe kYSEHvB36dndcxoBuMYt4OUa+GpVbcvbQOPNQ0Z9H8J+4IQhp6VvT4UzB A==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="392089513" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="392089513" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:12:21 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="694541115" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="694541115" Received: from nirmoyda-mobl.ger.corp.intel.com (HELO [10.251.209.222]) ([10.251.209.222]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:12:17 -0800 Message-ID: <5693c957-5abd-8bec-cc53-961048eaeb27@linux.intel.com> Date: Mon, 30 Jan 2023 13:12:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: Matthew Auld , intel-gfx@lists.freedesktop.org References: <20230130120636.63765-1-matthew.auld@intel.com> <20230130120636.63765-2-matthew.auld@intel.com> From: "Das, Nirmoy" In-Reply-To: <20230130120636.63765-2-matthew.auld@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH v2 2/6] drm/i915/ttm: audit remaining bo->resource 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: , Cc: =?UTF-8?Q?Christian_K=c3=b6nig?= , dri-devel@lists.freedesktop.org, Andrzej Hajda , Nirmoy Das Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 1/30/2023 1:06 PM, Matthew Auld wrote: > In the near future TTM will have NULL bo->resource when the object is > initially created, plus after calling into pipeline-gutting. Try to > handle the remaining cases. In practice NULL bo->resource should be > taken to mean swapped-out or purged object. > > v2 (Andrzej): > - Rather make i915_ttm_cpu_maps_iomem() return false with NULL > resource. > > References: 516198d317d8 ("drm/i915: audit bo->resource usage v3") > Signed-off-by: Matthew Auld > Cc: Christian König > Cc: Nirmoy Das > Reviewed-by: Andrzej Hajda Reviewed-by: Nirmoy Das > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 10 ++++++++-- > drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 4 ++++ > drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 7 +++++-- > 4 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > index 4758f21c91e1..341b94672abc 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -472,7 +472,7 @@ static int i915_ttm_shrink(struct drm_i915_gem_object *obj, unsigned int flags) > struct ttm_placement place = {}; > int ret; > > - if (!bo->ttm || bo->resource->mem_type != TTM_PL_SYSTEM) > + if (!bo->ttm || i915_ttm_cpu_maps_iomem(bo->resource)) > return 0; > > GEM_BUG_ON(!i915_tt->is_shmem); > @@ -511,7 +511,13 @@ static void i915_ttm_delete_mem_notify(struct ttm_buffer_object *bo) > { > struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo); > > - if (bo->resource && !i915_ttm_is_ghost_object(bo)) { > + /* > + * This gets called twice by ttm, so long as we have a ttm resource or > + * ttm_tt then we can still safely call this. Due to pipeline-gutting, > + * we maybe have NULL bo->resource, but in that case we should always > + * have a ttm alive (like if the pages are swapped out). > + */ > + if ((bo->resource || bo->ttm) && !i915_ttm_is_ghost_object(bo)) { > __i915_gem_object_pages_fini(obj); > i915_ttm_free_cached_io_rsgt(obj); > } > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.h b/drivers/gpu/drm/i915/gem/i915_gem_ttm.h > index 2a94a99ef76b..f8f6bed1b297 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.h > @@ -98,7 +98,7 @@ static inline bool i915_ttm_gtt_binds_lmem(struct ttm_resource *mem) > static inline bool i915_ttm_cpu_maps_iomem(struct ttm_resource *mem) > { > /* Once / if we support GGTT, this is also false for cached ttm_tts */ > - return mem->mem_type != I915_PL_SYSTEM; > + return mem && mem->mem_type != I915_PL_SYSTEM; > } > > bool i915_ttm_resource_mappable(struct ttm_resource *res); > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > index 76dd9e5e1a8b..d030182ca176 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > @@ -711,6 +711,10 @@ int i915_gem_obj_copy_ttm(struct drm_i915_gem_object *dst, > > assert_object_held(dst); > assert_object_held(src); > + > + if (GEM_WARN_ON(!src_bo->resource || !dst_bo->resource)) > + return -EINVAL; > + > i915_deps_init(&deps, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); > > ret = dma_resv_reserve_fences(src_bo->base.resv, 1); > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c > index 7e67742bc65e..dfe39c8e74d8 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c > @@ -53,7 +53,7 @@ static int i915_ttm_backup(struct i915_gem_apply_to_region *apply, > unsigned int flags; > int err = 0; > > - if (bo->resource->mem_type == I915_PL_SYSTEM || obj->ttm.backup) > + if (!i915_ttm_cpu_maps_iomem(bo->resource) || obj->ttm.backup) > return 0; > > if (pm_apply->allow_gpu && i915_gem_object_evictable(obj)) > @@ -187,7 +187,10 @@ static int i915_ttm_restore(struct i915_gem_apply_to_region *apply, > return err; > > /* Content may have been swapped. */ > - err = ttm_tt_populate(backup_bo->bdev, backup_bo->ttm, &ctx); > + if (!backup_bo->resource) > + err = ttm_bo_validate(backup_bo, i915_ttm_sys_placement(), &ctx); > + if (!err) > + err = ttm_tt_populate(backup_bo->bdev, backup_bo->ttm, &ctx); > if (!err) { > err = i915_gem_obj_copy_ttm(obj, backup, pm_apply->allow_gpu, > false);