The patch titled
Subject: kernel/watchdog.c: fix race between proc_watchdog_thresh() and watchdog_timer_fn()
has been removed from the -mm tree. Its filename was
watchdog-fix-race-between-proc_watchdog_thresh-and-watchdog_timer_fn.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Subject: kernel/watchdog.c: fix race between proc_watchdog_thresh() and watchdog_timer_fn()
Theoretically it is possible that the watchdog timer expires right at the
time when a user sets 'watchdog_thresh' to zero (note: this disables the
lockup detectors). In this scenario, the is_softlockup() function - which
is called by the timer - could produce a false positive.
Fix this by checking the current value of 'watchdog_thresh'.
Signed-off-by: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Acked-by: Don Zickus <dzickus@xxxxxxxxxx>
Reviewed-by: Aaron Tomlin <atomlin@xxxxxxxxxx>
Cc: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/watchdog.c~watchdog-fix-race-between-proc_watchdog_thresh-and-watchdog_timer_fn kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-fix-race-between-proc_watchdog_thresh-and-watchdog_timer_fn
+++ a/kernel/watchdog.c
@@ -289,7 +289,7 @@ static int is_softlockup(unsigned long t
{
unsigned long now = get_timestamp();
- if (watchdog_enabled & SOFT_WATCHDOG_ENABLED) {
+ if ((watchdog_enabled & SOFT_WATCHDOG_ENABLED) && watchdog_thresh){
/* Warn about unreasonable delays. */
if (time_after(now, touch_ts + get_softlockup_thresh()))
return now - touch_ts;
_
Patches currently in -mm which might be from uobergfe@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
