From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
To: <dri-devel@lists.freedesktop.org>, <christian.koenig@amd.com>,
<tursulin@igalia.com>, <simona.vetter@ffwll.ch>,
<robdclark@gmail.com>, <alexander.deucher@amd.com>,
<amd-gfx@lists.freedesktop.org>, <dmitry.osipenko@collabora.com>
Cc: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Subject: [PATCH v4 3/6] drm/amdgpu: delay the use of amdgpu_vm_set_task_info
Date: Fri, 27 Sep 2024 10:48:39 +0200 [thread overview]
Message-ID: <20240927084848.263718-4-pierre-eric.pelloux-prayer@amd.com> (raw)
In-Reply-To: <20240927084848.263718-1-pierre-eric.pelloux-prayer@amd.com>
At the point the VM is locked (through the root PDs dma_resv object), so
it's safer to call amdgpu_vm_set_task_info.
The original place was not protected against concurrent access, but the
risk was limited to mangled process/task name.
Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 1e475eb01417..891128ecee6d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -309,9 +309,6 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
p->gang_leader->uf_addr = uf_offset;
kvfree(chunk_array);
- /* Use this opportunity to fill in task info for the vm */
- amdgpu_vm_set_task_info(vm);
-
return 0;
free_all_kdata:
@@ -1180,6 +1177,9 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.bo);
}
+ /* Use this opportunity to fill in task info for the vm */
+ amdgpu_vm_set_task_info(vm);
+
if (adev->debug_vm) {
/* Invalidate all BOs to test for userspace bugs */
amdgpu_bo_list_for_each_entry(e, p->bo_list) {
--
2.40.1
next prev parent reply other threads:[~2024-09-27 8:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-27 8:48 [PATCH v4 0/6] DRM_SET_CLIENT_NAME ioctl Pierre-Eric Pelloux-Prayer
2024-09-27 8:48 ` [PATCH v4 1/6] drm: add " Pierre-Eric Pelloux-Prayer
2024-09-28 12:31 ` Dmitry Osipenko
2024-09-30 8:57 ` Tvrtko Ursulin
2024-09-27 8:48 ` [PATCH v4 2/6] drm: use drm_file client_name in fdinfo Pierre-Eric Pelloux-Prayer
2024-09-27 8:48 ` Pierre-Eric Pelloux-Prayer [this message]
2024-09-27 8:48 ` [PATCH v4 4/6] drm/amdgpu: alloc and init vm::task_info from first submit Pierre-Eric Pelloux-Prayer
2024-09-27 8:48 ` [PATCH v4 5/6] drm/amdgpu: make process_name a flexible array Pierre-Eric Pelloux-Prayer
2024-09-27 8:48 ` [PATCH v4 6/6] drm/amdgpu: use drm_file::name in task_info::process_desc Pierre-Eric Pelloux-Prayer
2024-09-30 9:24 ` Tvrtko Ursulin
2024-09-27 9:07 ` [PATCH v4 0/6] DRM_SET_CLIENT_NAME ioctl Christian König
2024-09-27 9:16 ` Jani Nikula
2024-09-28 12:34 ` Dmitry Osipenko
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=20240927084848.263718-4-pierre-eric.pelloux-prayer@amd.com \
--to=pierre-eric.pelloux-prayer@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=robdclark@gmail.com \
--cc=simona.vetter@ffwll.ch \
--cc=tursulin@igalia.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