drm/amdgpu: add missing error handling for amdgpu_ring_alloc()
Subsystems (2)
PATCH 1/1 drm/amdgpu: add missing error handling for amdgpu_ring_alloc()
Fix the unchecked return value warning reported by Coverity, so add error handling.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +++++- 8 files changed, 35 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +5 -2
@@ -1005,7 +1005,8 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)
@@ -1071,7 +1072,8 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)
@@ -1107,6 +1109,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 failed_undo:amdgpu_ring_undo (ring); +failed_unlock:spin_unlock_irqrestore (&kiq->ring_lock, flags); failed_kiq_write:dev_err (adev->dev,"failed to write reg:%x\n" , reg);
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +3 -1
@@ -768,7 +768,8 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_reg_write_reg_wait (ring, reg0, reg1, ref, mask); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );
@@ -798,6 +799,7 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, failed_undo:amdgpu_ring_undo (ring); +failed_unlock:spin_unlock_irqrestore (&kiq->ring_lock, flags); failed_kiq:dev_err (adev->dev,"failed to write reg %x wait reg %x\n" , reg0, reg1);
drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +4 -2
@@ -63,12 +63,14 @@ static void amdgpu_ring_mux_copy_pkt_from_sw_ring(struct amdgpu_ring_mux *mux,return ; }if (start > end) { -amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start); +if (amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], (ring->ring_size >>2 ) - start);amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[0 ], end); }else { -amdgpu_ring_alloc (real_ring, end - start); +if (amdgpu_ring_alloc (real_ring, end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], end - start); } }
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +2 -1
@@ -610,7 +610,8 @@ static int vpe_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); +if (amdgpu_ring_alloc (ring,10 )) +return -ENOMEM ;vpe_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6 -2
@@ -4093,7 +4093,8 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_write (ring,PACKET3 (PACKET3_COPY_DATA ,4 )); amdgpu_ring_write(ring, 9 | /* src: register*/ (5 << 8) | /* dst: memory */
@@ -5639,7 +5640,10 @@ static int gfx_v9_0_ring_preempt_ib(struct amdgpu_ring *ring)amdgpu_ring_set_preempt_cond_exec (ring, false); ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,13 ); +if (amdgpu_ring_alloc (ring,13 )) { +spin_unlock_irqrestore (&kiq->ring_lock, flags); +return -ENOMEM ; + }gfx_v9_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,AMDGPU_FENCE_FLAG_EXEC |AMDGPU_FENCE_FLAG_INT );
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5 -1
@@ -1490,7 +1490,11 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +5 -1
@@ -1345,7 +1345,11 @@ static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_2_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +5 -1
@@ -1371,7 +1371,11 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v6_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);
Signature · 1 line
2.34.1
Christian König
maintainerAm 21.06.24 um 11:24 schrieb Bob Zhou:
Quoted 2 lines
Fix the unchecked return value warning reported by Coverity, so add error handling.
That seems to be completely superfluous. The only case when amdgpu_ring_alloc() returns an error is when we try to allocate more than the maximum submission size.
And in that case we will get quite a warning already.
I strongly suggest to instead drop the return value from amdgpu_ring_alloc().
Regards,
Christian.
Quoted 179 lines
Signed-off-by Bob Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +++++- 8 files changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +5
-2@@ -1005,7 +1005,8 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1071,7 +1072,8 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1107,6 +1109,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 failed_undo:amdgpu_ring_undo (ring); +failed_unlock:spin_unlock_irqrestore (&kiq->ring_lock, flags); failed_kiq_write:dev_err (adev->dev,"failed to write reg:%x\n" , reg);drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +3
-1@@ -768,7 +768,8 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_reg_write_reg_wait (ring, reg0, reg1, ref, mask); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );@@ -798,6 +799,7 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, failed_undo:amdgpu_ring_undo (ring); +failed_unlock:spin_unlock_irqrestore (&kiq->ring_lock, flags); failed_kiq:dev_err (adev->dev,"failed to write reg %x wait reg %x\n" , reg0, reg1);drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +4
-2@@ -63,12 +63,14 @@ static void amdgpu_ring_mux_copy_pkt_from_sw_ring(struct amdgpu_ring_mux *mux,return ; }if (start > end) { -amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start); +if (amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], (ring->ring_size >>2 ) - start);amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[0 ], end); }else { -amdgpu_ring_alloc (real_ring, end - start); +if (amdgpu_ring_alloc (real_ring, end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], end - start); } }drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +2
-1@@ -610,7 +610,8 @@ static int vpe_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); +if (amdgpu_ring_alloc (ring,10 )) +return -ENOMEM ;vpe_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-2@@ -4093,7 +4093,8 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_write (ring,PACKET3 (PACKET3_COPY_DATA ,4 )); amdgpu_ring_write(ring, 9 | /* src: register*/ (5 << 8) | /* dst: memory */@@ -5639,7 +5640,10 @@ static int gfx_v9_0_ring_preempt_ib(struct amdgpu_ring *ring)amdgpu_ring_set_preempt_cond_exec (ring, false); ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,13 ); +if (amdgpu_ring_alloc (ring,13 )) { +spin_unlock_irqrestore (&kiq->ring_lock, flags); +return -ENOMEM ; + }gfx_v9_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,AMDGPU_FENCE_FLAG_EXEC |AMDGPU_FENCE_FLAG_INT );drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5
-1@@ -1490,7 +1490,11 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +5
-1@@ -1345,7 +1345,11 @@ static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_2_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +5
-1@@ -1371,7 +1371,11 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v6_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Christian
Thanks for your suggestion, I agree with you.
I will submit the next version to drop the return value from amdgpu_ring_alloc().
Regards,
Bob
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: 2024年6月21日 17:28
To: Zhou, Bob <[email protected]>; [email protected]; Huang, Tim <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: add missing error handling for amdgpu_ring_alloc()
Am 21.06.24 um 11:24 schrieb Bob Zhou:
Quoted 2 lines
Fix the unchecked return value warning reported by Coverity, so add error handling.
That seems to be completely superfluous. The only case whenamdgpu_ring_alloc() returns an error is when we try to allocate more than the maximum submission size.
And in that case we will get quite a warning already.
I strongly suggest to instead drop the return value from amdgpu_ring_alloc().
Regards,
Christian.
Quoted 194 lines
Signed-off-by Bob Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +++++- 8 files changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-2@@ -1005,7 +1005,8 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1071,7 +1072,8 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1107,6 +1109,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev,
uint32_treg,uint32_tv, uint3
failed_undo:amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq_write: dev_err(adev->dev, "failed to write reg:%x\n", reg); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index3a7622611916..778941f47c96100644drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +2
-2@@ -768,7 +768,8 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_reg_write_reg_wait (ring, reg0, reg1, ref, mask); r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT); @@ -798,6 +799,7 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct
amdgpu_device*adev,
failed_undo:amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq: dev_err(adev->dev, "failed to write reg %x wait reg %x\n", reg0,reg1); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
indexd234b7ccfaaf..01864990a192100644drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +4
-2@@ -63,12 +63,14 @@ static void amdgpu_ring_mux_copy_pkt_from_sw_ring(struct amdgpu_ring_mux *mux,return ; }if (start > end) { -amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start); +if (amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], (ring->ring_size >>2 ) - start);amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[0 ], end); }else { -amdgpu_ring_alloc (real_ring, end - start); +if (amdgpu_ring_alloc (real_ring, end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], end - start); } }drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +2
-1@@ -610,7 +610,8 @@ static int vpe_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); +if (amdgpu_ring_alloc (ring,10 )) +return -ENOMEM ;vpe_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-2@@ -4093,7 +4093,8 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_write (ring,PACKET3 (PACKET3_COPY_DATA ,4 )); amdgpu_ring_write(ring, 9 | /* src: register*/ (5 << 8) | /* dst: memory */@@ -5639,7 +5640,10 @@ static int gfx_v9_0_ring_preempt_ib(struct amdgpu_ring *ring)amdgpu_ring_set_preempt_cond_exec (ring, false); ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,13 ); +if (amdgpu_ring_alloc (ring,13 )) { +spin_unlock_irqrestore (&kiq->ring_lock, flags); +return -ENOMEM ; + }gfx_v9_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,AMDGPU_FENCE_FLAG_EXEC |AMDGPU_FENCE_FLAG_INT );drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5
-1@@ -1490,7 +1490,11 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +5
-1@@ -1345,7 +1345,11 @@ static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_2_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +5
-1@@ -1371,7 +1371,11 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v6_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Christian,
In making the v2 version patch process, I check lots of cases for amdgpu_ring_alloc(). I think checking the return value maybe better.
For allocating submission size from amdgpu_ring_alloc(), the action is allowed to fail so that rerun allocating submission rather than drop the return value. For many cases in gpu driver, it still needs check the call result to conduct the error handling. If drop the return value, in those case it causes some unexpected result. If the error occurs, the command submission should be skip and wait the next action.
Regards,
Bob
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: 2024年6月21日 17:28
To: Zhou, Bob <[email protected]>; [email protected]; Huang, Tim <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: add missing error handling for amdgpu_ring_alloc()
Am 21.06.24 um 11:24 schrieb Bob Zhou:
Quoted 2 lines
Fix the unchecked return value warning reported by Coverity, so add error handling.
That seems to be completely superfluous. The only case whenamdgpu_ring_alloc() returns an error is when we try to allocate more than the maximum submission size.
And in that case we will get quite a warning already.
I strongly suggest to instead drop the return value from amdgpu_ring_alloc().
Regards,
Christian.
Quoted 194 lines
Signed-off-by Bob Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +++++- 8 files changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-2@@ -1005,7 +1005,8 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1071,7 +1072,8 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1107,6 +1109,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev,
uint32_treg,uint32_tv, uint3
failed_undo:amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq_write: dev_err(adev->dev, "failed to write reg:%x\n", reg); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index3a7622611916..778941f47c96100644drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +2
-2@@ -768,7 +768,8 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_reg_write_reg_wait (ring, reg0, reg1, ref, mask); r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT); @@ -798,6 +799,7 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct
amdgpu_device*adev,
failed_undo:amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq: dev_err(adev->dev, "failed to write reg %x wait reg %x\n", reg0,reg1); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
indexd234b7ccfaaf..01864990a192100644drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +4
-2@@ -63,12 +63,14 @@ static void amdgpu_ring_mux_copy_pkt_from_sw_ring(struct amdgpu_ring_mux *mux,return ; }if (start > end) { -amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start); +if (amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], (ring->ring_size >>2 ) - start);amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[0 ], end); }else { -amdgpu_ring_alloc (real_ring, end - start); +if (amdgpu_ring_alloc (real_ring, end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], end - start); } }drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +2
-1@@ -610,7 +610,8 @@ static int vpe_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); +if (amdgpu_ring_alloc (ring,10 )) +return -ENOMEM ;vpe_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-2@@ -4093,7 +4093,8 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_write (ring,PACKET3 (PACKET3_COPY_DATA ,4 )); amdgpu_ring_write(ring, 9 | /* src: register*/ (5 << 8) | /* dst: memory */@@ -5639,7 +5640,10 @@ static int gfx_v9_0_ring_preempt_ib(struct amdgpu_ring *ring)amdgpu_ring_set_preempt_cond_exec (ring, false); ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,13 ); +if (amdgpu_ring_alloc (ring,13 )) { +spin_unlock_irqrestore (&kiq->ring_lock, flags); +return -ENOMEM ; + }gfx_v9_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,AMDGPU_FENCE_FLAG_EXEC |AMDGPU_FENCE_FLAG_INT );drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5
-1@@ -1490,7 +1490,11 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +5
-1@@ -1345,7 +1345,11 @@ static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_2_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +5
-1@@ -1371,7 +1371,11 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v6_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);
Error handling is to resolve or at least mitigate problems caused by the user or the hardware.
When the driver tries to allocate more than allowed from the ring then that's a driver bug and not something for error handling.
So the error handling here doesn't seem to make sense in the first place.
Regards,
Christian.
Am 03.07.24 um 09:23 schrieb Zhou, Bob:
Quoted 224 lines
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Christian,
In making the v2 version patch process, I check lots of cases for
amdgpu_ring_alloc(). I think checking the return value maybe better.
For allocating submission size fromamdgpu_ring_alloc(), the action is allowed to fail so that rerun allocating submission rather than drop the return value. For many cases in gpu driver, it still needs check the call result to conduct the error handling. If drop the return value, in those case it causes some unexpected result. If the error occurs, the command submission should be skip and wait the next action.Regards,
Bob-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: 2024年6月21日 17:28
To: Zhou, Bob <[email protected]>; [email protected]; Huang, Tim <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: add missing error handling foramdgpu_ring_alloc()Am 21.06.24 um 11:24 schrieb Bob Zhou:
Quoted 2 lines
Fix the unchecked return value warning reported by Coverity, so add error handling.
That seems to be completely superfluous. The only case when
amdgpu_ring_alloc()returns an error is when we try to allocate more than the maximum submission size.And in that case we will get quite a warning already.
I strongly suggest to instead drop the return value from
amdgpu_ring_alloc().Regards,
Christian.Quoted 193 lines
Signed-off-by Bob Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 ++++++-- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +++++- 8 files changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +4
-2@@ -1005,7 +1005,8 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t xcc_pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_rreg (ring, reg, reg_val_offs); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1071,7 +1072,8 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, uint3 }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_wreg (ring, reg, v); r =amdgpu_fence_emit_polling (ring, &seq,MAX_KIQ_REG_WAIT );if (r)@@ -1107,6 +1109,7 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev,
uint32_treg,uint32_tv, uint3failed_undo: amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq_write: dev_err(adev->dev, "failed to write reg:%x\n", reg); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index3a7622611916..778941f47c96100644drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +2
-2@@ -768,7 +768,8 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct amdgpu_device *adev, }spin_lock_irqsave (&kiq->ring_lock, flags); -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_emit_reg_write_reg_wait (ring, reg0, reg1, ref, mask); r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT); @@ -798,6 +799,7 @@ void amdgpu_gmc_fw_reg_write_reg_wait(struct
amdgpu_device*adev,failed_undo: amdgpu_ring_undo(ring); +failed_unlock: spin_unlock_irqrestore(&kiq->ring_lock, flags); failed_kiq: dev_err(adev->dev, "failed to write reg %x wait reg %x\n", reg0,reg1); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
indexd234b7ccfaaf..01864990a192100644drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +4
-2@@ -63,12 +63,14 @@ static void amdgpu_ring_mux_copy_pkt_from_sw_ring(struct amdgpu_ring_mux *mux,return ; }if (start > end) { -amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start); +if (amdgpu_ring_alloc (real_ring, (ring->ring_size >>2 ) + end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], (ring->ring_size >>2 ) - start);amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[0 ], end); }else { -amdgpu_ring_alloc (real_ring, end - start); +if (amdgpu_ring_alloc (real_ring, end - start)) +return ;amdgpu_ring_write_multiple (real_ring, (void *)&ring->ring[start], end - start); } }drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +2
-1@@ -610,7 +610,8 @@ static int vpe_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,10 ); +if (amdgpu_ring_alloc (ring,10 )) +return -ENOMEM ;vpe_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit (ring);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +6
-2@@ -4093,7 +4093,8 @@ static uint64_t gfx_v9_0_kiq_read_clock(struct amdgpu_device *adev)pr_err ("critical bug! too many kiq readers\n" ); goto failed_unlock; } -amdgpu_ring_alloc (ring,32 ); +if (amdgpu_ring_alloc (ring,32 )) + goto failed_unlock;amdgpu_ring_write (ring,PACKET3 (PACKET3_COPY_DATA ,4 )); amdgpu_ring_write(ring, 9 | /* src: register*/ (5 << 8) | /* dst: memory */@@ -5639,7 +5640,10 @@ static int gfx_v9_0_ring_preempt_ib(struct amdgpu_ring *ring)amdgpu_ring_set_preempt_cond_exec (ring, false); ring->trail_seq +=1 ; -amdgpu_ring_alloc (ring,13 ); +if (amdgpu_ring_alloc (ring,13 )) { +spin_unlock_irqrestore (&kiq->ring_lock, flags); +return -ENOMEM ; + }gfx_v9_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,AMDGPU_FENCE_FLAG_EXEC |AMDGPU_FENCE_FLAG_INT );drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5
-1@@ -1490,7 +1490,11 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +5
-1@@ -1345,7 +1345,11 @@ static int sdma_v5_2_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v5_2_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +5
-1@@ -1371,7 +1371,11 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring *ring)/* emit the trailing fence */ ring->trail_seq += 1; -amdgpu_ring_alloc (ring,10 ); + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("ring %d failed to be allocated\n" , ring->idx); +return r; + }sdma_v6_0_ring_emit_fence (ring, ring->trail_fence_gpu_addr, ring->trail_seq,0 );amdgpu_ring_commit(ring);