drm/amdgpu/gfx10: fix race condition for kiq
Subsystems (2)
PATCH 1/2 drm/amdgpu/gfx10: fix race condition for kiq
During preemption test for gfx10, it uses kiq to trigger gfx preemption, which would result in race condition with flushing TLB for kiq.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +8 -1
@@ -7836,12 +7836,17 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *kiq_ring = &kiq->ring; +unsigned long flags;if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)return -EINVAL ; -if (amdgpu_ring_alloc (kiq_ring, kiq->pmf->unmap_queues_size)) +spin_lock_irqsave (&kiq->ring_lock, flags); + +if (amdgpu_ring_alloc (kiq_ring, kiq->pmf->unmap_queues_size)) { +spin_unlock_irqrestore (&kiq->ring_lock, flags);return -ENOMEM ; + }/* assert preemption condition */ amdgpu_ring_set_preempt_cond_exec (ring, false);
@@ -7852,6 +7857,8 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) ++ring->trail_seq);amdgpu_ring_commit (kiq_ring); +spin_unlock_irqrestore (&kiq->ring_lock, flags); +/* poll the trailing fence */ for (i =0 ; i < adev->usec_timeout; i++) { if (ring->trail_seq ==
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: fix preemption unit test
Remove signaled jobs from job list and ensure the
job was indeed preempted.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +15 -5
@@ -1343,27 +1343,37 @@ static void amdgpu_ib_preempt_job_recovery(struct drm_gpu_scheduler *sched)static void amdgpu_ib_preempt_mark_partial_job (struct amdgpu_ring *ring) {struct amdgpu_job *job; -struct drm_sched_job *s_job; +struct drm_sched_job *s_job, *tmp;uint32_t preempt_seq;struct dma_fence *fence, **ptr;struct amdgpu_fence_driver *drv = &ring->fence_drv;struct drm_gpu_scheduler *sched = &ring->sched; +bool preempted = true;if (ring->funcs->type !=AMDGPU_RING_TYPE_GFX )return ; preempt_seq =le32_to_cpu (*(drv->cpu_addr +2 )); -if (preempt_seq <=atomic_read (&drv->last_seq)) -return ; +if (preempt_seq <=atomic_read (&drv->last_seq)) { + preempted = false; + goto no_preempt; + } preempt_seq &= drv->num_fences_mask; ptr = &drv->fences[preempt_seq]; fence =rcu_dereference_protected (*ptr,1 ); +no_preempt:spin_lock (&sched->job_list_lock); -list_for_each_entry (s_job, &sched->ring_mirror_list, node) { +list_for_each_entry_safe (s_job, tmp, &sched->ring_mirror_list, node) { +if (dma_fence_is_signaled (&s_job->s_fence->finished)) { +/* remove job from ring_mirror_list */ +list_del_init (&s_job->node); + sched->ops->free_job (s_job); +continue ; + } job =to_amdgpu_job (s_job); -if (job->fence == fence) +if (preempted && job->fence == fence)/* mark the job as preempted */ job->preemption_status |=AMDGPU_IB_PREEMPTED ; }
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: fix preemption unit test
[AMD Public Use]
Series is
Regards,
Hawking
-----Original Message-----
From: Xiao, Jack <[email protected]>
Sent: Friday, July 10, 2020 13:45
To: [email protected]; Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>
Cc: Xiao, Jack <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: fix preemption unit test
Remove signaled jobs from job list and ensure the job was indeed preempted.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +15 -6
@@ -1343,27 +1343,37 @@ static void amdgpu_ib_preempt_job_recovery(struct drm_gpu_scheduler *sched) static void amdgpu_ib_preempt_mark_partial_job(struct amdgpu_ring *ring) {struct amdgpu_job *job; -struct drm_sched_job *s_job; +struct drm_sched_job *s_job, *tmp;uint32_t preempt_seq;struct dma_fence *fence, **ptr;struct amdgpu_fence_driver *drv = &ring->fence_drv;struct drm_gpu_scheduler *sched = &ring->sched; +bool preempted = true;if (ring->funcs->type !=AMDGPU_RING_TYPE_GFX )return ; preempt_seq =le32_to_cpu (*(drv->cpu_addr +2 )); -if (preempt_seq <=atomic_read (&drv->last_seq)) -return ; +if (preempt_seq <=atomic_read (&drv->last_seq)) { + preempted = false; + goto no_preempt; + } preempt_seq &= drv->num_fences_mask; ptr = &drv->fences[preempt_seq]; fence =rcu_dereference_protected (*ptr,1 ); +no_preempt:spin_lock (&sched->job_list_lock); -list_for_each_entry (s_job, &sched->ring_mirror_list, node) { +list_for_each_entry_safe (s_job, tmp, &sched->ring_mirror_list, node) { +if (dma_fence_is_signaled (&s_job->s_fence->finished)) { +/* remove job from ring_mirror_list */ +list_del_init (&s_job->node); + sched->ops->free_job (s_job); +continue ; + } job =to_amdgpu_job (s_job); -if (job->fence == fence) +if (preempted && job->fence == fence)/* mark the job as preempted */ job->preemption_status |=AMDGPU_IB_PREEMPTED ; } --
2.26.2
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 10.07.20 um 07:44 schrieb Jack Xiao:
Quoted 5 lines
During preemption test for gfx10, it uses kiq to trigger gfx preemption, which would result in race condition with flushing TLB for kiq.
Signed-off-by Jack Xiao <[email protected]>
Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +6
-1@@ -7836,12 +7836,17 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;struct amdgpu_kiq *kiq = &adev->gfx.kiq;struct amdgpu_ring *kiq_ring = &kiq->ring; +unsigned long flags;if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)return -EINVAL ; -if (amdgpu_ring_alloc (kiq_ring, kiq->pmf->unmap_queues_size)) +spin_lock_irqsave (&kiq->ring_lock, flags); + +if (amdgpu_ring_alloc (kiq_ring, kiq->pmf->unmap_queues_size)) { +spin_unlock_irqrestore (&kiq->ring_lock, flags);return -ENOMEM ; + }/* assert preemption condition */ amdgpu_ring_set_preempt_cond_exec (ring, false);
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) · line 7864
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0@@ -7852,6 +7857,8 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring) ++ring->trail_seq);amdgpu_ring_commit (kiq_ring); +spin_unlock_irqrestore (&kiq->ring_lock, flags); +/* poll the trailing fence */ for (i =0 ; i < adev->usec_timeout; i++) { if (ring->trail_seq ==
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx