Fix the bug that a fence is not attached to a BO reservation when the BO is
read. An exported input buffer can appear writable while an accepted Rocket
job is still reading it, allowing a later writer to overwrite data in use.

Fixes: 0810d5ad88a1 ("accel/rocket: Add job submission IOCTL")
Signed-off-by: Haoming Gao <[email protected]>
---

Notes (rocket-submit):
    Based on drm-misc-fixes at bafda823590ddf7031ecb765d673572fae7ab44a.
    

 drivers/accel/rocket/rocket_job.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/accel/rocket/rocket_job.c 
b/drivers/accel/rocket/rocket_job.c
index c3edb94355a3..7aa7bbfce036 100644
--- a/drivers/accel/rocket/rocket_job.c
+++ b/drivers/accel/rocket/rocket_job.c
@@ -201,12 +201,13 @@ static int rocket_acquire_object_fences(struct 
drm_gem_object **bos,
 
 static void rocket_attach_object_fences(struct drm_gem_object **bos,
                                        int bo_count,
-                                       struct dma_fence *fence)
+                                       struct dma_fence *fence,
+                                       enum dma_resv_usage usage)
 {
        int i;
 
        for (i = 0; i < bo_count; i++)
-               dma_resv_add_fence(bos[i]->resv, fence, DMA_RESV_USAGE_WRITE);
+               dma_resv_add_fence(bos[i]->resv, fence, usage);
 }
 
 static int rocket_job_push(struct rocket_job *job)
@@ -248,7 +249,10 @@ static int rocket_job_push(struct rocket_job *job)
                drm_sched_entity_push_job(&job->base);
        }
 
-       rocket_attach_object_fences(job->out_bos, job->out_bo_count, 
job->inference_done_fence);
+       rocket_attach_object_fences(job->in_bos, job->in_bo_count,
+                                   job->inference_done_fence, 
DMA_RESV_USAGE_READ);
+       rocket_attach_object_fences(job->out_bos, job->out_bo_count,
+                                   job->inference_done_fence, 
DMA_RESV_USAGE_WRITE);
 
 err_unlock:
        drm_gem_unlock_reservations(bos, bo_count, &acquire_ctx);

base-commit: bafda823590ddf7031ecb765d673572fae7ab44a
-- 
2.43.0

Reply via email to