drm/amdkfd: Check debug trap enable before write dbg_ev_file
authorjsg <jsg@openbsd.org>
Mon, 9 Sep 2024 09:17:44 +0000 (09:17 +0000)
committerjsg <jsg@openbsd.org>
Mon, 9 Sep 2024 09:17:44 +0000 (09:17 +0000)
From Lin.Cao
e6ea3b8fe398915338147fe54dd2db8155fdafd8 in linux-6.6.y/6.6.50
547033b593063eb85bfdf9b25a5f1b8fd1911be2 in mainline linux

sys/dev/pci/drm/amd/amdkfd/kfd_debug.c

index 9ec7506..94aaf2f 100644 (file)
@@ -103,7 +103,8 @@ void debug_event_write_work_handler(struct work_struct *work)
                        struct kfd_process,
                        debug_event_workarea);
 
-       kernel_write(process->dbg_ev_file, &write_data, 1, &pos);
+       if (process->debug_trap_enabled && process->dbg_ev_file)
+               kernel_write(process->dbg_ev_file, &write_data, 1, &pos);
 }
 
 /* update process/device/queue exception status, write to descriptor
@@ -645,6 +646,7 @@ int kfd_dbg_trap_disable(struct kfd_process *target)
        else if (target->runtime_info.runtime_state != DEBUG_RUNTIME_STATE_DISABLED)
                target->runtime_info.runtime_state = DEBUG_RUNTIME_STATE_ENABLED;
 
+       cancel_work_sync(&target->debug_event_workarea);
        fput(target->dbg_ev_file);
        target->dbg_ev_file = NULL;