[PATCH 1/2] drm/amdgpu: fix another missing fence reference in the CS code

[PATCH 1/2] drm/amdgpu: fix another missing fence reference in the CS code

[Christian König]

drm_sched_job_add_dependency() consumes the references of the gang
members. Only triggered by mesh shaders.

Signed-off-by: Christian König <christian.koenig@amd.com>
Fixes: 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Tested-by: Bert Karwatzki <spasswolf@web.de>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 8516c814bc9b..47763ac0d14a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1254,9 +1254,12 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
 			continue;
 
 		fence = &p->jobs[i]->base.s_fence->scheduled;
+		dma_fence_get(fence);
 		r = drm_sched_job_add_dependency(&leader->base, fence);
-		if (r)
+		if (r) {
+			dma_fence_put(fence);
 			goto error_cleanup;
+		}
 	}
 
 	if (p->gang_size > 1) {
-- 
2.34.1

[PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Christian König]

When the fence can't be added we need to drop the reference.

Suggested-by: Bert Karwatzki <spasswolf@web.de>
Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index bac7976975bd..dcd8c066bc1f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
 
 		dma_fence_get(f);
 		r = drm_sched_job_add_dependency(&job->base, f);
-		if (r)
+		if (r) {
+			dma_fence_put(f);
 			return r;
+		}
 	}
 	return 0;
 }
-- 
2.34.1

Re: [PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Alex Deucher]

On Thu, Jan 5, 2023 at 6:17 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> When the fence can't be added we need to drop the reference.
>
> Suggested-by: Bert Karwatzki <spasswolf@web.de>
> Signed-off-by: Christian König <christian.koenig@amd.com>

Series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> index bac7976975bd..dcd8c066bc1f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> @@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
>
>                 dma_fence_get(f);
>                 r = drm_sched_job_add_dependency(&job->base, f);
> -               if (r)
> +               if (r) {
> +                       dma_fence_put(f);
>                         return r;
> +               }
>         }
>         return 0;
>  }
> --
> 2.34.1
>

Re: [PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Luben Tuikov]

Series is:

Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>

Regards,
Luben

On 2023-01-05 06:17, Christian König wrote:
> When the fence can't be added we need to drop the reference.
> 
> Suggested-by: Bert Karwatzki <spasswolf@web.de>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> index bac7976975bd..dcd8c066bc1f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> @@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
>  
>  		dma_fence_get(f);
>  		r = drm_sched_job_add_dependency(&job->base, f);
> -		if (r)
> +		if (r) {
> +			dma_fence_put(f);
>  			return r;
> +		}
>  	}
>  	return 0;
>  }

Re: [PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Alex Deucher]

On Thu, Jan 5, 2023 at 6:17 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> When the fence can't be added we need to drop the reference.
>
> Suggested-by: Bert Karwatzki <spasswolf@web.de>
> Signed-off-by: Christian König <christian.koenig@amd.com>

please add:
Cc: stable@vger.kernel.org # 6.1.x
When you push this series.

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> index bac7976975bd..dcd8c066bc1f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> @@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
>
>                 dma_fence_get(f);
>                 r = drm_sched_job_add_dependency(&job->base, f);
> -               if (r)
> +               if (r) {
> +                       dma_fence_put(f);
>                         return r;
> +               }
>         }
>         return 0;
>  }
> --
> 2.34.1
>

Re: [PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Christian König]

Am 05.01.23 um 17:50 schrieb Alex Deucher:
> On Thu, Jan 5, 2023 at 6:17 AM Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> When the fence can't be added we need to drop the reference.
>>
>> Suggested-by: Bert Karwatzki <spasswolf@web.de>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
> please add:
> Cc: stable@vger.kernel.org # 6.1.x
> When you push this series.

But none of this is in 6.1? That are pure 6.2 changes or am I missing 
something?

Christian.

>
> Alex
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> index bac7976975bd..dcd8c066bc1f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> @@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
>>
>>                  dma_fence_get(f);
>>                  r = drm_sched_job_add_dependency(&job->base, f);
>> -               if (r)
>> +               if (r) {
>> +                       dma_fence_put(f);
>>                          return r;
>> +               }
>>          }
>>          return 0;
>>   }
>> --
>> 2.34.1
>>

Re: [PATCH 2/2] drm/amdgpu: fix missing dma_fence_put in error path

[Alex Deucher]

On Thu, Jan 5, 2023 at 2:11 PM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Am 05.01.23 um 17:50 schrieb Alex Deucher:
> > On Thu, Jan 5, 2023 at 6:17 AM Christian König
> > <ckoenig.leichtzumerken@gmail.com> wrote:
> >> When the fence can't be added we need to drop the reference.
> >>
> >> Suggested-by: Bert Karwatzki <spasswolf@web.de>
> >> Signed-off-by: Christian König <christian.koenig@amd.com>
> > please add:
> > Cc: stable@vger.kernel.org # 6.1.x
> > When you push this series.
>
> But none of this is in 6.1? That are pure 6.2 changes or am I missing
> something?

I thought patch 1 fixed an issue in the gang submit code which was in
6.1, or was that fixing an issue in a subsequent change?

Alex

>
> Christian.
>
> >
> > Alex
> >
> >> ---
> >>   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +++-
> >>   1 file changed, 3 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> >> index bac7976975bd..dcd8c066bc1f 100644
> >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> >> @@ -391,8 +391,10 @@ int amdgpu_sync_push_to_job(struct amdgpu_sync *sync, struct amdgpu_job *job)
> >>
> >>                  dma_fence_get(f);
> >>                  r = drm_sched_job_add_dependency(&job->base, f);
> >> -               if (r)
> >> +               if (r) {
> >> +                       dma_fence_put(f);
> >>                          return r;
> >> +               }
> >>          }
> >>          return 0;
> >>   }
> >> --
> >> 2.34.1
> >>
>