Merge branch 'sched/cpuset' into sched/urgent

[linux-2.6.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index d72ee9a0eacd41078b460b1692520d5d1e9d1b97..cc1f81b50b82dddb19658dc4d10dd419087a59fc 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -808,9 +808,9 @@ const_debug unsigned int sysctl_sched_nr_migrate = 32;
 
 /*
  * ratelimit for updating the group shares.
 
 /*
  * ratelimit for updating the group shares.

- * default: 0.5ms
+ * default: 0.25ms

  */
  */

-const_debug unsigned int sysctl_sched_shares_ratelimit = 500000;
+unsigned int sysctl_sched_shares_ratelimit = 250000;

 
 /*
  * period over which we measure -rt task cpu usage in us.
 
 /*
  * period over which we measure -rt task cpu usage in us.


@@ -4178,6 +4178,65 @@ void account_steal_time(struct task_struct *p, cputime_t steal)
                cpustat->steal = cputime64_add(cpustat->steal, tmp);
 }
 
                cpustat->steal = cputime64_add(cpustat->steal, tmp);
 }
 

+/*
+ * Use precise platform statistics if available:
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+cputime_t task_utime(struct task_struct *p)
+{
+       return p->utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+       return p->stime;
+}
+#else
+cputime_t task_utime(struct task_struct *p)
+{
+       clock_t utime = cputime_to_clock_t(p->utime),
+               total = utime + cputime_to_clock_t(p->stime);
+       u64 temp;
+
+       /*
+        * Use CFS's precise accounting:
+        */
+       temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
+
+       if (total) {
+               temp *= utime;
+               do_div(temp, total);
+       }
+       utime = (clock_t)temp;
+
+       p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
+       return p->prev_utime;
+}
+
+cputime_t task_stime(struct task_struct *p)
+{
+       clock_t stime;
+
+       /*
+        * Use CFS's precise accounting. (we subtract utime from
+        * the total, to make sure the total observed by userspace
+        * grows monotonically - apps rely on that):
+        */
+       stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
+                       cputime_to_clock_t(task_utime(p));
+
+       if (stime >= 0)
+               p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
+
+       return p->prev_stime;
+}
+#endif
+
+inline cputime_t task_gtime(struct task_struct *p)
+{
+       return p->gtime;
+}
+

 /*
  * This function gets called by the timer code, with HZ frequency.
  * We call it with interrupts disabled.
 /*
  * This function gets called by the timer code, with HZ frequency.
  * We call it with interrupts disabled.


@@ -4669,6 +4728,52 @@ int __sched wait_for_completion_killable(struct completion *x)
 }
 EXPORT_SYMBOL(wait_for_completion_killable);
 
 }
 EXPORT_SYMBOL(wait_for_completion_killable);
 

+/**
+ *     try_wait_for_completion - try to decrement a completion without blocking
+ *     @x:     completion structure
+ *
+ *     Returns: 0 if a decrement cannot be done without blocking
+ *              1 if a decrement succeeded.
+ *
+ *     If a completion is being used as a counting completion,
+ *     attempt to decrement the counter without blocking. This
+ *     enables us to avoid waiting if the resource the completion
+ *     is protecting is not available.
+ */
+bool try_wait_for_completion(struct completion *x)
+{
+       int ret = 1;
+
+       spin_lock_irq(&x->wait.lock);
+       if (!x->done)
+               ret = 0;
+       else
+               x->done--;
+       spin_unlock_irq(&x->wait.lock);
+       return ret;
+}
+EXPORT_SYMBOL(try_wait_for_completion);
+
+/**
+ *     completion_done - Test to see if a completion has any waiters
+ *     @x:     completion structure
+ *
+ *     Returns: 0 if there are waiters (wait_for_completion() in progress)
+ *              1 if there are no waiters.
+ *
+ */
+bool completion_done(struct completion *x)
+{
+       int ret = 1;
+
+       spin_lock_irq(&x->wait.lock);
+       if (!x->done)
+               ret = 0;
+       spin_unlock_irq(&x->wait.lock);
+       return ret;
+}
+EXPORT_SYMBOL(completion_done);
+

 static long __sched
 sleep_on_common(wait_queue_head_t *q, int state, long timeout)
 {
 static long __sched
 sleep_on_common(wait_queue_head_t *q, int state, long timeout)
 {


@@ -5740,6 +5845,8 @@ static inline void sched_init_granularity(void)
                sysctl_sched_latency = limit;
 
        sysctl_sched_wakeup_granularity *= factor;
                sysctl_sched_latency = limit;
 
        sysctl_sched_wakeup_granularity *= factor;

+
+       sysctl_sched_shares_ratelimit *= factor;

 }
 
 #ifdef CONFIG_SMP
 }
 
 #ifdef CONFIG_SMP


@@ -8469,8 +8576,8 @@ struct task_group *sched_create_group(struct task_group *parent)
        WARN_ON(!parent); /* root should already exist */
 
        tg->parent = parent;
        WARN_ON(!parent); /* root should already exist */
 
        tg->parent = parent;

-       list_add_rcu(&tg->siblings, &parent->children);

        INIT_LIST_HEAD(&tg->children);
        INIT_LIST_HEAD(&tg->children);

+       list_add_rcu(&tg->siblings, &parent->children);

        spin_unlock_irqrestore(&task_group_lock, flags);
 
        return tg;
        spin_unlock_irqrestore(&task_group_lock, flags);
 
        return tg;