[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-746db9443ea57fd9c059f62c4bfbf41cf224fe13@git.kernel.org>
Date: Mon, 23 Mar 2015 05:24:11 -0700
From: tip-bot for Brian Silverman <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, brian@...oton-tech.com, hpa@...or.com,
stable@...r.kernel.org, peterz@...radead.org,
linux-kernel@...r.kernel.org, mingo@...nel.org
Subject: [tip:sched/core] sched: Fix RLIMIT_RTTIME when PI-boosting to RT
Commit-ID: 746db9443ea57fd9c059f62c4bfbf41cf224fe13
Gitweb: http://git.kernel.org/tip/746db9443ea57fd9c059f62c4bfbf41cf224fe13
Author: Brian Silverman <brian@...oton-tech.com>
AuthorDate: Wed, 18 Feb 2015 16:23:56 -0800
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 23 Mar 2015 10:47:55 +0100
sched: Fix RLIMIT_RTTIME when PI-boosting to RT
When non-realtime tasks get priority-inheritance boosted to a realtime
scheduling class, RLIMIT_RTTIME starts to apply to them. However, the
counter used for checking this (the same one used for SCHED_RR
timeslices) was not getting reset. This meant that tasks running with a
non-realtime scheduling class which are repeatedly boosted to a realtime
one, but never block while they are running realtime, eventually hit the
timeout without ever running for a time over the limit. This patch
resets the realtime timeslice counter when un-PI-boosting from an RT to
a non-RT scheduling class.
I have some test code with two threads and a shared PTHREAD_PRIO_INHERIT
mutex which induces priority boosting and spins while boosted that gets
killed by a SIGXCPU on non-fixed kernels but doesn't with this patch
applied. It happens much faster with a CONFIG_PREEMPT_RT kernel, and
does happen eventually with PREEMPT_VOLUNTARY kernels.
Signed-off-by: Brian Silverman <brian@...oton-tech.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: austin@...oton-tech.com
Cc: <stable@...r.kernel.org>
Link: http://lkml.kernel.org/r/1424305436-6716-1-git-send-email-brian@peloton-tech.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/sched/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f0f831e..62671f5 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3034,6 +3034,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
} else {
if (dl_prio(oldprio))
p->dl.dl_boosted = 0;
+ if (rt_prio(oldprio))
+ p->rt.timeout = 0;
p->sched_class = &fair_sched_class;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists