rcutorture: use monotonic timestamp for stall detection
Subsystems (2)
PATCH 1/1 rcutorture: use monotonic timestamp for stall detection
The get_seconds() call is deprecated because it overflows on 32-bit architectures. The algorithm in rcu_torture_stall() can deal with the overflow, but another problem here is that using a CLOCK_REALTIME stamp can lead to a false-positive stall warning when a settimeofday() happens concurrently.
Using ktime_get_seconds() instead avoids those issues and will never overflow. The added cast to 'unsigned long' however is necessary to make ULONG_CMP_LT() work correctly.
--- kernel/rcu/rcutorture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/rcu/rcutorture.c +3 -2
@@ -1446,7 +1446,7 @@ static int rcu_torture_stall(void *args)VERBOSE_TOROUT_STRING ("rcu_torture_stall end holdoff" ); }if (!kthread_should_stop ()) { - stop_at =get_seconds () + stall_cpu; + stop_at =ktime_get_seconds () + stall_cpu;/* RCU CPU stall is expected behavior in following code. */ rcu_read_lock ();if (stall_cpu_irqsoff)
@@ -1455,7 +1455,8 @@ static int rcu_torture_stall(void *args)preempt_disable ();pr_alert ("rcu_torture_stall start on CPU %d.\n" ,smp_processor_id ()); -while (ULONG_CMP_LT (get_seconds (), stop_at)) +while (ULONG_CMP_LT ((unsigned long )ktime_get_seconds (), + stop_at))continue ;/* Induce RCU CPU stall warning. */ if (stall_cpu_irqsoff)local_irq_enable ();
Signature · 1 line
2.9.0
Quoted 11 lines · Arnd Bergmann
The
get_seconds()call is deprecated because it overflows on 32-bit architectures. The algorithm inrcu_torture_stall()can deal with the overflow, but another problem here is that using aCLOCK_REALTIMEstamp can lead to a false-positive stall warning when asettimeofday()happens concurrently.Using
ktime_get_seconds()instead avoids those issues and will never overflow. The added cast to 'unsigned long' however is necessary to makeULONG_CMP_LT()work correctly.Signed-off-by Arnd Bergmann <[email protected]>
Queued for testing and review, thank you! If things go well, I expect this to be ready for the v4.19 merge window.
Thanx, Paul
Quoted 30 lines
--- kernel/rcu/rcutorture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)kernel/rcu/rcutorture.c +3
-2@@ -1446,7 +1446,7 @@ static int rcu_torture_stall(void *args)VERBOSE_TOROUT_STRING ("rcu_torture_stall end holdoff" ); }if (!kthread_should_stop ()) { - stop_at =get_seconds () + stall_cpu; + stop_at =ktime_get_seconds () + stall_cpu;/* RCU CPU stall is expected behavior in following code. */ rcu_read_lock ();if (stall_cpu_irqsoff)@@ -1455,7 +1455,8 @@ static int rcu_torture_stall(void *args)preempt_disable ();pr_alert ("rcu_torture_stall start on CPU %d.\n" ,smp_processor_id ()); -while (ULONG_CMP_LT (get_seconds (), stop_at)) +while (ULONG_CMP_LT ((unsigned long )ktime_get_seconds (), + stop_at))continue ;/* Induce RCU CPU stall warning. */ if (stall_cpu_irqsoff)local_irq_enable ();Signature · 1 line
2.9.0