[PATCH v2 08/11] drm/amdgpu: add userq va unmap validated helper
Prike Liang
Prike.Liang at amd.com
Tue Jun 17 08:01:48 UTC 2025
This helper can validate the userq whether can be
unmapped prior to the userq VA GEM unmap.
Signed-off-by: Prike Liang <Prike.Liang at amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 55 +++++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 3 ++
2 files changed, 58 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 4b00d9b16046..f04b51ded06f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -1135,3 +1135,58 @@ int amdgpu_userq_start_sched_for_enforce_isolation(struct amdgpu_device *adev,
mutex_unlock(&adev->userq_mutex);
return ret;
}
+
+static bool amdgpu_userq_gem_va_unmap_queue_retrieve(struct amdgpu_usermode_queue *queue,
+ uint64_t va)
+{
+ /*TODO: validate the user vas of EOP, shadow buffer, CSA buffer*/
+ if (amdgpu_userq_va_align(queue->queue_va) != va &&
+ amdgpu_userq_va_align(queue->wptr_va) != va &&
+ amdgpu_userq_va_align(queue->rptr_va) != va)
+ return false;
+
+ return true;
+}
+
+int amdgpu_userq_gem_va_unmap_validate(struct amdgpu_vm *vm,
+ uint64_t va)
+{
+ struct amdgpu_fpriv *fpriv = vm_to_fpriv(vm);
+ struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr;
+
+ if (vm->is_userq_context && &fpriv->vm == vm) {
+ struct amdgpu_usermode_queue *queue;
+ int queue_id, r = 0;
+
+ if (mutex_trylock(&uq_mgr->userq_mutex)) {
+ /* If here the userq bo is busy and needs to deactivate and prevent reusing it.*/
+ idr_for_each_entry(&uq_mgr->userq_idr, queue, queue_id) {
+ struct dma_fence *f = queue->last_fence;
+
+
+ if (!amdgpu_userq_gem_va_unmap_queue_retrieve(queue, va)) {
+ dev_dbg(uq_mgr->adev->dev, "queue(id:%d) not belond to vm:%p\n",
+ queue_id,vm);
+ continue;
+ }
+
+ if (f && !dma_fence_is_signaled(f)) {
+
+ dev_warn(uq_mgr->adev->dev, "try to unmap the busy queue(id:%d):%p under vm:%p\n",
+ queue_id, queue, vm);
+ /* Need to set a resonable state for avoiding reusing this queue*/
+ queue->state = AMDGPU_USERQ_STATE_HUNG;
+ r++;
+ }
+ }
+ mutex_unlock(&uq_mgr->userq_mutex);
+ return r;
+ } else {
+ /* do we need a try lock again before return*/
+ return -EBUSY;
+ }
+
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
index 9543fbab7cc3..7e532ca0ba05 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
@@ -31,6 +31,7 @@
#define to_ev_fence(f) container_of(f, struct amdgpu_eviction_fence, base)
#define uq_mgr_to_fpriv(u) container_of(u, struct amdgpu_fpriv, userq_mgr)
#define work_to_uq_mgr(w, name) container_of(w, struct amdgpu_userq_mgr, name)
+#define vm_to_fpriv(v) container_of(v, struct amdgpu_fpriv, vm)
enum amdgpu_userq_state {
AMDGPU_USERQ_STATE_UNMAPPED = 0,
@@ -145,4 +146,6 @@ bool amdgpu_userq_buffer_vas_mapped(struct amdgpu_vm *vm,
int amdgpu_userq_buffer_va_put(struct amdgpu_vm *vm, u64 addr);
int amdgpu_userq_buffer_vas_put(struct amdgpu_vm *vm,
struct amdgpu_usermode_queue *queue);
+int amdgpu_userq_gem_va_unmap_validate(struct amdgpu_vm *vm,
+ uint64_t va);
#endif
--
2.34.1
More information about the amd-gfx
mailing list