Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Ghimiray, Himal Prasad" <himal.prasad.ghimiray@intel.com>
To: "Zhanjun Dong" <zhanjun.dong@intel.com>,
	intel-xe@lists.freedesktop.org,
	"Matthew Brost" <matthew.brost@intel.com>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: Re: [PATCH v2 1/1] drm/xe: Prevent null pointer access in xe_migrate_copy
Date: Fri, 20 Sep 2024 09:58:14 +0530	[thread overview]
Message-ID: <f9269ec3-dc9b-4863-9e41-e7a9946d9e1c@intel.com> (raw)
In-Reply-To: <20240919224220.1325739-2-zhanjun.dong@intel.com>



On 20-09-2024 04:12, Zhanjun Dong wrote:
> Update lacks source flag to include resource is null case. This will
> prevent null pointer derefrence in xe_migrate_copy.
> 
> Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_bo.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 5f2f1ec46b57..5e8f60a8d431 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -682,8 +682,8 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
>   	tt_has_data = ttm && (ttm_tt_is_populated(ttm) ||
>   			      (ttm->page_flags & TTM_TT_FLAG_SWAPPED));
>   
> -	move_lacks_source = handle_system_ccs ? (!bo->ccs_cleared)  :
> -						(!mem_type_is_vram(old_mem_type) && !tt_has_data);
> +	move_lacks_source = !old_mem || (handle_system_ccs ? (!bo->ccs_cleared) :
> +					 (!mem_type_is_vram(old_mem_type) && !tt_has_data));


Just for curiosity, isn't !old_mem implicitly taken care here ?
shouldn't ttm be NULL, if resource is NULL ? IIRC, this was what Thomas 
had confirmed during handle_system_ccs implementation.

Thomas/Matt,
Can you confirm here ?

BR
Himal


>   
>   	needs_clear = (ttm && ttm->page_flags & TTM_TT_FLAG_ZERO_ALLOC) ||
>   		(!ttm && ttm_bo->type == ttm_bo_type_device);

  reply	other threads:[~2024-09-20  4:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-19 22:42 [PATCH v2 0/1] drm/xe: Prevent null pointer access in xe_migrate_copy Zhanjun Dong
2024-09-19 22:42 ` [PATCH v2 1/1] " Zhanjun Dong
2024-09-20  4:28   ` Ghimiray, Himal Prasad [this message]
2024-09-20 21:44     ` Matt Roper
2024-09-21  0:24       ` Matthew Brost
2024-09-24 17:14         ` Thomas Hellström
2024-09-19 22:55 ` ✓ CI.Patch_applied: success for " Patchwork
2024-09-19 22:55 ` ✓ CI.checkpatch: " Patchwork
2024-09-19 22:56 ` ✓ CI.KUnit: " Patchwork
2024-09-19 23:08 ` ✓ CI.Build: " Patchwork
2024-09-19 23:10 ` ✓ CI.Hooks: " Patchwork
2024-09-19 23:12 ` ✓ CI.checksparse: " Patchwork
2024-09-19 23:30 ` ✓ CI.BAT: " Patchwork
2024-09-20  1:13 ` ✗ CI.FULL: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f9269ec3-dc9b-4863-9e41-e7a9946d9e1c@intel.com \
    --to=himal.prasad.ghimiray@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=matthew.brost@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=zhanjun.dong@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox