scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Bharata B Rao (2):
cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
cpuacct: add per-cgroup utime/stime statistics
Gautham R Shenoy (1):
sched: Print sched_group::__cpu_power in sched_domain_debug
Hidetoshi Seto (1):
posixtimers, sched: Fix posix clock monotonicity
Ingo Molnar (1):
sched: refresh MAINTAINERS entry
Nathan Lynch (1):
sched: do not count frozen tasks toward load
Rusty Russell (1):
sched_rt: don't allocate cpumask in fastpath
Documentation/cgroups/cpuacct.txt | 18 ++++ MAINTAINERS | 4 +- include/linux/sched.h | 3 +- kernel/posix-cpu-timers.c | 7 +- kernel/sched.c | 160 +++++++++++++++++++++++++++++++++---- kernel/sched_cpupri.c | 5 +- kernel/sched_rt.c | 15 +--- 7 files changed, 178 insertions(+), 34 deletions(-)
Documentation/cgroups/cpuacct.txt +18 -0
@@ -30,3 +30,21 @@ The above steps create a new group g1 and move the current shell process (bash) into it. CPU time consumed by this bash and its children can be obtained from g1/cpuacct.usage and the same is accumulated in /cgroups/cpuacct.usage also. + +cpuacct.stat file lists a few statistics which further divide the +CPU time obtained by the cgroup into user and system times. Currently +the following statistics are supported: + +user: Time spent by tasks of the cgroup in user mode. +system: Time spent by tasks of the cgroup in kernel mode. + +user and system are in USER_HZ unit. + +cpuacct controller uses percpu_counter interface to collect user and +system times. This has two side effects: + +- It is theoretically possible to see wrong values for user and system times. + This is because percpu_counter_read() on 32bit systems isn't safe + against concurrent writes. +- It is possible to see slightly outdated values for user and system times + due to the batch processing nature of percpu_counter.
MAINTAINERS +2 -2
@@ -3873,8 +3873,8 @@ S: Maintained SCHEDULER P: Ingo Molnar M: [email protected] -P: Robert Love [the preemptible kernel bits] -M: [email protected] +P: Peter Zijlstra +M: [email protected] L: [email protected] S: Maintained
include/linux/sched.h +2 -1
@@ -205,7 +205,8 @@ extern unsigned long long time_sync_thresh;#define task_is_stopped_or_traced (task) \ ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)#define task_contributes_to_load (task) \ - ((task->state & TASK_UNINTERRUPTIBLE) != 0) + ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ + (task->flags & PF_FROZEN) == 0)#define __set_task_state (tsk, state_value) \ do { (tsk)->state = (state_value); } while (0)
kernel/posix-cpu-timers.c +4 -3
@@ -224,7 +224,7 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p, cpu->cpu =virt_ticks (p);break ;case CPUCLOCK_SCHED : - cpu->sched = p->se.sum_exec_runtime +task_delta_exec (p); + cpu->sched =task_sched_runtime (p);break ; }return 0 ;
@@ -305,18 +305,19 @@ static int cpu_clock_sample_group(const clockid_t which_clock, {struct task_cputime cputime; -thread_group_cputime (p, &cputime);switch (CPUCLOCK_WHICH (which_clock)) {default :return -EINVAL ;case CPUCLOCK_PROF : +thread_group_cputime (p, &cputime); cpu->cpu =cputime_add (cputime.utime, cputime.stime);break ;case CPUCLOCK_VIRT : +thread_group_cputime (p, &cputime); cpu->cpu = cputime.utime;break ;case CPUCLOCK_SCHED : - cpu->sched = cputime.sum_exec_runtime +task_delta_exec (p); + cpu->sched =thread_group_sched_runtime (p);break ; }return 0 ;
kernel/sched.c +145 -15
257 lines not on this page · raw message
kernel/sched_cpupri.c +3 -2
@@ -55,7 +55,7 @@ static int convert_prio(int prio)* cpupri_find - find the best (lowest-pri) CPU in the system * @cp: The cpupri context * @p: The task -* @lowest_mask: A mask to fill in with selected CPUs +* @lowest_mask: A mask to fill in with selected CPUs (or NULL) * * Note: This function returns the recommended CPUs as calculated during the * current invokation. By the time the call returns, the CPUs may have in
@@ -81,7 +81,8 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,if (cpumask_any_and (&p->cpus_allowed, vec->mask) >= nr_cpu_ids)continue ; -cpumask_and (lowest_mask, &p->cpus_allowed, vec->mask); +if (lowest_mask) +cpumask_and (lowest_mask, &p->cpus_allowed, vec->mask);return 1 ; }
kernel/sched_rt.c +4 -11
@@ -948,20 +948,15 @@ static int select_task_rq_rt(struct task_struct *p, int sync)static void check_preempt_equal_prio (struct rq *rq,struct task_struct *p) { -cpumask_var_t mask; -if (rq->curr->rt.nr_cpus_allowed ==1 )return ; -if (!alloc_cpumask_var (&mask,GFP_ATOMIC )) -return ; -if (p->rt.nr_cpus_allowed !=1 - &&cpupri_find (&rq->rd->cpupri, p, mask)) - goto free; + &&cpupri_find (&rq->rd->cpupri, p,NULL )) +return ; -if (!cpupri_find (&rq->rd->cpupri, rq->curr, mask)) - goto free; +if (!cpupri_find (&rq->rd->cpupri, rq->curr,NULL )) +return ;/* * There appears to be other cpus that can accept
@@ -970,8 +965,6 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)*/ requeue_task_rt (rq, p,1 ); resched_task(rq->curr); -free: - free_cpumask_var(mask); }#endif /* CONFIG_SMP */