* [patch 081/101] kmemleak: don't hang if user disables scanning early
@ 2016-07-28 22:48 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2016-07-28 22:48 UTC (permalink / raw)
To: torvalds, mm-commits, akpm, vegard.nossum, catalin.marinas
From: Vegard Nossum <vegard.nossum@oracle.com>
Subject: kmemleak: don't hang if user disables scanning early
If the user tries to disable automatic scanning early in the boot
process using e.g.:
echo scan=off > /sys/kernel/debug/kmemleak
then this command will hang until SECS_FIRST_SCAN (= 60) seconds have
elapsed, even though the system is fully initialised.
We can fix this using interruptible sleep and checking if we're
supposed to stop whenever we wake up (like the rest of the code does).
Link: http://lkml.kernel.org/r/1468835005-2873-1-git-send-email-vegard.nossum@oracle.com
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/kmemleak.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN mm/kmemleak.c~kmemleak-dont-hang-if-user-disables-scanning-early mm/kmemleak.c
--- a/mm/kmemleak.c~kmemleak-dont-hang-if-user-disables-scanning-early
+++ a/mm/kmemleak.c
@@ -1485,8 +1485,10 @@ static int kmemleak_scan_thread(void *ar
* Wait before the first scan to allow the system to fully initialize.
*/
if (first_run) {
+ signed long timeout = msecs_to_jiffies(SECS_FIRST_SCAN * 1000);
first_run = 0;
- ssleep(SECS_FIRST_SCAN);
+ while (timeout && !kthread_should_stop())
+ timeout = schedule_timeout_interruptible(timeout);
}
while (!kthread_should_stop()) {
_
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-07-28 22:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-28 22:48 [patch 081/101] kmemleak: don't hang if user disables scanning early akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.