|
@@ -2900,27 +2900,45 @@ dequeue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)
|
|
max_t(s64, cfs_rq->runnable_load_sum - se->avg.load_sum, 0);
|
|
max_t(s64, cfs_rq->runnable_load_sum - se->avg.load_sum, 0);
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * Task first catches up with cfs_rq, and then subtract
|
|
|
|
- * itself from the cfs_rq (task must be off the queue now).
|
|
|
|
- */
|
|
|
|
-void remove_entity_load_avg(struct sched_entity *se)
|
|
|
|
-{
|
|
|
|
- struct cfs_rq *cfs_rq = cfs_rq_of(se);
|
|
|
|
- u64 last_update_time;
|
|
|
|
-
|
|
|
|
#ifndef CONFIG_64BIT
|
|
#ifndef CONFIG_64BIT
|
|
|
|
+static inline u64 cfs_rq_last_update_time(struct cfs_rq *cfs_rq)
|
|
|
|
+{
|
|
u64 last_update_time_copy;
|
|
u64 last_update_time_copy;
|
|
|
|
+ u64 last_update_time;
|
|
|
|
|
|
do {
|
|
do {
|
|
last_update_time_copy = cfs_rq->load_last_update_time_copy;
|
|
last_update_time_copy = cfs_rq->load_last_update_time_copy;
|
|
smp_rmb();
|
|
smp_rmb();
|
|
last_update_time = cfs_rq->avg.last_update_time;
|
|
last_update_time = cfs_rq->avg.last_update_time;
|
|
} while (last_update_time != last_update_time_copy);
|
|
} while (last_update_time != last_update_time_copy);
|
|
|
|
+
|
|
|
|
+ return last_update_time;
|
|
|
|
+}
|
|
#else
|
|
#else
|
|
- last_update_time = cfs_rq->avg.last_update_time;
|
|
|
|
|
|
+static inline u64 cfs_rq_last_update_time(struct cfs_rq *cfs_rq)
|
|
|
|
+{
|
|
|
|
+ return cfs_rq->avg.last_update_time;
|
|
|
|
+}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+/*
|
|
|
|
+ * Task first catches up with cfs_rq, and then subtract
|
|
|
|
+ * itself from the cfs_rq (task must be off the queue now).
|
|
|
|
+ */
|
|
|
|
+void remove_entity_load_avg(struct sched_entity *se)
|
|
|
|
+{
|
|
|
|
+ struct cfs_rq *cfs_rq = cfs_rq_of(se);
|
|
|
|
+ u64 last_update_time;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Newly created task or never used group entity should not be removed
|
|
|
|
+ * from its (source) cfs_rq
|
|
|
|
+ */
|
|
|
|
+ if (se->avg.last_update_time == 0)
|
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
+ last_update_time = cfs_rq_last_update_time(cfs_rq);
|
|
|
|
+
|
|
__update_load_avg(last_update_time, cpu_of(rq_of(cfs_rq)), &se->avg, 0, 0, NULL);
|
|
__update_load_avg(last_update_time, cpu_of(rq_of(cfs_rq)), &se->avg, 0, 0, NULL);
|
|
atomic_long_add(se->avg.load_avg, &cfs_rq->removed_load_avg);
|
|
atomic_long_add(se->avg.load_avg, &cfs_rq->removed_load_avg);
|
|
atomic_long_add(se->avg.util_avg, &cfs_rq->removed_util_avg);
|
|
atomic_long_add(se->avg.util_avg, &cfs_rq->removed_util_avg);
|