From 15533bcbb492f8243ae140e8381862c60a5899e8 Mon Sep 17 00:00:00 2001
From: Paul Turner <pjt@google.com>
Date: Mon, 15 Nov 2010 15:47:08 -0800
Subject: [PATCH] --- yaml --- r: 223993 b: refs/heads/master c:
 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37 h: refs/heads/master i:   223991:
 0d93270f77dbaea03feb05a581f7f7f79e3174da v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/sched.c      |  9 ++++++++-
 trunk/kernel/sched_fair.c | 12 ++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cea73ac0968c..4b7fd405fb84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c66eaf619c0c7937e9ded160ae83b5a7a6b19b56
+refs/heads/master: 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index dadab4d13875..e914a716e1d4 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -353,9 +353,16 @@ struct cfs_rq {
 	 */
 	unsigned long h_load;
 
+	/*
+	 * Maintaining per-cpu shares distribution for group scheduling
+	 *
+	 * load_stamp is the last time we updated the load average
+	 * load_last is the last time we updated the load average and saw load
+	 * load_unacc_exec_time is currently unaccounted execution time
+	 */
 	u64 load_avg;
 	u64 load_period;
-	u64 load_stamp, load_last;
+	u64 load_stamp, load_last, load_unacc_exec_time;
 
 	unsigned long load_contribution;
 #endif
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 33f941dcf88c..e7e2f08e6d01 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -539,6 +539,9 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	return calc_delta_fair(sched_slice(cfs_rq, se), se);
 }
 
+static void update_cfs_load(struct cfs_rq *cfs_rq);
+static void update_cfs_shares(struct cfs_rq *cfs_rq, long weight_delta);
+
 /*
  * Update the current task's runtime statistics. Skip current tasks that
  * are not in our scheduling class.
@@ -558,6 +561,14 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
 
 	curr->vruntime += delta_exec_weighted;
 	update_min_vruntime(cfs_rq);
+
+#ifdef CONFIG_FAIR_GROUP_SCHED
+	cfs_rq->load_unacc_exec_time += delta_exec;
+	if (cfs_rq->load_unacc_exec_time > sysctl_sched_shares_window) {
+		update_cfs_load(cfs_rq);
+		update_cfs_shares(cfs_rq, 0);
+	}
+#endif
 }
 
 static void update_curr(struct cfs_rq *cfs_rq)
@@ -713,6 +724,7 @@ static void update_cfs_load(struct cfs_rq *cfs_rq)
 	}
 
 	cfs_rq->load_stamp = now;
+	cfs_rq->load_unacc_exec_time = 0;
 	cfs_rq->load_period += delta;
 	if (load) {
 		cfs_rq->load_last = now;