sched: task_times() explosion avoidance for tasks with > 2^32 acrued ticks
If stime + utime > 2^32, and lower 32 are 0 when user calls getrusage(), you've got a dead box.
kernel/sched/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
@@ -3151,7 +3151,7 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)*/ rtime =nsecs_to_cputime (p->se.sum_exec_runtime); -if (total) { +if (total && total == (__force u32 ) total) {u64 temp = (__force u64 ) rtime; temp *= (__force u64 ) utime;
@@ -3184,7 +3184,7 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) total = cputime.utime + cputime.stime; rtime =nsecs_to_cputime (cputime.sum_exec_runtime); -if (total) { +if (total && total == (__force u32 ) total) {u64 temp = (__force u64 ) rtime; temp *= (__force u64 ) cputime.utime;
Wrong xx.
sched: task_times() explosion avoidance for tasks with > 2^32 accrued ticks
If stime + utime > 2^32, and lower 32 are 0 when user calls getrusage(), you've got a dead box.
kernel/sched/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
@@ -3155,7 +3155,7 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)u64 temp = (__force u64 ) rtime; temp *= (__force u64 ) utime; -do_div (temp, (__force u32 ) total); + temp =div64_u64 (temp, (__force u64 ) total); utime = (__force cputime_t ) temp; }else utime = rtime;
@@ -3188,7 +3188,7 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)u64 temp = (__force u64 ) rtime; temp *= (__force u64 ) cputime.utime; -do_div (temp, (__force u32 ) total); + temp =div64_u64 (temp, (__force u64 ) total); utime = (__force cputime_t ) temp; }else utime = rtime;
PATCH 1/1 sched,rt: fix isolated CPUs leaving root_task_group indefinitely throttled
Speaking of old "parches" lying about, the below fixes a real problem if you're using either 'should die' isolcpus or 'should work' cpusets to isolate cores.
sched,rt: fix isolated CPUs leaving root_task_group indefinitely throttled
Root task group bandwidth replenishment must service all CPUs, regardless of where the timer was last started, and regardless of the isolation mechanism, lest 'Quoth the Raven, "Nevermore"' become rt scheduling policy.
--- kernel/sched/rt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
kernel/sched/rt.c +13 -0
@@ -788,6 +788,19 @@ static int do_sched_rt_period_timer(struconst struct cpumask *span; span =sched_rt_period_mask (); +#ifdef CONFIG_RT_GROUP_SCHED +/* +* FIXME: isolated CPUs should really leave the root task group, +* whether they are isolcpus or were isolated via cpusets, lest +* the timer run on a CPU which does not service all runqueues, +* potentially leaving other CPUs indefinitely throttled. If +* isolation is really required, the user will turn the throttle +* off to kill the perturbations it causes anyway. Meanwhile, +* this maintains functionality for boot and/or troubleshooting. +*/ +if (rt_b == &root_task_group.rt_bandwidth) + span = cpu_online_mask; +#endif for_each_cpu (i, span) {int enqueue =0 ;struct rt_rq *rt_rq =sched_rt_period_rt_rq (rt_b, i);
[tip:sched/urgent] sched,rt: fix isolated CPUs leaving root_task_group indefinitely throttled
Commit-ID: e221d028bb08b47e624c5f0a31732c642db9d19a Gitweb: http://git.kernel.org/tip/e221d028bb08b47e624c5f0a31732c642db9d19a Author: Mike Galbraith <[email protected]> AuthorDate: Tue, 7 Aug 2012 10:02:38 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 13 Aug 2012 18:41:55 +0200
sched,rt: fix isolated CPUs leaving root_task_group indefinitely throttled
Root task group bandwidth replenishment must service all CPUs, regardless of where the timer was last started, and regardless of the isolation mechanism, lest 'Quoth the Raven, "Nevermore"' become rt scheduling policy.
--- kernel/sched/rt.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
kernel/sched/rt.c +13 -0
@@ -788,6 +788,19 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)const struct cpumask *span; span =sched_rt_period_mask (); +#ifdef CONFIG_RT_GROUP_SCHED +/* +* FIXME: isolated CPUs should really leave the root task group, +* whether they are isolcpus or were isolated via cpusets, lest +* the timer run on a CPU which does not service all runqueues, +* potentially leaving other CPUs indefinitely throttled. If +* isolation is really required, the user will turn the throttle +* off to kill the perturbations it causes anyway. Meanwhile, +* this maintains functionality for boot and/or troubleshooting. +*/ +if (rt_b == &root_task_group.rt_bandwidth) + span = cpu_online_mask; +#endif for_each_cpu (i, span) {int enqueue =0 ;struct rt_rq *rt_rq =sched_rt_period_rt_rq (rt_b, i);