From: "Christian König" <christian.koenig@amd.com>
To: Lang Yu <Lang.Yu@amd.com>, amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/amdgpu: install stub fence into potential unused fence pointers
Date: Fri, 5 May 2023 14:46:36 +0200 [thread overview]
Message-ID: <0a347c54-0d08-98bf-2125-34ce13fd3f67@amd.com> (raw)
In-Reply-To: <20230505124407.44496-1-Lang.Yu@amd.com>
Am 05.05.23 um 14:44 schrieb Lang Yu:
> When using cpu to update page tables, vm update fences are unused.
> Install stub fence into these fence pointers instead of NULL
> to avoid NULL dereference when calling dma_fence_wait() on them.
>
> Suggested-by: Christian König <christian.koenig@amd.com>
> Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 78daf6e2f337..aae70a16fd46 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1444,6 +1444,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
> amdgpu_vm_bo_base_init(&bo_va->base, vm, bo);
>
> bo_va->ref_count = 1;
> + bo_va->last_pt_update = dma_fence_get_stub();
> INIT_LIST_HEAD(&bo_va->valids);
> INIT_LIST_HEAD(&bo_va->invalids);
>
> @@ -2144,7 +2145,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
> vm->update_funcs = &amdgpu_vm_cpu_funcs;
> else
> vm->update_funcs = &amdgpu_vm_sdma_funcs;
> - vm->last_update = NULL;
> +
> + vm->last_update = dma_fence_get_stub();
> vm->last_unlocked = dma_fence_get_stub();
> vm->last_tlb_flush = dma_fence_get_stub();
> vm->generation = 0;
> @@ -2267,7 +2269,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
> goto unreserve_bo;
>
> dma_fence_put(vm->last_update);
> - vm->last_update = NULL;
> + vm->last_update = dma_fence_get_stub();
> vm->is_compute_context = true;
>
> /* Free the shadow bo for compute VM */
prev parent reply other threads:[~2023-05-05 12:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-05 12:44 [PATCH] drm/amdgpu: install stub fence into potential unused fence pointers Lang Yu
2023-05-05 12:46 ` Christian König [this message]
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=0a347c54-0d08-98bf-2125-34ce13fd3f67@amd.com \
--to=christian.koenig@amd.com \
--cc=Lang.Yu@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/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