diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3365-drm-amdkfd-Fix-scheduler-race-in-kfd_wait_on_events-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3365-drm-amdkfd-Fix-scheduler-race-in-kfd_wait_on_events-.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3365-drm-amdkfd-Fix-scheduler-race-in-kfd_wait_on_events-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3365-drm-amdkfd-Fix-scheduler-race-in-kfd_wait_on_events-.patch new file mode 100644 index 00000000..75e05afc --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3365-drm-amdkfd-Fix-scheduler-race-in-kfd_wait_on_events-.patch @@ -0,0 +1,48 @@ +From c822d03e256c979c10d1797a7d9e4cc74780b2eb Mon Sep 17 00:00:00 2001 +From: Sean Keely <sean.keely@amd.com> +Date: Fri, 27 Oct 2017 19:35:21 -0400 +Subject: [PATCH 3365/4131] drm/amdkfd: Fix scheduler race in + kfd_wait_on_events sleep loop + +Signed-off-by: Sean Keely <sean.keely@amd.com> +Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> +Acked-by: Oded Gabbay <oded.gabbay@gmail.com> +Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +index f3d88c8..1efd6a8 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +@@ -806,6 +806,17 @@ int kfd_wait_on_events(struct kfd_process *p, + break; + } + ++ /* Set task state to interruptible sleep before ++ * checking wake-up conditions. A concurrent wake-up ++ * will put the task back into runnable state. In that ++ * case schedule_timeout will not put the task to ++ * sleep and we'll get a chance to re-check the ++ * updated conditions almost immediately. Otherwise, ++ * this race condition would lead to a soft hang or a ++ * very long sleep. ++ */ ++ set_current_state(TASK_INTERRUPTIBLE); ++ + if (test_event_condition(all, num_events, event_waiters)) { + if (copy_signaled_event_data(num_events, + event_waiters, events)) +@@ -820,7 +831,7 @@ int kfd_wait_on_events(struct kfd_process *p, + break; + } + +- timeout = schedule_timeout_interruptible(timeout); ++ timeout = schedule_timeout(timeout); + } + __set_current_state(TASK_RUNNING); + +-- +2.7.4 + |