drm/amdgpu: Fix handling of KFD initialization failures
Subsystems (3)
Felix Kuehling
maintainerPATCH 1/1 drm/amdgpu: Fix handling of KFD initialization failures
Remember KFD module initializaton status in a global variable. Skip KFD device probing when the module was not initialized. Other amdgpu_amdkfd calls are then protected by the adev->kfd.dev check.
Also print a clear error message when KFD disables itself. Amdgpu continues its intialization even when KFD failed.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 11 ++++++++++- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 1 + 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +10 -1
@@ -36,6 +36,8 @@*/ uint64_t amdgpu_amdkfd_total_mem_size; +bool kfd_initialized; +int amdgpu_amdkfd_init (void ) {struct sysinfo si;
@@ -51,19 +53,26 @@ int amdgpu_amdkfd_init(void)#else ret = -ENOENT ;#endif + kfd_initialized = !ret;return ret; }void amdgpu_amdkfd_fini (void ) { -kgd2kfd_exit (); +if (kfd_initialized) { +kgd2kfd_exit (); + kfd_initialized = false; + } }void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) {bool vf =amdgpu_sriov_vf (adev); +if (!kfd_initialized) +return ; + adev->kfd.dev =kgd2kfd_probe ((struct kgd_dev *)adev, adev->pdev, adev->asic_type, vf);
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +1 -0
@@ -97,6 +97,7 @@ void kfd_chardev_exit(void)device_destroy (kfd_class,MKDEV (kfd_char_dev_major,0 ));class_destroy (kfd_class);unregister_chrdev (kfd_char_dev_major, kfd_dev_name); + kfd_device =NULL ; }struct device *kfd_chardev (void )
drivers/gpu/drm/amd/amdkfd/kfd_module.c +1 -0
@@ -70,6 +70,7 @@ static int kfd_init(void) err_topology:kfd_chardev_exit (); err_ioctl: +pr_err ("KFD is disabled due to module intialization failure\n" );return err; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Sorry, I read this yesterday and forgot to reply.
Quoted 91 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Felix Kuehling
Sent: Thursday, September 17, 2020 12:16 AM
To: [email protected]
Subject: [PATCH 1/1] drm/amdgpu: Fix handling of KFD initialization failuresRemember KFD module initializaton status in a global variable. Skip KFD device probing when the module was not initialized. Other
amdgpu_amdkfdcalls are then protected by theadev->kfd.devcheck.Also print a clear error message when KFD disables itself. Amdgpu continues its intialization even when KFD failed.
Signed-off-by Felix Kuehling <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 11 ++++++++++- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 1 + 3 files changed, 12 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +10
-1@@ -36,6 +36,8 @@*/ uint64_t amdgpu_amdkfd_total_mem_size; +bool kfd_initialized; +int amdgpu_amdkfd_init (void ) {struct sysinfo si;@@ -51,19 +53,26 @@ int amdgpu_amdkfd_init(void)#else ret = -ENOENT ;#endif + kfd_initialized = !ret;return ret; }void amdgpu_amdkfd_fini (void ) { -kgd2kfd_exit (); +if (kfd_initialized) { +kgd2kfd_exit (); + kfd_initialized = false; + } }void amdgpu_amdkfd_device_probe (struct amdgpu_device *adev) {bool vf =amdgpu_sriov_vf (adev); +if (!kfd_initialized) +return ; + adev->kfd.dev =kgd2kfd_probe ((struct kgd_dev *)adev, adev->pdev, adev->asic_type, vf);drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +1
-0@@ -97,6 +97,7 @@ void kfd_chardev_exit(void)device_destroy (kfd_class,MKDEV (kfd_char_dev_major,0 ));class_destroy (kfd_class);unregister_chrdev (kfd_char_dev_major, kfd_dev_name); + kfd_device =NULL ; }struct device *kfd_chardev (void )drivers/gpu/drm/amd/amdkfd/kfd_module.c +1
-1@@ -70,6 +70,7 @@ static int kfd_init(void) err_topology:kfd_chardev_exit (); err_ioctl: +pr_err ("KFD is disabled due to module intialization failure\n" );return err; } --2.17.1
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.or
g%2Fmailman%2Flistinfo%2Famd- gfx&data=02%7C01%7Ckent.russell%40amd.com%7Cf9442a9688294ecc817808d85ac0 7cb4%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637359130061923813& sdata=ysgKdz8%2BuZY93Um5fFAXR5hopzDg0MhFbasV29mJO%2F0%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx