drm/amdgpu: fix Coverity explicit null dereferenced warnings
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix Coverity explicit null dereferenced warnings
This is to address the Coverity explicit null dereferenced warnings by NULL returns from amdgpu_mes_ctx_get_offs* but without follow-up Checks. Meanwhile refactor the code to keep only one *_get_gpu/cpu_addr.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 14 ++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 17 +++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 12 ++++++------ 11 files changed, 55 insertions(+), 64 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1 -1
@@ -1082,7 +1082,7 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,int offset = offsetof(struct amdgpu_mes_ctx_meta_data , compute[ring->idx].mec_hpd); ring->eop_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); }switch (queue_type) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -12
@@ -169,16 +169,6 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) ring->funcs->end_use (ring); } -#define amdgpu_ring_get_gpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : \ - (ring->adev->wb.gpu_addr + offset * 4)) - -#define amdgpu_ring_get_cpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - (&ring->adev->wb.wb[offset])) -/** * amdgpu_ring_init - init driver ring struct. *
@@ -332,8 +322,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_RING_OFFS ); - ring->gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ring->ring =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ring->gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ring->ring =amdgpu_ring_get_cpu_addr (ring, offset);amdgpu_ring_clear_ring (ring); }else if (ring->ring_obj ==NULL ) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +9 -8
@@ -436,14 +436,15 @@ static inline void amdgpu_ring_patch_cond_exec(struct amdgpu_ring *ring, ring->ring[offset] = cur - offset; } -#define amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : 0) - -#define amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - NULL) +#define amdgpu_ring_get_gpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + (ring->mes_ctx->meta_data_gpu_addr + offset) : \ + (ring->adev->wb.gpu_addr + offset * 4)) + +#define amdgpu_ring_get_cpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + ((void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset)) : \ + ((void *)(&ring->adev->wb.wb[offset])))int amdgpu_ring_test_helper (struct amdgpu_ring *ring);
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
@@ -80,7 +80,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, offset = offsetof(struct amdgpu_mes_ctx_meta_data , sdma[ring->idx].sdma_meta_data); - csa_mc_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + csa_mc_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { r =amdgpu_sdma_get_index_from_ring (ring, &index);
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7 -7
@@ -546,11 +546,11 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r =amdgpu_device_wb_get (adev, &index);
@@ -5895,14 +5895,14 @@ static void gfx_v11_0_ring_emit_de_meta(struct amdgpu_ring *ring, bool resume) gfx[0].gfx_meta_data) + offsetof(struct v10_gfx_meta_data , de_payload); de_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v10_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v10_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +4 -4
@@ -456,11 +456,11 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r =amdgpu_device_wb_get (adev, &index);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +7 -7
@@ -5359,7 +5359,7 @@ static void gfx_v9_0_ring_patch_ce_meta(struct amdgpu_ring *ring, gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;
@@ -5391,7 +5391,7 @@ static void gfx_v9_0_ring_patch_de_meta(struct amdgpu_ring *ring, gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , de_payload); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;
@@ -5590,9 +5590,9 @@ static void gfx_v9_0_ring_emit_ce_meta(struct amdgpu_ring *ring, bool resume) gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;
@@ -5688,14 +5688,14 @@ static void gfx_v9_0_ring_emit_de_meta(struct amdgpu_ring *ring, bool resume, bo gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , de_payload); de_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v9_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +6 -6
@@ -982,8 +982,8 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
@@ -1060,13 +1060,13 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr = (void *)amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +6 -6
@@ -871,8 +871,8 @@ static int sdma_v5_2_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
@@ -949,13 +949,13 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +6 -6
@@ -845,8 +845,8 @@ static int sdma_v6_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
@@ -923,13 +923,13 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +6 -6
@@ -857,8 +857,8 @@ static int sdma_v7_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
@@ -935,13 +935,13 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
Signature · 1 line
2.43.0
Am 24.07.24 um 09:06 schrieb Tim Huang:
Quoted 3 lines
This is to address the Coverity explicit null dereferenced warnings by NULL returns from amdgpu_mes_ctx_get_offs* but without follow-up Checks. Meanwhile refactor the code to keep only one *_get_gpu/cpu_addr.
Well nice that you are looking into that, but the short term plan is to remove the in kernel MES tests again.
That should also fix the Coverity warnings. Arun already created a patch for that which will probably be merged in the next weeks.
Regards,
Christian.
Quoted 344 lines
Signed-off-by Tim Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 14 ++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 17 +++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 12 ++++++------ 11 files changed, 55 insertions(+), 64 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1
-1@@ -1082,7 +1082,7 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,int offset = offsetof(struct amdgpu_mes_ctx_meta_data , compute[ring->idx].mec_hpd); ring->eop_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); }switch (queue_type) {drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2
-12@@ -169,16 +169,6 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) ring->funcs->end_use (ring); } -#define amdgpu_ring_get_gpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : \ - (ring->adev->wb.gpu_addr + offset * 4)) - -#define amdgpu_ring_get_cpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - (&ring->adev->wb.wb[offset])) -/** * amdgpu_ring_init - init driver ring struct. * @@ -332,8 +322,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_RING_OFFS ); - ring->gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ring->ring =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ring->gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ring->ring =amdgpu_ring_get_cpu_addr (ring, offset);amdgpu_ring_clear_ring (ring); }else if (ring->ring_obj ==NULL ) {drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +9
-8@@ -436,14 +436,15 @@ static inline void amdgpu_ring_patch_cond_exec(struct amdgpu_ring *ring, ring->ring[offset] = cur - offset; } -#define amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : 0) - -#define amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - NULL) +#define amdgpu_ring_get_gpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + (ring->mes_ctx->meta_data_gpu_addr + offset) : \ + (ring->adev->wb.gpu_addr + offset * 4)) + +#define amdgpu_ring_get_cpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + ((void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset)) : \ + ((void *)(&ring->adev->wb.wb[offset])))int amdgpu_ring_test_helper (struct amdgpu_ring *ring);drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1
-1@@ -80,7 +80,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, offset = offsetof(struct amdgpu_mes_ctx_meta_data , sdma[ring->idx].sdma_meta_data); - csa_mc_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + csa_mc_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { r =amdgpu_sdma_get_index_from_ring (ring, &index);drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7
-7@@ -546,11 +546,11 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r =amdgpu_device_wb_get (adev, &index);@@ -5895,14 +5895,14 @@ static void gfx_v11_0_ring_emit_de_meta(struct amdgpu_ring *ring, bool resume) gfx[0].gfx_meta_data) + offsetof(struct v10_gfx_meta_data , de_payload); de_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v10_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v10_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +4
-4@@ -456,11 +456,11 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r =amdgpu_device_wb_get (adev, &index);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +7
-7@@ -5359,7 +5359,7 @@ static void gfx_v9_0_ring_patch_ce_meta(struct amdgpu_ring *ring, gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;@@ -5391,7 +5391,7 @@ static void gfx_v9_0_ring_patch_de_meta(struct amdgpu_ring *ring, gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , de_payload); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;@@ -5590,9 +5590,9 @@ static void gfx_v9_0_ring_emit_ce_meta(struct amdgpu_ring *ring, bool resume) gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;@@ -5688,14 +5688,14 @@ static void gfx_v9_0_ring_emit_de_meta(struct amdgpu_ring *ring, bool resume, bo gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , de_payload); de_payload_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v9_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +6
-6@@ -982,8 +982,8 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);@@ -1060,13 +1060,13 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr = (void *)amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +6
-6@@ -871,8 +871,8 @@ static int sdma_v5_2_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);@@ -949,13 +949,13 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +6
-6@@ -845,8 +845,8 @@ static int sdma_v6_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);@@ -923,13 +923,13 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +6
-6@@ -857,8 +857,8 @@ static int sdma_v7_0_ring_test_ring(struct amdgpu_ring *ring)uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);@@ -935,13 +935,13 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) {uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_IB_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);
[Public]
Hi Christian,
Quoted 14 lines
-----Original Message-----
From: Christian König <[email protected]>
Sent: Wednesday, July 24, 2024 3:35 PM
To: Huang, Tim <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: fix Coverity explicit null dereferenced warningsAm 24.07.24 um 09:06 schrieb Tim Huang:
Quoted 3 lines
This is to address the Coverity explicit null dereferenced warnings by NULL returns from amdgpu_mes_ctx_get_offs* but without follow-up Checks. Meanwhile refactor the code to keep only one *_get_gpu/cpu_addr.
Quoted 5 lines
Well nice that you are looking into that, but the short term plan is to remove the in kernel MES tests again.
That should also fix the Coverity warnings. Arun already created a patch for that which will probably be merged in the next weeks.
Thanks for letting me know.
Will hold and not upstream this patch.
Best Regards,
Tim Huang
Quoted 386 lines
Regards,
Christian.drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_add_ring(struct amdgpu_device
Quoted 22 lines
Signed-off-by Tim Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 14 ++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 17 +++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 12 ++++++------ 11 files changed, 55 insertions(+), 64 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0
-0@@ -1082,7 +1082,7 @@ int amdgpu_mes_add_ring(struct amdgpu_device*adev, int
gang_id,drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h static inline void
Quoted 48 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1
-1int offset = offsetof(struct amdgpu_mes_ctx_meta_data , compute[ring->idx].mec_hpd); ring->eop_gpu_addr = -amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); }switch (queue_type) {drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2
-12@@ -169,16 +169,6 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) ring->funcs->end_use (ring); } -#define amdgpu_ring_get_gpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : \ - (ring->adev->wb.gpu_addr + offset * 4)) - -#define amdgpu_ring_get_cpu_addr (ring, offset) \ - (ring->is_mes_queue ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - (&ring->adev->wb.wb[offset])) -/** * amdgpu_ring_init - init driver ring struct. * @@ -332,8 +322,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev,struct amdgpu_ring *ring, offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_RING_OFFS ); - ring->gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ring->ring =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ring->gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ring->ring =amdgpu_ring_get_cpu_addr (ring, offset);amdgpu_ring_clear_ring (ring);} else if (ring->ring_obj == NULL) { diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.hb/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index582053f1cd56..f65f13d147b4100644drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +0
-0@@ -436,14 +436,15 @@ static inline voidamdgpu_ring_patch_cond_exec(struct
amdgpu_ring*ring,drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c static int gfx_v11_0_ring_test_ib(struct
Quoted 44 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +9
-8ring->ring[offset] = cur - offset; } -#define amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (ring->mes_ctx->meta_data_gpu_addr + offset) : 0) - -#define amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset) \ - (ring->is_mes_queue && ring->mes_ctx ? \ - (void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset) : \ - NULL) +#define amdgpu_ring_get_gpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + (ring->mes_ctx->meta_data_gpu_addr + offset) : \ + (ring->adev->wb.gpu_addr + offset * 4)) + +#define amdgpu_ring_get_cpu_addr (ring, offset) \ + (ring->is_mes_queue ? \ + ((void *)((uint8_t *)(ring->mes_ctx->meta_data_ptr) + offset)) : \ + ((void *)(&ring->adev->wb.wb[offset])))int amdgpu_ring_test_helper (struct amdgpu_ring *ring);drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1
-1@@ -80,7 +80,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(structamdgpu_ring *ring, offset = offsetof(struct amdgpu_mes_ctx_meta_data , sdma[ring->idx].sdma_meta_data); - csa_mc_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + csa_mc_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { r =amdgpu_sdma_get_index_from_ring (ring, &index);drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-0@@ -546,11 +546,11 @@ static int gfx_v11_0_ring_test_ib(struct
amdgpu_ring*ring, long timeout)Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-2padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset);drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +4
-2+ ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r = amdgpu_device_wb_get(adev, &index); @@ -5895,14 +5895,14@@
Quoted 1 line
static void gfx_v11_0_ring_emit_de_meta(struct
amdgpu_ring*ring, boolresume)
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c static int gfx_v12_0_ring_test_ib(struct
Quoted 23 lines
gfx[0].gfx_meta_data) + offsetof(struct v10_gfx_meta_data, de_payload); de_payload_gpu_addr =drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +3
-4-amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v10_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v10_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset; diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
indexf384be0d1800..df817b898e48100644drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +0
-0@@ -456,11 +456,11 @@ static int gfx_v12_0_ring_test_ib(struct
amdgpu_ring*ring, long timeout)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_ring_patch_ce_meta(struct
Quoted 21 lines
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +4
-4padding =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, padding); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, padding); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, padding); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, padding); *cpu_ptr =cpu_to_le32 (0xCAFEDEAD ); }else { r = amdgpu_device_wb_get(adev, &index); diff --git
a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.cb/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index2929c8972ea7..b26658414f3c100644drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-0@@ -5359,7 +5359,7 @@ static void gfx_v9_0_ring_patch_ce_meta(struct
amdgpu_ring*ring,drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_ring_patch_ce_meta(struct amdgpu_ring *ring, · line 5365
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;@@
Quoted 1 line
-5391,7 +5391,7 @@ static void gfx_v9_0_ring_patch_de_meta(struct
amdgpu_ring*ring,drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_ring_patch_de_meta(struct amdgpu_ring *ring, · line 5397
Quoted 8 lines
gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data, de_payload); de_payload_cpu_addr =drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1
-1-amdgpu_mes_ctx_get_offs_cpu_addr (ring, payload_offset); +amdgpu_ring_get_cpu_addr (ring, payload_offset); }else { payload_offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_cpu_addr = adev->virt.csa_cpu_addr + payload_offset;@@
Quoted 1 line
-5590,9 +5590,9 @@ static void gfx_v9_0_ring_emit_ce_meta(struct
amdgpu_ring*ring, bool resume)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_ring_emit_ce_meta(struct amdgpu_ring *ring, bool resume) · line 5598
Quoted 11 lines
gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data, ce_payload); ce_payload_gpu_addr =drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-2-amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); ce_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , ce_payload); ce_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset;@@
Quoted 1 line
-5688,14 +5688,14 @@ static void gfx_v9_0_ring_emit_de_meta(struct
amdgpu_ring*ring, bool resume, bodrivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static int sdma_v5_0_ring_test_ring(struct
Quoted 23 lines
gfx[0].gfx_meta_data) + offsetof(struct v9_gfx_meta_data, de_payload); de_payload_gpu_addr =drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3
-4-amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); +amdgpu_ring_get_gpu_addr (ring, offset); de_payload_cpu_addr = -amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); +amdgpu_ring_get_cpu_addr (ring, offset); offset = offsetof(struct amdgpu_mes_ctx_meta_data , gfx[0].gds_backup) + offsetof(struct v9_gfx_meta_data , de_payload); - gds_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); + gds_addr =amdgpu_ring_get_gpu_addr (ring, offset); }else { offset = offsetof(struct v9_gfx_meta_data , de_payload); de_payload_gpu_addr =amdgpu_csa_vaddr (ring->adev) + offset; diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
indexb7d33d78bce0..533b1d9964b4100644drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +0
-0@@ -982,8 +982,8 @@ static int sdma_v5_0_ring_test_ring(struct
amdgpu_ring*ring)drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +2
-2uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); @@ -1060,13 +1060,13@@
Quoted 4 lines
static int
sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) { uint32_t offset = 0; offset = amdgpu_mes_ctx_get_offs(ring,
AMDGPU_MES_CTX_IB_OFFS);drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c static int sdma_v5_2_ring_test_ring(struct
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +4
-4- ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr = (void *)amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); diff --git
a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.cb/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index630b03f2ce3d..e94f52e34489100644drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +0
-0@@ -871,8 +871,8 @@ static int sdma_v5_2_ring_test_ring(struct
amdgpu_ring*ring)drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c static int sdma_v5_2_ring_test_ring(struct · line 878
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +2
-2uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); @@ -949,13 +949,13@@
Quoted 4 lines
static int
sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) { uint32_t offset = 0; offset = amdgpu_mes_ctx_get_offs(ring,
AMDGPU_MES_CTX_IB_OFFS);drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c static int sdma_v6_0_ring_test_ring(struct
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +4
-4- ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); diff --git
a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.cb/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
indexdab4c2db8c9d..e29260d5b694100644drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +0
-0@@ -845,8 +845,8 @@ static int sdma_v6_0_ring_test_ring(struct
amdgpu_ring*ring)drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c static int sdma_v6_0_ring_test_ring(struct · line 852
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +2
-2uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); @@ -923,13 +923,13@@
Quoted 4 lines
static int
sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) { uint32_t offset = 0; offset = amdgpu_mes_ctx_get_offs(ring,
AMDGPU_MES_CTX_IB_OFFS);drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c static int sdma_v7_0_ring_test_ring(struct
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +4
-4- ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); diff --git
a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.cb/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
index41b5e45697dc..efd3c9bdb7c6100644drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +0
-0@@ -857,8 +857,8 @@ static int sdma_v7_0_ring_test_ring(struct
amdgpu_ring*ring)drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c static int sdma_v7_0_ring_test_ring(struct · line 864
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +2
-2uint32_t offset =0 ; offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r = amdgpu_device_wb_get(adev, &index); @@ -935,13 +935,13@@
Quoted 4 lines
static int
sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)if (ring->is_mes_queue) { uint32_t offset = 0; offset = amdgpu_mes_ctx_get_offs(ring,
AMDGPU_MES_CTX_IB_OFFS);Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +4
-4- ib.gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - ib.ptr = (void *)amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + ib.gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + ib.ptr =amdgpu_ring_get_cpu_addr (ring, offset); offset =amdgpu_mes_ctx_get_offs (ring,AMDGPU_MES_CTX_PADDING_OFFS ); - gpu_addr =amdgpu_mes_ctx_get_offs_gpu_addr (ring, offset); - cpu_ptr =amdgpu_mes_ctx_get_offs_cpu_addr (ring, offset); + gpu_addr =amdgpu_ring_get_gpu_addr (ring, offset); + cpu_ptr =amdgpu_ring_get_cpu_addr (ring, offset); *cpu_ptr = tmp; }else { r =amdgpu_device_wb_get (adev, &index);