drm/amd/amdgpu embed hw_fence into amdgpu_job
Subsystems (3)
PATCH v3 1/2 drm/amd/amdgpu embed hw_fence into amdgpu_job
From: Jack Zhang <[email protected]>
Why: Previously hw fence is alloced separately with job. It caused historical lifetime issues and corner cases. The ideal situation is to take fence to manage both job and fence's lifetime, and simplify the design of gpu-scheduler.
How:
We propose to embed hw_fence into amdgpu_job.
1. We cover the normal job submission by this method.
2. For ib_test, and submit without a parent job keep the legacy way to create a hw fence separately.
v2:
use AMDGPU_FENCE_FLAG_EMBED_IN_JOB_BIT to show that the fence is embeded in a job.
v3:
remove redundant variable ring in amdgpu_job
Signed-off-by Jingwen Chen <[email protected]>
Signed-off-by Jack Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 62 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 35 ++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 8 files changed, 82 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +0 -1
@@ -714,7 +714,6 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine, ret =dma_fence_wait (f, false); err_ib_sched: -dma_fence_put (f);amdgpu_job_free (job); err:return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -1414,7 +1414,7 @@ static void amdgpu_ib_preempt_mark_partial_job(struct amdgpu_ring *ring)continue ; } job =to_amdgpu_job (s_job); -if (preempted && job->fence == fence) +if (preempted && (&job->hw_fence) == fence)/* mark the job as preempted */ job->preemption_status |=AMDGPU_IB_PREEMPTED ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +49 -13
110 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +1 -1
@@ -262,7 +262,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, fence_flags | AMDGPU_FENCE_FLAG_64BIT); } - r =amdgpu_fence_emit (ring, f, fence_flags); + r =amdgpu_fence_emit (ring, f, job, fence_flags);if (r) {dev_err (adev->dev,"failed to emit fence (%d)\n" , r);if (job && job->vmid)
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +24 -11
@@ -127,11 +127,16 @@ void amdgpu_job_free_resources(struct amdgpu_job *job) {struct amdgpu_ring *ring =to_amdgpu_ring (job->base.sched);struct dma_fence *f; +struct dma_fence *hw_fence;unsigned i; -/* use sched fence if available */ - f = job->base.s_fence ? &job->base.s_fence->finished : job->fence; +if (job->hw_fence.ops ==NULL ) + hw_fence = job->external_hw_fence; +else + hw_fence = &job->hw_fence; +/* use sched fence if available */ + f = job->base.s_fence ? &job->base.s_fence->finished : hw_fence;for (i =0 ; i < job->num_ibs; ++i)amdgpu_ib_free (ring->adev, &job->ibs[i], f); }
@@ -142,20 +147,27 @@ static void amdgpu_job_free_cb(struct drm_sched_job *s_job)drm_sched_job_cleanup (s_job); -dma_fence_put (job->fence);amdgpu_sync_free (&job->sync);amdgpu_sync_free (&job->sched_sync); -kfree (job); + +/* only put the hw fence if has embedded fence */ +if (job->hw_fence.ops !=NULL ) +dma_fence_put (&job->hw_fence); +else +kfree (job); }void amdgpu_job_free (struct amdgpu_job *job) {amdgpu_job_free_resources (job); - -dma_fence_put (job->fence);amdgpu_sync_free (&job->sync);amdgpu_sync_free (&job->sched_sync); -kfree (job); + +/* only put the hw fence if has embedded fence */ +if (job->hw_fence.ops !=NULL ) +dma_fence_put (&job->hw_fence); +else +kfree (job); } int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,
@@ -184,11 +196,14 @@ int amdgpu_job_submit_direct(struct amdgpu_job *job, struct amdgpu_ring *ring, job->base.sched = &ring->sched; r =amdgpu_ib_schedule (ring, job->num_ibs, job->ibs,NULL , fence); - job->fence =dma_fence_get (*fence); +/* record external_hw_fence for direct submit */ + job->external_hw_fence =dma_fence_get (*fence);if (r)return r;amdgpu_job_free (job); +dma_fence_put (*fence); +return 0 ; }
@@ -246,10 +261,8 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job)if (r)DRM_ERROR ("Error scheduling IBs (%d)\n" , r); } -/* if gpu reset, hw fence will be replaced here */ -dma_fence_put (job->fence); - job->fence =dma_fence_get (fence); +dma_fence_get (fence);amdgpu_job_free_resources (job); fence = r ?ERR_PTR (r) : fence;
drivers/gpu/drm/amd/amdgpu/amdgpu_job.h +2 -1
@@ -46,7 +46,8 @@ struct amdgpu_job {struct amdgpu_sync sync;struct amdgpu_sync sched_sync;struct amdgpu_ib *ibs; -struct dma_fence *fence;/* the hw fence */ +struct dma_fence hw_fence; +struct dma_fence *external_hw_fence;uint32_t preamble_status;uint32_t preemption_status;uint32_t num_ibs;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4 -1
@@ -48,6 +48,9 @@#define AMDGPU_FENCE_FLAG_INT (1 << 1)#define AMDGPU_FENCE_FLAG_TC_WB_ONLY (1 << 2) +/* fence flag bit to indicate the face is embeded in job*/ +#define AMDGPU_FENCE_FLAG_EMBED_IN_JOB_BIT (DMA_FENCE_FLAG_USER_BITS + 1) +#define to_amdgpu_ring (s) container_of((s), struct amdgpu_ring, sched)#define AMDGPU_IB_POOL_SIZE (1024 * 1024)
@@ -118,7 +121,7 @@ void amdgpu_fence_driver_hw_init(struct amdgpu_device *adev);void amdgpu_fence_driver_hw_fini (struct amdgpu_device *adev);int amdgpu_fence_driver_sw_init (struct amdgpu_device *adev);void amdgpu_fence_driver_sw_fini (struct amdgpu_device *adev); -int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **fence, +int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **fence,struct amdgpu_job *job,unsigned flags);int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s,uint32_t timeout);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -1218,7 +1218,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,amdgpu_gmc_emit_pasid_mapping (ring, job->vmid, job->pasid);if (vm_flush_needed || pasid_mapping_needed) { - r =amdgpu_fence_emit (ring, &fence,0 ); + r =amdgpu_fence_emit (ring, &fence,NULL ,0 );if (r)return r; }
Signature · 1 line
2.25.1