torture: Move stutter_wait() timeouts to hrtimers

[ Upstream commit 10af43671e8bf4ac153c4991a17cdf57bc6d2cfe ]

In order to gain better race coverage, move the test start/stop
waits in stutter_wait() to torture_hrtimeout_jiffies().

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Stable-dep-of: cca42bd8eb1b ("rcutorture: Fix stuttering races and other issues")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/torture.c b/kernel/torture.c
index 4a2e0512f91977e561f85cf5e2f4d0080480ae90..a55cb70b192fcdedc5baa37d6e961f7db16ebc70 100644 (file)
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -734,7 +734,7 @@ bool stutter_wait(const char *title)
                        ret = true;
                }
                if (spt == 1) {
-                       schedule_timeout_interruptible(1);
+                       torture_hrtimeout_jiffies(1, NULL);
                } else if (spt == 2) {
                        while (READ_ONCE(stutter_pause_test)) {
                                if (!(i++ & 0xffff))
@@ -742,7 +742,7 @@ bool stutter_wait(const char *title)
                                cond_resched();
                        }
                } else {
-                       schedule_timeout_interruptible(round_jiffies_relative(HZ));
+                       torture_hrtimeout_jiffies(round_jiffies_relative(HZ), NULL);
                }
                torture_shutdown_absorb(title);
        }