Files
linux-nvgpu/drivers/gpu/nvgpu/os/linux/thread.c
Peter Daifuku c58029ad24 gpu: nvgpu: fix race for nvgpu_thread_stop
The pmu init thread typically returns immediately
without calling nvgpu_thread_should_stop().

pmu_pg_kill_task() checks if the thread is running, and
if it is, calls nvgpu_thread_stop().

However, there's a race condition where the init thread could
have exited between the time that kill_task() checked the
running flag and the time we actually stop the thread, leading
to a kernel crash.

Fix this by making the running flag in the nvgpu_thread struct
atomic. Both the thread proxy function and the thread_stop()
function will set the flag to false.

In the case of nvgpu_thread_proxy(), if the flag is already false,
then nvgpu_thread_stop() has already reset it, at which point we
just wait for nvgpu_thread_should_stop() to return true.

In the case of nvgpu_thread_stop(), if the flag is already false,
then the thread proxy function has already exited, and there is
nothing more to do.

Bug 2591298

Change-Id: I9ba6b63c30a5c3e1df11e790094836b44373122b
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2230358
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
2020-12-15 14:10:29 -06:00

101 lines
2.5 KiB
C

/*
* Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <linux/kthread.h>
#include <nvgpu/thread.h>
#include <nvgpu/timers.h>
int nvgpu_thread_proxy(void *threaddata)
{
struct nvgpu_thread *thread = threaddata;
int ret = thread->fn(thread->data);
bool was_running;
was_running = nvgpu_atomic_xchg(&thread->running, false);
/* if the thread was not running, then nvgpu_thread_stop() was
* called, so just wait until we get the notification that we should
* stop.
*/
if (!was_running) {
while (!nvgpu_thread_should_stop(thread)) {
nvgpu_usleep_range(5000, 5100);
}
}
return ret;
}
int nvgpu_thread_create(struct nvgpu_thread *thread,
void *data,
int (*threadfn)(void *data), const char *name)
{
struct task_struct *task = kthread_create(nvgpu_thread_proxy,
thread, name);
if (IS_ERR(task))
return PTR_ERR(task);
thread->task = task;
thread->fn = threadfn;
thread->data = data;
nvgpu_atomic_set(&thread->running, true);
wake_up_process(task);
return 0;
};
void nvgpu_thread_stop(struct nvgpu_thread *thread)
{
bool was_running;
if (thread->task) {
was_running = nvgpu_atomic_xchg(&thread->running, false);
if (was_running) {
kthread_stop(thread->task);
}
thread->task = NULL;
}
};
void nvgpu_thread_stop_graceful(struct nvgpu_thread *thread,
void (*thread_stop_fn)(void *data), void *data)
{
/*
* Threads waiting on wq's should have nvgpu_thread_should_stop()
* as one of its wakeup condition. This allows the thread to be woken
* up when kthread_stop() is invoked and does not require an additional
* callback to wakeup the sleeping thread.
*/
nvgpu_thread_stop(thread);
};
bool nvgpu_thread_should_stop(struct nvgpu_thread *thread)
{
return kthread_should_stop();
};
bool nvgpu_thread_is_running(struct nvgpu_thread *thread)
{
return nvgpu_atomic_read(&thread->running);
};
void nvgpu_thread_join(struct nvgpu_thread *thread)
{
while (nvgpu_atomic_read(&thread->running)) {
nvgpu_msleep(10);
}
};