drm/amdkfd: Fix static checker warning on MES queue type
Subsystems (3)
PATCH 1/1 drm/amdkfd: Fix static checker warning on MES queue type
convert_to_mes_queue_type return can be negative, but queue_input.queue_type is uint32_t. Put return in integer var and cast to unsigned after negative check.
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +4 -3
@@ -176,7 +176,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev->adev;struct kfd_process_device *pdd =qpd_to_pdd (qpd);struct mes_add_queue_input queue_input; -int r; +int r, queue_type;if (dqm->is_hws_hang)return -EIO ;
@@ -201,12 +201,13 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q, queue_input.tba_addr = qpd->tba_addr; queue_input.tma_addr = qpd->tma_addr; - queue_input.queue_type =convert_to_mes_queue_type (q->properties.type); -if (queue_input.queue_type <0 ) { + queue_type =convert_to_mes_queue_type (q->properties.type); +if (queue_type <0 ) {pr_err ("Queue type not supported with MES, queue:%d\n" , q->properties.type);return -EINVAL ; } + queue_input.queue_type = (uint32_t )queue_type;if (q->gws) { queue_input.gws_base =0 ;
Signature · 1 line
2.25.1
Quoted 6 lines · Graham Sider
convert_to_mes_queue_typereturn can be negative, but queue_input.queue_type isuint32_t. Put return in integer var and cast to unsigned after negative check.Signed-off-by Graham Sider <[email protected]>
Add a reported-by for Dan's email?
Quoted 36 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +4
-4@@ -176,7 +176,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev->adev;struct kfd_process_device *pdd =qpd_to_pdd (qpd);struct mes_add_queue_input queue_input; -int r; +int r, queue_type;if (dqm->is_hws_hang)return -EIO ;@@ -201,12 +201,13 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q, queue_input.tba_addr = qpd->tba_addr; queue_input.tma_addr = qpd->tma_addr; - queue_input.queue_type =convert_to_mes_queue_type (q->properties.type); -if (queue_input.queue_type <0 ) { + queue_type =convert_to_mes_queue_type (q->properties.type); +if (queue_type <0 ) {pr_err ("Queue type not supported with MES, queue:%d\n" , q->properties.type);return -EINVAL ; } + queue_input.queue_type = (uint32_t )queue_type;if (q->gws) { queue_input.gws_base =0 ; --2.25.1
[AMD Official Use Only - General]
Thanks for mentioning, yes I'll add a reported-by for Dan on the commit.
Best,
Graham
Quoted 66 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, May 12, 2022 5:33 PM
To: Sider, Graham <[email protected]>
Cc: amd-gfx list <[email protected]>; Joshi, Mukul <[email protected]>; Kuehling, Felix <[email protected]>; Dan Carpenter <[email protected]>
Subject: Re: [PATCH] drm/amdkfd: Fix static checker warning on MES queue type[CAUTION: External Email]
Quoted 6 lines · Graham Sider
convert_to_mes_queue_typereturn can be negative, but queue_input.queue_type isuint32_t. Put return in integer var and cast to unsigned after negative check.Signed-off-by Graham Sider <[email protected]>Add a reported-by for Dan's email?
Reviewed-by Alex Deucher <[email protected]>drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct
Quoted 10 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0
-0@@ -176,7 +176,7 @@ static int add_queue_mes(struct
device_queue_manager*dqm, struct queue *q,drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1
-1struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev- adev;struct kfd_process_device *pdd =qpd_to_pdd (qpd);struct mes_add_queue_input queue_input; -int r; +int r, queue_type;if (dqm->is_hws_hang)return -EIO;drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0
-0@@ -201,12 +201,13 @@ static int add_queue_mes(struct
device_queue_manager*dqm, struct queue *q,Quoted 19 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +3
-2queue_input.tba_addr = qpd->tba_addr; queue_input.tma_addr = qpd->tma_addr; - queue_input.queue_type =convert_to_mes_queue_type (q- properties.type); -if (queue_input.queue_type <0 ) { + queue_type =convert_to_mes_queue_type (q->properties.type); +if (queue_type <0 ) {pr_err ("Queue type not supported with MES, queue:%d\n" , q->properties.type);return -EINVAL ; } + queue_input.queue_type = (uint32_t )queue_type;if (q->gws) {queue_input.gws_base = 0;--
2.25.1
Am 2022-05-12 um 15:16 schrieb Graham Sider:
Quoted 5 lines
convert_to_mes_queue_typereturn can be negative, but queue_input.queue_type isuint32_t. Put return in integer var and cast to unsigned after negative check.Signed-off-by Graham Sider <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +4
-3@@ -176,7 +176,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,struct amdgpu_device *adev = (struct amdgpu_device *)dqm->dev->adev;struct kfd_process_device *pdd =qpd_to_pdd (qpd);struct mes_add_queue_input queue_input; -int r; +int r, queue_type;if (dqm->is_hws_hang)return -EIO ;@@ -201,12 +201,13 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q, queue_input.tba_addr = qpd->tba_addr; queue_input.tma_addr = qpd->tma_addr; - queue_input.queue_type =convert_to_mes_queue_type (q->properties.type); -if (queue_input.queue_type <0 ) { + queue_type =convert_to_mes_queue_type (q->properties.type); +if (queue_type <0 ) {pr_err ("Queue type not supported with MES, queue:%d\n" , q->properties.type);return -EINVAL ; } + queue_input.queue_type = (uint32_t )queue_type;if (q->gws) { queue_input.gws_base =0 ;