drm/amdgpu: add user queue reset source
Subsystems (3)
Alex Deucher
maintainerPATCH 1/7 drm/amdgpu: add user queue reset source
Track resets from user queues.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +3 -0
@@ -340,6 +340,9 @@ void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,case AMDGPU_RESET_SRC_USER :strscpy (buf,"user trigger" , len);break ; +case AMDGPU_RESET_SRC_USERQ : +strscpy (buf,"user queue trigger" , len); +break ;default :strscpy (buf,"unknown" , len); }
drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h +1 -0
@@ -43,6 +43,7 @@ enum AMDGPU_RESET_SRCS {AMDGPU_RESET_SRC_MES ,AMDGPU_RESET_SRC_HWS ,AMDGPU_RESET_SRC_USER , + AMDGPU_RESET_SRC_USERQ, }; struct amdgpu_reset_context {
Signature · 1 line
2.49.0
Alex Deucher
maintainerPATCH 2/7 drm/amdgpu/userq: add callback for reset
This is used to reset a queue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +2 -0
@@ -77,6 +77,8 @@ struct amdgpu_userq_funcs { struct amdgpu_usermode_queue *queue);int (*map)(struct amdgpu_userq_mgr *uq_mgr,struct amdgpu_usermode_queue *queue); +int (*reset)(struct amdgpu_userq_mgr *uq_mgr, +struct amdgpu_usermode_queue *queue); };/* Usermode queues for gfx */
Signature · 1 line
2.49.0
Re: [PATCH 2/7] drm/amdgpu/userq: add callback for reset
Quoted 4 lines · Alex Deucher
This is used to reset a queue.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +2
-0@@ -77,6 +77,8 @@ struct amdgpu_userq_funcs { struct amdgpu_usermode_queue *queue);int (*map)(struct amdgpu_userq_mgr *uq_mgr,struct amdgpu_usermode_queue *queue); +int (*reset)(struct amdgpu_userq_mgr *uq_mgr, +struct amdgpu_usermode_queue *queue); };/* Usermode queues for gfx */
Alex Deucher
maintainerPATCH 3/7 drm/amdgpu: add mes userq reset callback
In reply to Alex DeucherUsed to reset a hung queue.
--- drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +21 -0
@@ -347,9 +347,30 @@ mes_userq_mqd_destroy(struct amdgpu_userq_mgr *uq_mgr,amdgpu_userq_destroy_object (uq_mgr, &queue->mqd); } +static int mes_userq_reset (struct amdgpu_userq_mgr *uq_mgr, +struct amdgpu_usermode_queue *queue) +{ +struct amdgpu_device *adev = uq_mgr->adev; +struct mes_reset_queue_input queue_input; +int r; + +memset (&queue_input,0x0 ,sizeof (struct mes_reset_queue_input )); + + queue_input.doorbell_offset = queue->doorbell_index; + queue_input.queue_type = queue->queue_type; + +amdgpu_mes_lock (&adev->mes); + r = adev->mes.funcs->reset_hw_queue (&adev->mes, &queue_input); +amdgpu_mes_unlock (&adev->mes); +if (r) +dev_err (adev->dev,"Failed to reset queue, err (%d)\n" , r); +return r; +} +const struct amdgpu_userq_funcs userq_mes_funcs = { .mqd_create = mes_userq_mqd_create, .mqd_destroy = mes_userq_mqd_destroy, .unmap = mes_userq_unmap, .map = mes_userq_map, + .reset = mes_userq_reset, };
Signature · 1 line
2.49.0
Re: [PATCH 3/7] drm/amdgpu: add mes userq reset callback
Quoted 4 lines · Alex Deucher
Used to reset a hung queue.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 39 lines
--- drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +21
-0@@ -347,9 +347,30 @@ mes_userq_mqd_destroy(struct amdgpu_userq_mgr *uq_mgr,amdgpu_userq_destroy_object (uq_mgr, &queue->mqd); } +static int mes_userq_reset (struct amdgpu_userq_mgr *uq_mgr, +struct amdgpu_usermode_queue *queue) +{ +struct amdgpu_device *adev = uq_mgr->adev; +struct mes_reset_queue_input queue_input; +int r; + +memset (&queue_input,0x0 ,sizeof (struct mes_reset_queue_input )); + + queue_input.doorbell_offset = queue->doorbell_index; + queue_input.queue_type = queue->queue_type; + +amdgpu_mes_lock (&adev->mes); + r = adev->mes.funcs->reset_hw_queue (&adev->mes, &queue_input); +amdgpu_mes_unlock (&adev->mes); +if (r) +dev_err (adev->dev,"Failed to reset queue, err (%d)\n" , r); +return r; +} +const struct amdgpu_userq_funcs userq_mes_funcs = { .mqd_create = mes_userq_mqd_create, .mqd_destroy = mes_userq_mqd_destroy, .unmap = mes_userq_unmap, .map = mes_userq_map, + .reset = mes_userq_reset, };
Alex Deucher
maintainerPATCH 4/7 drm/amdgpu/userq: add force completion helpers
In reply to Alex DeucherAdd support for forcing completion of userq fences. This is needed for userq resets and asic resets so that we can set the error on the fence and force completion.
--- .../gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 42 +++++++++++++++++++ .../gpu/drm/amd/amdgpu/amdgpu_userq_fence.h | 1 + 2 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +42 -0
@@ -67,6 +67,14 @@ static u64 amdgpu_userq_fence_read(struct amdgpu_userq_fence_driver *fence_drv)return le64_to_cpu (*fence_drv->cpu_addr); } +static void +amdgpu_userq_fence_write (struct amdgpu_userq_fence_driver *fence_drv, +u64 seq) +{ +if (fence_drv->cpu_addr) + *fence_drv->cpu_addr =cpu_to_le64 (seq); +} +int amdgpu_userq_fence_driver_alloc (struct amdgpu_device *adev,struct amdgpu_usermode_queue *userq) {
@@ -408,6 +416,40 @@ static void amdgpu_userq_fence_cleanup(struct dma_fence *fence)dma_fence_put (fence); } +static void +amdgpu_userq_fence_driver_set_error (struct amdgpu_userq_fence *fence, +int error) +{ +struct amdgpu_userq_fence_driver *fence_drv = fence->fence_drv; +unsigned long flags; +struct dma_fence *f; + +spin_lock_irqsave (&fence_drv->fence_list_lock, flags); + + f =rcu_dereference_protected (&fence->base, +lockdep_is_held (&fence_drv->fence_list_lock)); +if (f && !dma_fence_is_signaled_locked (f)) +dma_fence_set_error (f, error); +spin_unlock_irqrestore (&fence_drv->fence_list_lock, flags); +} + +void +amdgpu_userq_fence_driver_force_completion (struct amdgpu_usermode_queue *userq) +{ +struct dma_fence *f = userq->last_fence; + +if (f) { +struct amdgpu_userq_fence *fence =to_amdgpu_userq_fence (f); +struct amdgpu_userq_fence_driver *fence_drv = fence->fence_drv; +u64 wptr = fence->base.seqno; + +amdgpu_userq_fence_driver_set_error (fence, -ECANCELED ); +amdgpu_userq_fence_write (fence_drv, wptr); +amdgpu_userq_fence_driver_process (fence_drv); + + } +} +int amdgpu_userq_signal_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.h +1 -0
@@ -67,6 +67,7 @@ int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev, struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_free (struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_process (struct amdgpu_userq_fence_driver *fence_drv); +void amdgpu_userq_fence_driver_force_completion (struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_destroy (struct kref *ref);int amdgpu_userq_signal_ioctl (struct drm_device *dev,void *data,struct drm_file *filp);
Signature · 1 line
2.49.0
Christian König
maintainerRe: [PATCH 4/7] drm/amdgpu/userq: add force completion helpers
Quoted 17 lines · Alex Deucher
Add support for forcing completion of userq fences. This is needed for userq resets and asic resets so that we can set the error on the fence and force completion.
Cc Christian König <[email protected]>Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 42 +++++++++++++++++++ .../gpu/drm/amd/amdgpu/amdgpu_userq_fence.h | 1 + 2 files changed, 43 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c static u64 amdgpu_userq_fence_read(struct amdgpu_userq_fence_driver *fence_drv) · line 75
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +6
-0@@ -67,6 +67,14 @@ static u64 amdgpu_userq_fence_read(struct amdgpu_userq_fence_driver *fence_drv)return le64_to_cpu (*fence_drv->cpu_addr); } +static void +amdgpu_userq_fence_write (struct amdgpu_userq_fence_driver *fence_drv, +u64 seq) +{ +if (fence_drv->cpu_addr) + *fence_drv->cpu_addr =cpu_to_le64 (seq);
It would be *much* more cleaner if the FW would do that as part of their reset prodcedure, but that is probably to much to ask.
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +4
-0+} +int amdgpu_userq_fence_driver_alloc (struct amdgpu_device *adev,struct amdgpu_usermode_queue *userq) {@@ -408,6 +416,40 @@ static void amdgpu_userq_fence_cleanup(struct dma_fence *fence)dma_fence_put (fence); } +static void +amdgpu_userq_fence_driver_set_error(struct amdgpu_userq_fence *fence,
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c static void amdgpu_userq_fence_cleanup(struct dma_fence *fence) · line 430
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +10
-0+ int error) +{ +struct amdgpu_userq_fence_driver *fence_drv = fence->fence_drv; +unsigned long flags; +struct dma_fence *f; + +spin_lock_irqsave (&fence_drv->fence_list_lock, flags); + + f =rcu_dereference_protected (&fence->base, +lockdep_is_held (&fence_drv->fence_list_lock));
Hui? That rcu_dereference_protected doesn't really make sense here and will most likely result in complains by automated checkers.
Just using &fence->base should be sufficient.
Regards,
Christian.
Quoted 37 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +22
-0+if (f && !dma_fence_is_signaled_locked (f)) +dma_fence_set_error (f, error); +spin_unlock_irqrestore (&fence_drv->fence_list_lock, flags); +} + +void +amdgpu_userq_fence_driver_force_completion (struct amdgpu_usermode_queue *userq) +{ +struct dma_fence *f = userq->last_fence; + +if (f) { +struct amdgpu_userq_fence *fence =to_amdgpu_userq_fence (f); +struct amdgpu_userq_fence_driver *fence_drv = fence->fence_drv; +u64 wptr = fence->base.seqno; + +amdgpu_userq_fence_driver_set_error (fence, -ECANCELED ); +amdgpu_userq_fence_write (fence_drv, wptr); +amdgpu_userq_fence_driver_process (fence_drv); + + } +} +int amdgpu_userq_signal_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.h +1
-0@@ -67,6 +67,7 @@ int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev, struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_free (struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_process (struct amdgpu_userq_fence_driver *fence_drv); +void amdgpu_userq_fence_driver_force_completion (struct amdgpu_usermode_queue *userq);void amdgpu_userq_fence_driver_destroy (struct kref *ref);int amdgpu_userq_signal_ioctl (struct drm_device *dev,void *data,struct drm_file *filp);
Alex Deucher
maintainerPATCH 5/7 drm/amdgpu/userq: implement resets
In reply to Alex DeucherIf map or unmap fails, or a user fence times out, attempt to reset the queue. If that fails, schedule a GPU reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 128 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 5 + 4 files changed, 131 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1251,6 +1251,7 @@ struct amdgpu_device {struct list_head userq_mgr_list;struct mutex userq_mutex;bool userq_halt_for_enforce_isolation; +struct work_struct userq_reset_work; }; static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +8 -0
@@ -4420,6 +4420,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, }INIT_WORK (&adev->xgmi_reset_work, amdgpu_device_xgmi_reset_func); +INIT_WORK (&adev->userq_reset_work, amdgpu_userq_reset_work); adev->gfx.gfx_off_req_count =1 ; adev->gfx.gfx_off_residency =0 ;
@@ -5777,6 +5778,10 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_reset_context *reset_context)if (r) goto out; + r =amdgpu_userq_post_reset (tmp_adev, vram_lost); +if (r) + goto out; +drm_client_dev_resume (adev_to_drm (tmp_adev), false);/*
@@ -5999,6 +6004,7 @@ static inline void amdgpu_device_stop_pending_resets(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev))cancel_work (&adev->reset_work);#endif +cancel_work (&adev->userq_reset_work);if (adev->kfd.dev)cancel_work (&adev->kfd.reset_work);
@@ -6109,6 +6115,8 @@ static int amdgpu_device_halt_activities(struct amdgpu_device *adev, amdgpu_device_ip_need_full_reset(tmp_adev))amdgpu_ras_suspend (tmp_adev); +amdgpu_userq_pre_reset (tmp_adev); +for (i =0 ; i <AMDGPU_MAX_RINGS ; ++i) {struct amdgpu_ring *ring = tmp_adev->rings[i];
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +117 -11
192 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +5 -0
@@ -132,4 +132,9 @@ int amdgpu_userq_stop_sched_for_enforce_isolation(struct amdgpu_device *adev,int amdgpu_userq_start_sched_for_enforce_isolation (struct amdgpu_device *adev,u32 idx); +void amdgpu_userq_reset_work (struct work_struct *work); + +void amdgpu_userq_pre_reset (struct amdgpu_device *adev); +int amdgpu_userq_post_reset (struct amdgpu_device *adev,bool vram_lost); +#endif
Signature · 1 line
2.49.0
Re: [PATCH 5/7] drm/amdgpu/userq: implement resets
Quoted 5 lines · Alex Deucher
If map or unmap fails, or a user fence times out, attempt to reset the queue. If that fails, schedule a GPU reset.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 276 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 128 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 5 + 4 files changed, 131 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1251,6 +1251,7 @@ struct amdgpu_device {struct list_head userq_mgr_list;struct mutex userq_mutex;bool userq_halt_for_enforce_isolation; +struct work_struct userq_reset_work; }; static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +8
-0@@ -4420,6 +4420,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, }INIT_WORK (&adev->xgmi_reset_work, amdgpu_device_xgmi_reset_func); +INIT_WORK (&adev->userq_reset_work, amdgpu_userq_reset_work); adev->gfx.gfx_off_req_count =1 ; adev->gfx.gfx_off_residency =0 ;@@ -5777,6 +5778,10 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_reset_context *reset_context)if (r) goto out; + r =amdgpu_userq_post_reset (tmp_adev, vram_lost); +if (r) + goto out; +drm_client_dev_resume (adev_to_drm (tmp_adev), false);/* @@ -5999,6 +6004,7 @@ static inline void amdgpu_device_stop_pending_resets(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev))cancel_work (&adev->reset_work);#endif +cancel_work (&adev->userq_reset_work);if (adev->kfd.dev)cancel_work (&adev->kfd.reset_work);@@ -6109,6 +6115,8 @@ static int amdgpu_device_halt_activities(struct amdgpu_device *adev, amdgpu_device_ip_need_full_reset(tmp_adev))amdgpu_ras_suspend (tmp_adev); +amdgpu_userq_pre_reset (tmp_adev); +for (i =0 ; i <AMDGPU_MAX_RINGS ; ++i) {struct amdgpu_ring *ring = tmp_adev->rings[i];drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +117
-11@@ -26,7 +26,10 @@#include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <drm/drm_drv.h> +#include "amdgpu.h" +#include "amdgpu_reset.h" #include "amdgpu_vm.h" #include "amdgpu_userq.h" #include "amdgpu_userq_fence.h" @@ -44,6 +47,44 @@ u32 amdgpu_userq_get_supported_ip_mask(struct amdgpu_device *adev)return userq_ip_mask; } +static void amdgpu_userq_gpu_reset (struct amdgpu_device *adev) +{ + +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_reset_domain_schedule (adev->reset_domain, + &adev->userq_reset_work); +} + +static bool +amdgpu_userq_queue_reset_helper (struct amdgpu_userq_mgr *uq_mgr, +struct amdgpu_usermode_queue *queue) +{ +struct amdgpu_device *adev = uq_mgr->adev; +const struct amdgpu_userq_funcs *userq_funcs = + adev->userq_funcs[queue->queue_type]; +bool gpu_reset = false; +int r; + +if (unlikely (adev->debug_disable_gpu_ring_reset)) { +dev_err (adev->dev,"userq reset disabled by debug mask\n" ); + }else if (amdgpu_gpu_recovery && userq_funcs->reset) { + r = userq_funcs->reset (uq_mgr, queue); +if (r) { +dev_err (adev->dev,"userq reset failed\n" ); + gpu_reset = true; + }else { +dev_err (adev->dev,"userq reset succeeded\n" ); +atomic_inc (&adev->gpu_reset_counter); +amdgpu_userq_fence_driver_force_completion (queue); +drm_dev_wedged_event (adev_to_drm (adev),DRM_WEDGE_RECOVERY_NONE ); + } + }else if (amdgpu_gpu_recovery && !userq_funcs->reset) { + gpu_reset = true; + } + +return gpu_reset; +} +static int amdgpu_userq_unmap_helper (struct amdgpu_userq_mgr *uq_mgr,struct amdgpu_usermode_queue *queue)@@ -51,15 +92,22 @@ amdgpu_userq_unmap_helper(struct amdgpu_userq_mgr *uq_mgr,struct amdgpu_device *adev = uq_mgr->adev;const struct amdgpu_userq_funcs *userq_funcs = adev->userq_funcs[queue->queue_type]; +bool gpu_reset = false;int r =0 ;if (queue->state ==AMDGPU_USERQ_STATE_MAPPED ) { r = userq_funcs->unmap (uq_mgr, queue); -if (r) +if (r) { queue->state =AMDGPU_USERQ_STATE_HUNG ; -else + gpu_reset =amdgpu_userq_queue_reset_helper (uq_mgr, queue); + }else { queue->state =AMDGPU_USERQ_STATE_UNMAPPED ; + } } + +if (gpu_reset) +amdgpu_userq_gpu_reset (adev); +return r; }@@ -70,16 +118,22 @@ amdgpu_userq_map_helper(struct amdgpu_userq_mgr *uq_mgr,struct amdgpu_device *adev = uq_mgr->adev;const struct amdgpu_userq_funcs *userq_funcs = adev->userq_funcs[queue->queue_type]; +bool gpu_reset = false;int r =0 ;if (queue->state ==AMDGPU_USERQ_STATE_UNMAPPED ) { r = userq_funcs->map (uq_mgr, queue);if (r) { queue->state =AMDGPU_USERQ_STATE_HUNG ; + gpu_reset =amdgpu_userq_queue_reset_helper (uq_mgr, queue); }else { queue->state =AMDGPU_USERQ_STATE_MAPPED ; } } + +if (gpu_reset) +amdgpu_userq_gpu_reset (adev); +return r; }@@ -698,6 +752,23 @@ amdgpu_userq_evict_all(struct amdgpu_userq_mgr *uq_mgr)return ret; } +void amdgpu_userq_reset_work (struct work_struct *work) +{ + struct amdgpu_device *adev = container_of(work, struct amdgpu_device, + userq_reset_work); +struct amdgpu_reset_context reset_context; + +memset (&reset_context,0 ,sizeof (reset_context)); + + reset_context.method =AMD_RESET_METHOD_NONE ; + reset_context.reset_req_dev = adev; + reset_context.src =AMDGPU_RESET_SRC_USERQ ; +set_bit (AMDGPU_NEED_FULL_RESET , &reset_context.flags); +/*set_bit(AMDGPU_SKIP_COREDUMP, &reset_context.flags);*/ + +amdgpu_device_gpu_recover (adev,NULL , &reset_context); +} +static int amdgpu_userq_wait_for_signal (struct amdgpu_userq_mgr *uq_mgr) {@@ -724,22 +795,19 @@ void amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr, struct amdgpu_eviction_fence *ev_fence) { - int ret; struct amdgpu_fpriv *fpriv = uq_mgr_to_fpriv(uq_mgr);struct amdgpu_eviction_fence_mgr *evf_mgr = &fpriv->evf_mgr; +struct amdgpu_device *adev = uq_mgr->adev; +int ret;/* Wait for any pending userqueue fence work to finish */ ret =amdgpu_userq_wait_for_signal (uq_mgr); -if (ret) { -DRM_ERROR ("Not evicting userqueue, timeout waiting for work\n" ); -return ; - } +if (ret) +dev_err (adev->dev,"Not evicting userqueue, timeout waiting for work\n" ); ret =amdgpu_userq_evict_all (uq_mgr); -if (ret) { -DRM_ERROR ("Failed to evict userqueue\n" ); -return ; - } +if (ret) +dev_err (adev->dev,"Failed to evict userqueue\n" );/* Signal current eviction fence */ amdgpu_eviction_fence_signal (evf_mgr, ev_fence);@@ -914,3 +982,41 @@ int amdgpu_userq_start_sched_for_enforce_isolation(struct amdgpu_device *adev,mutex_unlock (&adev->userq_mutex);return ret; } + +void amdgpu_userq_pre_reset (struct amdgpu_device *adev) +{ +const struct amdgpu_userq_funcs *userq_funcs; +struct amdgpu_usermode_queue *queue; +struct amdgpu_userq_mgr *uqm, *tmp; +int queue_id; + +mutex_lock (&adev->userq_mutex); +list_for_each_entry_safe (uqm, tmp, &adev->userq_mgr_list, list) { +cancel_delayed_work_sync (&uqm->resume_work); +mutex_lock (&uqm->userq_mutex); +idr_for_each_entry (&uqm->userq_idr, queue, queue_id) { +if (queue->state ==AMDGPU_USERQ_STATE_MAPPED ) { +amdgpu_userq_wait_for_last_fence (uqm, queue); + userq_funcs = adev->userq_funcs[queue->queue_type]; + userq_funcs->unmap (uqm, queue); +/* just mark all queues as hung at this point. +* if unmap succeeds, we could map again +* in amdgpu_userq_post_reset() if vram is not lost +*/ + queue->state =AMDGPU_USERQ_STATE_HUNG ; +amdgpu_userq_fence_driver_force_completion (queue); + } + } +mutex_unlock (&uqm->userq_mutex); + } +mutex_unlock (&adev->userq_mutex); +} + +int amdgpu_userq_post_reset (struct amdgpu_device *adev,bool vram_lost) +{ +/* if any queue state is AMDGPU_USERQ_STATE_UNMAPPED +* at this point, we should be able to map it again +* and continue if vram is not lost. +*/ +return 0 ; +}drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +5
-0@@ -132,4 +132,9 @@ int amdgpu_userq_stop_sched_for_enforce_isolation(struct amdgpu_device *adev,int amdgpu_userq_start_sched_for_enforce_isolation (struct amdgpu_device *adev,u32 idx); +void amdgpu_userq_reset_work (struct work_struct *work); + +void amdgpu_userq_pre_reset (struct amdgpu_device *adev); +int amdgpu_userq_post_reset (struct amdgpu_device *adev,bool vram_lost); +#endif
Alex Deucher
maintainerPATCH 6/7 drm/amdgpu: add UAPI for user queue query status
In reply to Alex DeucherAdd an API to query queue status such as whether the queue is hung or whether vram is lost.
--- include/uapi/drm/amdgpu_drm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/uapi/drm/amdgpu_drm.h +14 -0
@@ -328,6 +328,7 @@ union drm_amdgpu_ctx {/* user queue IOCTL operations */ #define AMDGPU_USERQ_OP_CREATE 1#define AMDGPU_USERQ_OP_FREE 2 +#define AMDGPU_USERQ_OP_QUERY_STATUS 3/* queue priority levels */ /* low < normal low < normal high < high */
@@ -340,6 +341,12 @@ union drm_amdgpu_ctx {/* for queues that need access to protected content */ #define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE (1 << 2) + +/* the queue is hung */ +#define AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG (1 << 0) +/* indicate vram lost since queue was created */ +#define AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST (1 << 1) +/* * This structure is a container to pass input configuration * info for all supported userqueue related operations.
@@ -421,9 +428,16 @@ struct drm_amdgpu_userq_out {__u32 _pad; }; +/* The structure to carry output of userqueue ops */ +struct drm_amdgpu_userq_out_query_state { +__u32 flags; +__u32 _pad; +}; +union drm_amdgpu_userq {struct drm_amdgpu_userq_in in;struct drm_amdgpu_userq_out out; +struct drm_amdgpu_userq_out_query_state out_qs; };/* GFX V11 IP specific MQD parameters */
Signature · 1 line
2.49.0
Re: [PATCH 6/7] drm/amdgpu: add UAPI for user queue query status
Quoted 5 lines · Alex Deucher
Add an API to query queue status such as whether the queue is hung or whether vram is lost.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 46 lines
--- include/uapi/drm/amdgpu_drm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)include/uapi/drm/amdgpu_drm.h +14
-0@@ -328,6 +328,7 @@ union drm_amdgpu_ctx {/* user queue IOCTL operations */ #define AMDGPU_USERQ_OP_CREATE 1#define AMDGPU_USERQ_OP_FREE 2 +#define AMDGPU_USERQ_OP_QUERY_STATUS 3/* queue priority levels */ /* low < normal low < normal high < high */ @@ -340,6 +341,12 @@ union drm_amdgpu_ctx {/* for queues that need access to protected content */ #define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE (1 << 2) + +/* the queue is hung */ +#define AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG (1 << 0) +/* indicate vram lost since queue was created */ +#define AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST (1 << 1) +/* * This structure is a container to pass input configuration * info for all supported userqueue related operations. @@ -421,9 +428,16 @@ struct drm_amdgpu_userq_out {__u32 _pad; }; +/* The structure to carry output of userqueue ops */ +struct drm_amdgpu_userq_out_query_state { +__u32 flags; +__u32 _pad; +}; +union drm_amdgpu_userq {struct drm_amdgpu_userq_in in;struct drm_amdgpu_userq_out out; +struct drm_amdgpu_userq_out_query_state out_qs; };/* GFX V11 IP specific MQD parameters */
Alex Deucher
maintainerPATCH 7/7 drm/amdgpu/userq: implement support for query status
In reply to Alex DeucherQuery the status of the user queue, currently whether the queue is hung and whether or not VRAM is lost.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 47 ++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + 2 files changed, 47 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +46 -1
@@ -460,6 +460,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) queue->queue_type = args->in.ip_type; queue->vm = &fpriv->vm; queue->priority = priority; + queue->generation =amdgpu_vm_generation (adev, &fpriv->vm); db_info.queue_type = queue->queue_type; db_info.doorbell_handle = queue->doorbell_handle;
@@ -532,6 +533,34 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)return r; } +static int +amdgpu_userq_query_status (struct drm_file *filp,union drm_amdgpu_userq *args) +{ +struct amdgpu_fpriv *fpriv = filp->driver_priv; +struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr; +struct amdgpu_device *adev = uq_mgr->adev; +struct amdgpu_usermode_queue *queue; +int queue_id = args->in.queue_id; + +mutex_lock (&uq_mgr->userq_mutex); + + queue =amdgpu_userq_find (uq_mgr, queue_id); +if (!queue) { +dev_err (adev->dev,"Invalid queue id to query\n" ); +mutex_unlock (&uq_mgr->userq_mutex); +return -EINVAL ; + } + args->out_qs.flags =0 ; +if (queue->state ==AMDGPU_USERQ_STATE_HUNG ) + args->out_qs.flags |=AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG ; +if (queue->generation !=amdgpu_vm_generation (adev, &fpriv->vm)) + args->out_qs.flags |=AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST ; + +mutex_unlock (&uq_mgr->userq_mutex); + +return 0 ; +} +int amdgpu_userq_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {
@@ -565,7 +594,23 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data,if (r)DRM_ERROR ("Failed to destroy usermode queue\n" );break ; - +case AMDGPU_USERQ_OP_QUERY_STATUS : +if (args->in.ip_type || + args->in.doorbell_handle || + args->in.doorbell_offset || + args->in.flags || + args->in.queue_va || + args->in.queue_size || + args->in.rptr_va || + args->in.wptr_va || + args->in.wptr_va || + args->in.mqd || + args->in.mqd_size) +return -EINVAL ; + r =amdgpu_userq_query_status (filp, args); +if (r) +DRM_ERROR ("Failed to query usermode queue status\n" ); +break ;default :DRM_DEBUG_DRIVER ("Invalid user queue op specified: %d\n" , args->in.op);return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +1 -0
@@ -65,6 +65,7 @@ struct amdgpu_usermode_queue {struct dma_fence *last_fence;u32 xcp_id;int priority; +uint64_t generation; };struct amdgpu_userq_funcs {
Signature · 1 line
2.49.0
Christian König
maintainerRe: [PATCH 7/7] drm/amdgpu/userq: implement support for query status
Quoted 30 lines · Alex Deucher
Query the status of the user queue, currently whether the queue is hung and whether or not VRAM is lost.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 47 ++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + 2 files changed, 47 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +5
-0@@ -460,6 +460,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) queue->queue_type = args->in.ip_type; queue->vm = &fpriv->vm; queue->priority = priority; + queue->generation =amdgpu_vm_generation (adev, &fpriv->vm); db_info.queue_type = queue->queue_type; db_info.doorbell_handle = queue->doorbell_handle;@@ -532,6 +533,34 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)return r; } +static int +amdgpu_userq_query_status (struct drm_file *filp,union drm_amdgpu_userq *args) +{ +struct amdgpu_fpriv *fpriv = filp->driver_priv;
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) · line 549
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +10
-0+struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr; +struct amdgpu_device *adev = uq_mgr->adev; +struct amdgpu_usermode_queue *queue; +int queue_id = args->in.queue_id; + +mutex_lock (&uq_mgr->userq_mutex); + + queue =amdgpu_userq_find (uq_mgr, queue_id); +if (!queue) { +dev_err (adev->dev,"Invalid queue id to query\n" );
Using dev_err is probably not justified, this is more debug level.
Quoted 26 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +17
-1+mutex_unlock (&uq_mgr->userq_mutex); +return -EINVAL ; + } + args->out_qs.flags =0 ; +if (queue->state ==AMDGPU_USERQ_STATE_HUNG ) + args->out_qs.flags |=AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG ; +if (queue->generation !=amdgpu_vm_generation (adev, &fpriv->vm)) + args->out_qs.flags |=AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST ; + +mutex_unlock (&uq_mgr->userq_mutex); + +return 0 ; +} +int amdgpu_userq_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {@@ -565,7 +594,23 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data,if (r)DRM_ERROR ("Failed to destroy usermode queue\n" );break ; - +case AMDGPU_USERQ_OP_QUERY_STATUS : + if (args->in.ip_type || + args->in.doorbell_handle ||
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c int amdgpu_userq_ioctl(struct drm_device *dev, void *data, · line 610
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +10
-0+ args->in.doorbell_offset || + args->in.flags || + args->in.queue_va || + args->in.queue_size || + args->in.rptr_va || + args->in.wptr_va || + args->in.wptr_va || + args->in.mqd || + args->in.mqd_size) + return -EINVAL;
We can't expect those fields to be initialized for this operation. So checking them is probably not a good idea.
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c int amdgpu_userq_ioctl(struct drm_device *dev, void *data, · line 612
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +3
-0+ r =amdgpu_userq_query_status (filp, args); +if (r) +DRM_ERROR ("Failed to query usermode queue status\n" );
That message is overkill we already have the message inside amdgpu_userq_query_status().
Regards,
Christian.
Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +1
-0+break ;default :drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +0
-0DRM_DEBUG_DRIVER ("Invalid user queue op specified: %d\n" , args->in.op);return -EINVAL ;drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +1
-0@@ -65,6 +65,7 @@ struct amdgpu_usermode_queue {struct dma_fence *last_fence;u32 xcp_id;int priority; +uint64_t generation; };struct amdgpu_userq_funcs {
Quoted 4 lines · Alex Deucher
Track resets from user queues.
Reviewed-by Sunil Khatri <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 31 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 + 2 files changed, 4 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +3
-0@@ -340,6 +340,9 @@ void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,case AMDGPU_RESET_SRC_USER :strscpy (buf,"user trigger" , len);break ; +case AMDGPU_RESET_SRC_USERQ : +strscpy (buf,"user queue trigger" , len); +break ;default :strscpy (buf,"unknown" , len); }drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h +1
-0@@ -43,6 +43,7 @@ enum AMDGPU_RESET_SRCS {AMDGPU_RESET_SRC_MES ,AMDGPU_RESET_SRC_HWS ,AMDGPU_RESET_SRC_USER , + AMDGPU_RESET_SRC_USERQ, }; struct amdgpu_reset_context {