Skip to contentSkip to conversation

drm/amdkfd: init drm_client with funcs hook

PATCH In review Flora Cui 2 participants 3 messages Jan 12, 2024 – Jan 15, 2024

Subsystems (3)
lore
Share & tools
lore

Flora Cui

author
#0 lore raw

PATCH 1/1 drm/amdkfd: init drm_client with funcs hook

otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client).

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -1
index 067690ba7bff..81af6bf2f052 100644
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)
 	amdgpu_device_gpu_recover(adev, NULL, &reset_context);
 }
 
+static const struct drm_client_funcs kfd_client_funcs = {
+	.unregister	= drm_client_release,
+};
 void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
 {
 	int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
 			.enable_mes = adev->enable_mes,
 		};
 
-		ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", NULL);
+		ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", &kfd_client_funcs);
 		if (ret) {
 			dev_err(adev->dev, "Failed to init DRM client: %d\n", ret);
 			return;
Signature · 1 line
2.34.1
author
#1 lore raw

[AMD Official Use Only - General]

Ping?

-----Original Message-----
From: Cui, Flora <[email protected]>
Sent: Friday, January 12, 2024 4:05 PM
To: [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH] drm/amdkfd: init drm_client with funcs hook

otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client).

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -1
index 067690ba7bff..81af6bf2f052 100644
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)
        amdgpu_device_gpu_recover(adev, NULL, &reset_context);
 }
 
+static const struct drm_client_funcs kfd_client_funcs = {
+       .unregister     = drm_client_release,
+};
 void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
 {
        int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                        .enable_mes = adev->enable_mes,
                };
 
-               ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", NULL);
+               ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", &kfd_client_funcs);
                if (ret) {
                        dev_err(adev->dev, "Failed to init DRM client: %d\n", ret);
                        return;

--
2.34.1

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Flora Cui
Quoted 4 lines · Flora Cui

otherwise drm_client_dev_unregister() would try to kfree(&adev->kfd.client).

Thank you for finding and fixing this bug. You can add:

Fixes 1819200166ce ("drm/amdkfd: Export DMABufs from KFD using GEM handles")
Quoted 27 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -1
index 067690ba7bff..81af6bf2f052 100644
@@ -138,6 +138,9 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work)
  	amdgpu_device_gpu_recover(adev, NULL, &reset_context);
  }
 
+static const struct drm_client_funcs kfd_client_funcs = {
+	.unregister	= drm_client_release,
+};
  void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
  {
  	int i;
@@ -161,7 +164,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
  			.enable_mes = adev->enable_mes,
  		};
 
-		ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", NULL);
+		ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", &kfd_client_funcs);
  		if (ret) {
  			dev_err(adev->dev, "Failed to init DRM client: %d\n", ret);
  			return;