drm/amdkfd: Fix wrong usage of INIT_WORK()

[ Upstream commit 21cae8debc6a1d243f64fa82cd1b41cb612b5c61 ]

In kfd_procfs_show(), the sdma_activity_work_handler is a local variable
and the sdma_activity_work_handler.sdma_activity_work should initialize
with INIT_WORK_ONSTACK() instead of INIT_WORK().

Fixes: 32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Signed-off-by: Felix Kuehling <felix.kuehling@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 8343b3e4de7b58231579f1c2ab127a003f02492a..378ce360b861b236cbb32ae64b1d582daf1c57aa 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -312,8 +312,8 @@ static ssize_t kfd_procfs_show(struct kobject *kobj, struct attribute *attr,
                                                              attr_sdma);
                struct kfd_sdma_activity_handler_workarea sdma_activity_work_handler;
 
-               INIT_WORK(&sdma_activity_work_handler.sdma_activity_work,
-                                       kfd_sdma_activity_worker);
+               INIT_WORK_ONSTACK(&sdma_activity_work_handler.sdma_activity_work,
+                                 kfd_sdma_activity_worker);
 
                sdma_activity_work_handler.pdd = pdd;
                sdma_activity_work_handler.sdma_activity_counter = 0;
@@ -321,6 +321,7 @@ static ssize_t kfd_procfs_show(struct kobject *kobj, struct attribute *attr,
                schedule_work(&sdma_activity_work_handler.sdma_activity_work);
 
                flush_work(&sdma_activity_work_handler.sdma_activity_work);
+               destroy_work_on_stack(&sdma_activity_work_handler.sdma_activity_work);
 
                return snprintf(buffer, PAGE_SIZE, "%llu\n",
                                (sdma_activity_work_handler.sdma_activity_counter)/