From: Byungchul Park <byungchul.park@lge.com>
To: <peterz@infradead.org>, <mingo@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <juri.lelli@gmail.com>,
<rostedt@goodmis.org>, <bristot@redhat.com>,
<kernel-team@lge.com>
Subject: [PATCH v4 1/5] sched/deadline: Refer to cpudl.elements atomically
Date: Fri, 12 May 2017 14:48:45 +0900 [thread overview]
Message-ID: <1494568129-9985-2-git-send-email-byungchul.park@lge.com> (raw)
In-Reply-To: <1494568129-9985-1-git-send-email-byungchul.park@lge.com>
cpudl.elements is an instance that should be protected with a spin lock.
Without it, the code would be insane.
Current cpudl_find() has problems like,
1. cpudl.elements[0].cpu might not match with cpudl.elements[0].dl.
2. cpudl.elements[0].dl(u64) might not be referred atomically.
3. Two cpudl_maximum()s might return different values.
4. It's just insane.
Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
kernel/sched/cpudeadline.c | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c
index fba235c..6b67016 100644
--- a/kernel/sched/cpudeadline.c
+++ b/kernel/sched/cpudeadline.c
@@ -131,16 +131,39 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
cpumask_and(later_mask, cp->free_cpus, &p->cpus_allowed)) {
best_cpu = cpumask_any(later_mask);
goto out;
- } else if (cpumask_test_cpu(cpudl_maximum(cp), &p->cpus_allowed) &&
- dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
- best_cpu = cpudl_maximum(cp);
- if (later_mask)
- cpumask_set_cpu(best_cpu, later_mask);
+ } else {
+ u64 cpudl_dl;
+ int cpudl_cpu;
+ int cpudl_valid;
+ unsigned long flags;
+
+ /*
+ * Referring to cp->elements must be atomic ops.
+ */
+ raw_spin_lock_irqsave(&cp->lock, flags);
+ /*
+ * No problem even in case of very initial heap tree
+ * to which no entry has been added yet, since
+ * cp->elements[0].cpu was initialized to zero and
+ * cp->elements[0].idx was initialized to IDX_INVALID,
+ * that means the case will be filtered out at the
+ * following condition.
+ */
+ cpudl_cpu = cpudl_maximum(cp);
+ cpudl_dl = cp->elements[0].dl;
+ cpudl_valid = cp->elements[cpudl_cpu].idx;
+ raw_spin_unlock_irqrestore(&cp->lock, flags);
+
+ if (cpudl_valid != IDX_INVALID &&
+ cpumask_test_cpu(cpudl_cpu, &p->cpus_allowed) &&
+ dl_time_before(dl_se->deadline, cpudl_dl)) {
+ best_cpu = cpudl_cpu;
+ if (later_mask)
+ cpumask_set_cpu(best_cpu, later_mask);
+ }
}
out:
- WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));
-
return best_cpu;
}
--
1.9.1
next prev parent reply other threads:[~2017-05-12 5:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 5:48 [PATCH v4 0/5] Make find_later_rq() choose a closer cpu in topology Byungchul Park
2017-05-12 5:48 ` Byungchul Park [this message]
2017-05-12 14:25 ` [PATCH v4 1/5] sched/deadline: Refer to cpudl.elements atomically Steven Rostedt
2017-05-15 8:36 ` Juri Lelli
2017-05-16 7:00 ` Byungchul Park
2017-05-16 6:52 ` Byungchul Park
2017-05-16 10:32 ` Juri Lelli
2017-05-16 13:10 ` Steven Rostedt
2017-05-23 1:11 ` Byungchul Park
2017-05-12 5:48 ` [PATCH v4 2/5] sched/deadline: Make find_later_rq() choose a closer cpu in topology Byungchul Park
2017-05-12 5:48 ` [PATCH v4 3/5] sched/deadline: Change return value of cpudl_find() Byungchul Park
2017-05-12 5:48 ` [PATCH v4 4/5] sched/deadline: Add support for SD_PREFER_SIBLING on find_later_rq() Byungchul Park
2017-05-12 5:48 ` [PATCH v4 5/5] sched/rt: Add support for SD_PREFER_SIBLING on find_lowest_rq() Byungchul Park
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=1494568129-9985-2-git-send-email-byungchul.park@lge.com \
--to=byungchul.park@lge.com \
--cc=bristot@redhat.com \
--cc=juri.lelli@gmail.com \
--cc=kernel-team@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/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;
as well as URLs for NNTP newsgroup(s).