From 32672afbc03e4688b444e58494aa77168b7f2147 Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Fri, 7 Dec 2018 11:04:07 -0800 Subject: nvgpu: pmu: cleanup init thread on destroy In nvgpu_kill_task_pg_init(), call nvgpu_thread_join() if the init thread is no longer running in order to reclaim thread resources. Bug 2452799 JIRA ESRM-437 Change-Id: Id9c67f689027f00039ac2df226ee9c28ad89dd1d Signed-off-by: Peter Daifuku Reviewed-on: https://git-master.nvidia.com/r/1967983 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions Reviewed-on: https://git-master.nvidia.com/r/1970058 Reviewed-by: Shmuel Ungerfeld Reviewed-by: Automatic_Commit_Validation_User Tested-by: Shmuel Ungerfeld Reviewed-by: Rahul Jain (SW-TEGRA) --- drivers/gpu/nvgpu/common/pmu/pmu.c | 2 ++ drivers/gpu/nvgpu/include/nvgpu/thread.h | 9 +++++++++ drivers/gpu/nvgpu/os/linux/thread.c | 9 ++++++++- drivers/gpu/nvgpu/os/posix/thread.c | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index 9bcfa14e..f86dc2c2 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c @@ -171,6 +171,8 @@ void nvgpu_kill_task_pg_init(struct gk20a *g) nvgpu_udelay(2); } while (nvgpu_timeout_expired_msg(&timeout, "timeout - waiting PMU state machine thread stop") == 0); + } else { + nvgpu_thread_join(&pmu->pg_init.state_task); } } diff --git a/drivers/gpu/nvgpu/include/nvgpu/thread.h b/drivers/gpu/nvgpu/include/nvgpu/thread.h index b113f972..eac06ef1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/thread.h +++ b/drivers/gpu/nvgpu/include/nvgpu/thread.h @@ -80,4 +80,13 @@ bool nvgpu_thread_should_stop(struct nvgpu_thread *thread); */ bool nvgpu_thread_is_running(struct nvgpu_thread *thread); +/** + * nvgpu_thread_join - join a thread to reclaim resources + * after it has exited + * + * @thread - thread to join + * + */ +void nvgpu_thread_join(struct nvgpu_thread *thread); + #endif /* NVGPU_THREAD_H */ diff --git a/drivers/gpu/nvgpu/os/linux/thread.c b/drivers/gpu/nvgpu/os/linux/thread.c index 92c556f2..c56bff6b 100644 --- a/drivers/gpu/nvgpu/os/linux/thread.c +++ b/drivers/gpu/nvgpu/os/linux/thread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, 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, @@ -17,6 +17,7 @@ #include #include +#include int nvgpu_thread_proxy(void *threaddata) { @@ -61,3 +62,9 @@ bool nvgpu_thread_is_running(struct nvgpu_thread *thread) { return ACCESS_ONCE(thread->running); }; + +void nvgpu_thread_join(struct nvgpu_thread *thread) +{ + while (ACCESS_ONCE(thread->running)) + nvgpu_msleep(10); +}; diff --git a/drivers/gpu/nvgpu/os/posix/thread.c b/drivers/gpu/nvgpu/os/posix/thread.c index d9476523..6fdce134 100644 --- a/drivers/gpu/nvgpu/os/posix/thread.c +++ b/drivers/gpu/nvgpu/os/posix/thread.c @@ -94,3 +94,8 @@ bool nvgpu_thread_is_running(struct nvgpu_thread *thread) { return thread->running; } + +void nvgpu_thread_join(struct nvgpu_thread *thread) +{ + (void) pthread_join(thread->thread, NULL); +} -- cgit v1.2.2