Commit 156ec6f4 authored by Juri Lelli's avatar Juri Lelli Committed by Ingo Molnar

sched/features: Fix hrtick reprogramming

Hung tasks and RCU stall cases were reported on systems which were not
100% busy. Investigation of such unexpected cases (no sign of potential
starvation caused by tasks hogging the system) pointed out that the
periodic sched tick timer wasn't serviced anymore after a certain point
and that caused all machinery that depends on it (timers, RCU, etc.) to
stop working as well. This issues was however only reproducible if
HRTICK was enabled.

Looking at core dumps it was found that the rbtree of the hrtimer base
used also for the hrtick was corrupted (i.e. next as seen from the base
root and actual leftmost obtained by traversing the tree are different).
Same base is also used for periodic tick hrtimer, which might get "lost"
if the rbtree gets corrupted.

Much alike what described in commit 1f71addd ("tick/sched: Do not
mess with an enqueued hrtimer") there is a race window between
hrtimer_set_expires() in hrtick_start and hrtimer_start_expires() in
__hrtick_restart() in which the former might be operating on an already
queued hrtick hrtimer, which might lead to corruption of the base.

Use hrtick_start() (which removes the timer before enqueuing it back) to
ensure hrtick hrtimer reprogramming is entirely guarded by the base
lock, so that no race conditions can occur.
Signed-off-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Signed-off-by: default avatarLuis Claudio R. Goncalves <lgoncalv@redhat.com>
Signed-off-by: default avatarDaniel Bristot de Oliveira <bristot@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20210208073554.14629-2-juri.lelli@redhat.com
parent de40f33e
...@@ -355,8 +355,9 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer) ...@@ -355,8 +355,9 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer)
static void __hrtick_restart(struct rq *rq) static void __hrtick_restart(struct rq *rq)
{ {
struct hrtimer *timer = &rq->hrtick_timer; struct hrtimer *timer = &rq->hrtick_timer;
ktime_t time = rq->hrtick_time;
hrtimer_start_expires(timer, HRTIMER_MODE_ABS_PINNED_HARD); hrtimer_start(timer, time, HRTIMER_MODE_ABS_PINNED_HARD);
} }
/* /*
...@@ -380,7 +381,6 @@ static void __hrtick_start(void *arg) ...@@ -380,7 +381,6 @@ static void __hrtick_start(void *arg)
void hrtick_start(struct rq *rq, u64 delay) void hrtick_start(struct rq *rq, u64 delay)
{ {
struct hrtimer *timer = &rq->hrtick_timer; struct hrtimer *timer = &rq->hrtick_timer;
ktime_t time;
s64 delta; s64 delta;
/* /*
...@@ -388,9 +388,7 @@ void hrtick_start(struct rq *rq, u64 delay) ...@@ -388,9 +388,7 @@ void hrtick_start(struct rq *rq, u64 delay)
* doesn't make sense and can cause timer DoS. * doesn't make sense and can cause timer DoS.
*/ */
delta = max_t(s64, delay, 10000LL); delta = max_t(s64, delay, 10000LL);
time = ktime_add_ns(timer->base->get_time(), delta); rq->hrtick_time = ktime_add_ns(timer->base->get_time(), delta);
hrtimer_set_expires(timer, time);
if (rq == this_rq()) if (rq == this_rq())
__hrtick_restart(rq); __hrtick_restart(rq);
......
...@@ -1031,6 +1031,7 @@ struct rq { ...@@ -1031,6 +1031,7 @@ struct rq {
call_single_data_t hrtick_csd; call_single_data_t hrtick_csd;
#endif #endif
struct hrtimer hrtick_timer; struct hrtimer hrtick_timer;
ktime_t hrtick_time;
#endif #endif
#ifdef CONFIG_SCHEDSTATS #ifdef CONFIG_SCHEDSTATS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment