Skip to contentSkip to conversation

sched/rt: silence double clock update warning by using rq_lock wrappers

PATCH In review Phil Auld 2 participants 3 messages Aug 15, 2019 – Sep 16, 2019 Scheduler

lore
Share & tools
lore

Phil Auld

author
#0 lore raw

PATCH 1/1 sched/rt: silence double clock update warning by using rq_lock wrappers

With WARN_DOUBLE_CLOCK enabled a false positive warning can occur in rt

        [] rq->clock_update_flags & RQCF_UPDATED
        [] WARNING: CPU: 6 PID: 21426 at kernel/sched/core.c:225 
						update_rq_clock+0x90/0x130
          [] Call Trace:
          []  update_rq_clock+0x90/0x130
          []  sched_rt_period_timer+0x11f/0x340
          []  __hrtimer_run_queues+0x100/0x280
          []  hrtimer_interrupt+0x100/0x220
          []  smp_apic_timer_interrupt+0x6a/0x130
          []  apic_timer_interrupt+0xf/0x20

sched_rt_period_timer does:

                raw_spin_lock(&rq->lock);
                update_rq_clock(rq);

which triggers the warning because of not using the rq_lock wrappers. So, use the wrappers.

Cc Peter Zijlstra (Intel) <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Valentin Schneider <[email protected]>
Cc Dietmar Eggemann <[email protected]>
---
 kernel/sched/rt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/rt.c +3 -2
index a532558a5176..0846e71114ee 100644
@@ -831,6 +831,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
 		int enqueue = 0;
 		struct rt_rq *rt_rq = sched_rt_period_rt_rq(rt_b, i);
 		struct rq *rq = rq_of_rt_rq(rt_rq);
+		struct rq_flags rf;
 		int skip;
 
 		/*
@@ -845,7 +846,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
 		if (skip)
 			continue;
 
-		raw_spin_lock(&rq->lock);
+		rq_lock(rq, &rf);
 		update_rq_clock(rq);
 
 		if (rt_rq->rt_time) {
@@ -883,7 +884,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
 
 		if (enqueue)
 			sched_rt_rq_enqueue(rt_rq);
-		raw_spin_unlock(&rq->lock);
+		rq_unlock(rq, &rf);
 	}
 
 	if (!throttled && (!rt_bandwidth_enabled() || rt_b->rt_runtime == RUNTIME_INF))
Signature · 1 line
2.18.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Phil Auld

With WARN_DOUBLE_CLOCK enabled a false positive warning can occur in rt

        [] rq->clock_update_flags & RQCF_UPDATED
        [] WARNING: CPU: 6 PID: 21426 at kernel/sched/core.c:225 
						update_rq_clock+0x90/0x130
          [] Call Trace:
          []  update_rq_clock+0x90/0x130
          []  sched_rt_period_timer+0x11f/0x340
          []  __hrtimer_run_queues+0x100/0x280
          []  hrtimer_interrupt+0x100/0x220
          []  smp_apic_timer_interrupt+0x6a/0x130
          []  apic_timer_interrupt+0xf/0x20

sched_rt_period_timer does:

                raw_spin_lock(&rq->lock);
                update_rq_clock(rq);
Quoted 8 lines

which triggers the warning because of not using the rq_lock wrappers. So, use the wrappers.

Cc Peter Zijlstra (Intel) <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Valentin Schneider <[email protected]>
Cc Dietmar Eggemann <[email protected]>

Looks sane to me, and no missing _irqsave this time around ;)

#2 lore raw

[Added Steven to Cc]

Quoted 27 lines · Valentin Schneider
Quoted 17 lines · Phil Auld

With WARN_DOUBLE_CLOCK enabled a false positive warning can occur in rt

        [] rq->clock_update_flags & RQCF_UPDATED
        [] WARNING: CPU: 6 PID: 21426 at kernel/sched/core.c:225 
						update_rq_clock+0x90/0x130
          [] Call Trace:
          []  update_rq_clock+0x90/0x130
          []  sched_rt_period_timer+0x11f/0x340
          []  __hrtimer_run_queues+0x100/0x280
          []  hrtimer_interrupt+0x100/0x220
          []  smp_apic_timer_interrupt+0x6a/0x130
          []  apic_timer_interrupt+0xf/0x20

sched_rt_period_timer does:

                raw_spin_lock(&rq->lock);
                update_rq_clock(rq);
Quoted 8 lines

which triggers the warning because of not using the rq_lock wrappers. So, use the wrappers.

Cc Peter Zijlstra (Intel) <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Valentin Schneider <[email protected]>
Cc Dietmar Eggemann <[email protected]>
Quoted 4 lines

Looks sane to me, and no missing _irqsave this time around ;)

Stumbled on that one while reviewing my inbox, ping?