From: Juri Lelli <juri.lelli@arm.com>
To: linux-kernel@vger.kernel.org, peterz@infradead.org
Cc: juri.lelli@gmail.com, mingo@redhat.com,
daniel.wagner@bmw-carit.de, vincent@legout.info,
Juri Lelli <juri.lelli@arm.com>,
Dario Faggioli <raistlin@linux.it>,
Michael Trimarchi <michael@amarulasolutions.com>,
Fabio Checconi <fchecconi@gmail.com>
Subject: [PATCH 4/4] sched/deadline: fix races between rt_mutex_setprio and dl_task_timer
Date: Fri, 24 Oct 2014 10:16:38 +0100 [thread overview]
Message-ID: <1414142198-18552-5-git-send-email-juri.lelli@arm.com> (raw)
In-Reply-To: <1414142198-18552-1-git-send-email-juri.lelli@arm.com>
dl_task_timer() is racy against several paths. Daniel noticed that
the replenishment timer may experience a race condition against an
enqueue_dl_entity() called from rt_mutex_setprio(). With his own
words:
rt_mutex_setprio() resets p->dl.dl_throttled. So the pattern is:
start_dl_timer() throttled = 1, rt_mutex_setprio() throlled = 0,
sched_switch() -> enqueue_task(), dl_task_timer-> enqueue_task()
throttled is 0
=> BUG_ON(on_dl_rq(dl_se)) fires as the scheduling entity is already
enqueued on the -deadline runqueue.
As we do for the other races, we just bail out in the replenishment
timer code.
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Reported-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Juri Lelli <juri.lelli@gmail.com>
Cc: Dario Faggioli <raistlin@linux.it>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Cc: Fabio Checconi <fchecconi@gmail.com>
Cc: linux-kernel@vger.kernel.org
---
kernel/sched/deadline.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index cf2c040..28d6088 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -518,12 +518,20 @@ again:
}
/*
- * We need to take care of a possible races here. In fact, the
- * task might have changed its scheduling policy to something
- * different from SCHED_DEADLINE or changed its reservation
- * parameters (through sched_setattr()).
+ * We need to take care of several possible races here:
+ *
+ * - the task might have changed its scheduling policy
+ * to something different than SCHED_DEADLINE
+ * - the task might have changed its reservation parameters
+ * (through sched_setattr())
+ * - the task might have been boosted by someone else and
+ * might be in the boosting/deboosting path
+ *
+ * In all this cases we bail out, as the task is already
+ * in the runqueue or is going to be enqueued back anyway.
*/
- if (!dl_task(p) || dl_se->dl_new)
+ if (!dl_task(p) || dl_se->dl_new ||
+ dl_se->dl_boosted || !dl_se->dl_throttled)
goto unlock;
sched_clock_tick();
--
2.1.2
next prev parent reply other threads:[~2014-10-24 9:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-24 9:16 [PATCH 0/4] Fix various bits of AC and PI for SCHED_DEADLINE Juri Lelli
2014-10-24 9:16 ` [PATCH 1/4] sched/deadline: fix bandwidth check/update when migrating tasks between exclusive cpusets Juri Lelli
2014-10-24 9:16 ` [PATCH 2/4] sched/deadline: ensure that updates to exclusive cpusets don't break AC Juri Lelli
2014-10-24 9:16 ` [PATCH 3/4] sched/deadline: don't replenish from a !SCHED_DEADLINE entity Juri Lelli
2014-10-28 11:01 ` [tip:sched/core] sched/deadline: Don' t " tip-bot for Juri Lelli
2014-10-24 9:16 ` Juri Lelli [this message]
2014-10-28 11:02 ` [tip:sched/core] sched/deadline: Fix races between rt_mutex_setprio() and dl_task_timer() tip-bot for Juri Lelli
2014-10-24 11:34 ` [PATCH 0/4] Fix various bits of AC and PI for SCHED_DEADLINE Daniel Wagner
2014-10-24 13:21 ` Juri Lelli
2014-10-24 13:39 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414142198-18552-5-git-send-email-juri.lelli@arm.com \
--to=juri.lelli@arm.com \
--cc=daniel.wagner@bmw-carit.de \
--cc=fchecconi@gmail.com \
--cc=juri.lelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@amarulasolutions.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=raistlin@linux.it \
--cc=vincent@legout.info \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®