Re: [PATCH] drm/amdkfd: Fix error handling in kfd_criu_restore_events

["Bhardwaj, Rajneesh" <Rajneesh.Bhardwaj@xxxxxxx>]

[AMD Official Use Only - General]

Yes it helps avoid the unbalanced lock messages seen during criu restore failures for events. Looks good to me.

Reviewed-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@xxxxxxx>

Regards,

Rajneesh

---

From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> on behalf of Felix Kuehling <Felix.Kuehling@xxxxxxx>
Sent: Thursday, November 3, 2022 7:13:09 PM
To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>
Subject: [PATCH] drm/amdkfd: Fix error handling in kfd_criu_restore_events

 

mutex_unlock before the exit label because all the error code paths that
jump there didn't take that lock. This fixes unbalanced locking errors
in case of restore errors.

Fixes: 40e8a766a761 ("drm/amdkfd: CRIU checkpoint and restore events")
Signed-off-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
---
 drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index 83e3ce9f6049..729d26d648af 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -506,6 +506,7 @@ int kfd_criu_restore_event(struct file *devkfd,
                 ret = create_other_event(p, ev, &ev_priv->event_id);
                 break;
         }
+       mutex_unlock(&p->event_mutex);
 
 exit:
         if (ret)
@@ -513,8 +514,6 @@ int kfd_criu_restore_event(struct file *devkfd,
 
         kfree(ev_priv);
 
-       mutex_unlock(&p->event_mutex);
-
         return ret;
 }
 
--
2.32.0