1 files changed, 33 insertions, 5 deletions

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index dc0f435a2779..e0e129993958 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -6,6 +6,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/stop_machine.h>
+#include <linux/irq_work.h>
 #include <linux/tick.h>
 #include <linux/slab.h>
 
@@ -362,8 +363,14 @@ struct cfs_rq {
          * Under CFS, load is tracked on a per-entity basis and aggregated up.
          * This allows for the description of both thread and group usage (in
          * the FAIR_GROUP_SCHED case).
+         * runnable_load_avg is the sum of the load_avg_contrib of the
+         * sched_entities on the rq.
+         * blocked_load_avg is similar to runnable_load_avg except that its
+         * the blocked sched_entities on the rq.
+         * utilization_load_avg is the sum of the average running time of the
+         * sched_entities on the rq.
          */
-        unsigned long runnable_load_avg, blocked_load_avg;
+        unsigned long runnable_load_avg, blocked_load_avg, utilization_load_avg;
         atomic64_t decay_counter;
         u64 last_decay;
         atomic_long_t removed_load;
@@ -418,6 +425,11 @@ static inline int rt_bandwidth_enabled(void)
         return sysctl_sched_rt_runtime >= 0;
 }
 
+/* RT IPI pull logic requires IRQ_WORK */
+#ifdef CONFIG_IRQ_WORK
+# define HAVE_RT_PUSH_IPI
+#endif
+
 /* Real-Time classes' related field in a runqueue: */
 struct rt_rq {
         struct rt_prio_array active;
@@ -435,7 +447,13 @@ struct rt_rq {
         unsigned long rt_nr_total;
         int overloaded;
         struct plist_head pushable_tasks;
+#ifdef HAVE_RT_PUSH_IPI
+        int push_flags;
+        int push_cpu;
+        struct irq_work push_work;
+        raw_spinlock_t push_lock;
 #endif
+#endif /* CONFIG_SMP */
         int rt_queued;
 
         int rt_throttled;
@@ -597,6 +615,7 @@ struct rq {
         struct sched_domain *sd;
 
         unsigned long cpu_capacity;
+        unsigned long cpu_capacity_orig;
 
         unsigned char idle_balance;
         /* For active balancing */
@@ -807,7 +826,7 @@ struct sched_group_capacity {
          * CPU capacity of this group, SCHED_LOAD_SCALE being max capacity
          * for a single CPU.
          */
-        unsigned int capacity, capacity_orig;
+        unsigned int capacity;
         unsigned long next_update;
         int imbalance; /* XXX unrelated to capacity but shared group state */
         /*
@@ -1368,9 +1387,18 @@ static inline int hrtick_enabled(struct rq *rq)
 
 #ifdef CONFIG_SMP
 extern void sched_avg_update(struct rq *rq);
+
+#ifndef arch_scale_freq_capacity
+static __always_inline
+unsigned long arch_scale_freq_capacity(struct sched_domain *sd, int cpu)
+{
+        return SCHED_CAPACITY_SCALE;
+}
+#endif
+
 static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta)
 {
-        rq->rt_avg += rt_delta;
+        rq->rt_avg += rt_delta * arch_scale_freq_capacity(NULL, cpu_of(rq));
         sched_avg_update(rq);
 }
 #else
@@ -1643,8 +1671,8 @@ extern void print_rt_stats(struct seq_file *m, int cpu);
 extern void print_dl_stats(struct seq_file *m, int cpu);
 
 extern void init_cfs_rq(struct cfs_rq *cfs_rq);
-extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq);
-extern void init_dl_rq(struct dl_rq *dl_rq, struct rq *rq);
+extern void init_rt_rq(struct rt_rq *rt_rq);
+extern void init_dl_rq(struct dl_rq *dl_rq);
 
 extern void cfs_bandwidth_usage_inc(void);
 extern void cfs_bandwidth_usage_dec(void);