diff options
author | Paul E. McKenney <paul.mckenney@linaro.org> | 2012-09-21 13:41:50 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-23 10:42:52 -0400 |
commit | 86f343b50bb9f56cce60fade22da9defff28934c (patch) | |
tree | c2951c5b76afcd56a3d9f4a5d1d40e95528f3bbe /kernel/rcutree_plugin.h | |
parent | 22a767269a767b3ee91e4aaea353ac6bec6a912d (diff) |
rcu: Fix CONFIG_RCU_FAST_NO_HZ stall warning message
The print_cpu_stall_fast_no_hz() function attempts to print -1 when
the ->idle_gp_timer is not pending, but unsigned arithmetic causes it
to instead print ULONG_MAX, which is 4294967295 on 32-bit systems and
18446744073709551615 on 64-bit systems. Neither of these are the most
reader-friendly values, so this commit instead causes "timer not pending"
to be printed when ->idle_gp_timer is not pending.
Reported-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcutree_plugin.h')
-rw-r--r-- | kernel/rcutree_plugin.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index df47014e129d..e12d07ba601a 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -2130,11 +2130,15 @@ static void print_cpu_stall_fast_no_hz(char *cp, int cpu) | |||
2130 | { | 2130 | { |
2131 | struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu); | 2131 | struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu); |
2132 | struct timer_list *tltp = &rdtp->idle_gp_timer; | 2132 | struct timer_list *tltp = &rdtp->idle_gp_timer; |
2133 | char c; | ||
2133 | 2134 | ||
2134 | sprintf(cp, "drain=%d %c timer=%lu", | 2135 | c = rdtp->dyntick_holdoff == jiffies ? 'H' : '.'; |
2135 | rdtp->dyntick_drain, | 2136 | if (timer_pending(tltp)) |
2136 | rdtp->dyntick_holdoff == jiffies ? 'H' : '.', | 2137 | sprintf(cp, "drain=%d %c timer=%lu", |
2137 | timer_pending(tltp) ? tltp->expires - jiffies : -1); | 2138 | rdtp->dyntick_drain, c, tltp->expires - jiffies); |
2139 | else | ||
2140 | sprintf(cp, "drain=%d %c timer not pending", | ||
2141 | rdtp->dyntick_drain, c); | ||
2138 | } | 2142 | } |
2139 | 2143 | ||
2140 | #else /* #ifdef CONFIG_RCU_FAST_NO_HZ */ | 2144 | #else /* #ifdef CONFIG_RCU_FAST_NO_HZ */ |