[COMMON] sched/rt: Adding task_change_group for RT

Change-Id: I4723d85597b86d2ac7914470dd01fcfddd573da0
Signed-off-by: Johnlay Park <jonglae.park@samsung.com>

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 0f03d5dfa087c4d62ee29bd343f59badc2789531..0ec3a6f29f72ab9977078001b97cbcb743bc956e 100644 (file)
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1287,6 +1287,38 @@ void dec_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
        dec_rt_group(rt_se, rt_rq);
 }
 
+#ifdef CONFIG_SMP
+static void
+attach_entity_load_avg(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se)
+{
+       rt_se->avg.last_update_time = rt_rq->avg.last_update_time;
+       rt_rq->avg.util_avg += rt_se->avg.util_avg;
+       rt_rq->avg.util_sum += rt_se->avg.util_sum;
+       rt_rq->avg.load_avg += rt_se->avg.load_avg;
+       rt_rq->avg.load_sum += rt_se->avg.load_sum;
+       /* Need to do something about
+        * propagate_avg of rt_rq, rt_rq_util_change()
+        */
+}
+
+static void
+detach_entity_load_avg(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se)
+{
+       sub_positive(&rt_rq->avg.util_avg, rt_se->avg.util_avg);
+       sub_positive(&rt_rq->avg.util_sum, rt_se->avg.util_sum);
+       sub_positive(&rt_rq->avg.load_avg, rt_se->avg.load_avg);
+       sub_positive(&rt_rq->avg.load_sum, rt_se->avg.load_sum);
+       /* Need to do something about
+        * propagate_avg of rt_rq, rt_rq_util_change()
+        */
+}
+#else
+static inline void
+attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}
+static inline void
+detach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}
+#endif
+
 /*
  * Change rt_se->run_list location unless SAVE && !MOVE
  *
@@ -1540,6 +1572,58 @@ out:
        return cpu;
 }
 
+static void attach_task_rt_rq(struct task_struct *p)
+{
+       struct sched_rt_entity *rt_se = &p->rt;
+       struct rt_rq *rt_rq = rt_rq_of_se(rt_se);
+       u64 now = rq_clock_task(rq_of_rt_rq(rt_rq));
+
+       update_rt_load_avg(now, rt_se);
+       attach_entity_load_avg(rt_rq, rt_se);
+}
+
+static void detach_task_rt_rq(struct task_struct *p)
+{
+       struct sched_rt_entity *rt_se = &p->rt;
+       struct rt_rq *rt_rq = rt_rq_of_se(rt_se);
+       u64 now = rq_clock_task(rq_of_rt_rq(rt_rq));
+
+       update_rt_load_avg(now, rt_se);
+       detach_entity_load_avg(rt_rq, rt_se);
+}
+
+#ifdef CONFIG_RT_GROUP_SCHED
+static void task_set_group_rt(struct task_struct *p)
+{
+       set_task_rq(p, task_cpu(p));
+}
+
+static void task_move_group_rt(struct task_struct *p)
+{
+       detach_task_rt_rq(p);
+       set_task_rq(p, task_cpu(p));
+
+#ifdef CONFIG_SMP
+       /* Tell se's cfs_rq has been changed -- migrated */
+       p->se.avg.last_update_time = 0;
+#endif
+       attach_task_rt_rq(p);
+}
+
+static void task_change_group_rt(struct task_struct *p, int type)
+{
+       switch (type) {
+       case TASK_SET_GROUP:
+               task_set_group_rt(p);
+               break;
+
+       case TASK_MOVE_GROUP:
+               task_move_group_rt(p);
+               break;
+       }
+}
+#endif
+
 static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)
 {
        /*
@@ -2535,6 +2619,9 @@ const struct sched_class rt_sched_class = {
        .switched_to            = switched_to_rt,
 
        .update_curr            = update_curr_rt,
+#ifdef CONFIG_RT_GROUP_SCHED
+       .task_change_group      = task_change_group_rt,
+#endif
 };
 
 #ifdef CONFIG_RT_GROUP_SCHED