8 files changed, 96 insertions, 51 deletions

diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 8d3125c493b2..75b565194437 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -131,6 +131,11 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
         return 0;
 }
 
+static inline unsigned int cpumask_last(const struct cpumask *srcp)
+{
+        return 0;
+}
+
 /* Valid inputs for n are -1 and 0. */
 static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
 {
@@ -179,6 +184,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
         return find_first_bit(cpumask_bits(srcp), nr_cpumask_bits);
 }
 
+/**
+ * cpumask_last - get the last CPU in a cpumask
+ * @srcp:       - the cpumask pointer
+ *
+ * Returns      >= nr_cpumask_bits if no CPUs set.
+ */
+static inline unsigned int cpumask_last(const struct cpumask *srcp)
+{
+        return find_last_bit(cpumask_bits(srcp), nr_cpumask_bits);
+}
+
 unsigned int cpumask_next(int n, const struct cpumask *srcp);
 
 /**
diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 2cdd74809899..627efac73e6d 100644
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -3,6 +3,7 @@
 #define IOPRIO_H
 
 #include <linux/sched.h>
+#include <linux/sched/rt.h>
 #include <linux/iocontext.h>
 
 /*
@@ -63,7 +64,7 @@ static inline int task_nice_ioclass(struct task_struct *task)
 {
         if (task->policy == SCHED_IDLE)
                 return IOPRIO_CLASS_IDLE;
-        else if (task->policy == SCHED_FIFO || task->policy == SCHED_RR)
+        else if (task_is_realtime(task))
                 return IOPRIO_CLASS_RT;
         else
                 return IOPRIO_CLASS_BE;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index fdf74f27acf1..a5dc7c98b0a2 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -166,8 +166,6 @@ struct task_group;
 /* Task command name length: */
 #define TASK_COMM_LEN                   16
 
-extern cpumask_var_t                    cpu_isolated_map;
-
 extern void scheduler_tick(void);
 
 #define MAX_SCHEDULE_TIMEOUT            LONG_MAX
@@ -332,9 +330,11 @@ struct load_weight {
 struct sched_avg {
         u64                             last_update_time;
         u64                             load_sum;
+        u64                             runnable_load_sum;
         u32                             util_sum;
         u32                             period_contrib;
         unsigned long                   load_avg;
+        unsigned long                   runnable_load_avg;
         unsigned long                   util_avg;
 };
 
@@ -377,6 +377,7 @@ struct sched_statistics {
 struct sched_entity {
         /* For load-balancing: */
         struct load_weight              load;
+        unsigned long                   runnable_weight;
         struct rb_node                  run_node;
         struct list_head                group_node;
         unsigned int                    on_rq;
@@ -472,10 +473,10 @@ struct sched_dl_entity {
          * conditions between the inactive timer handler and the wakeup
          * code.
          */
-        int                             dl_throttled;
-        int                             dl_boosted;
-        int                             dl_yielded;
-        int                             dl_non_contending;
+        int                             dl_throttled      : 1;
+        int                             dl_boosted        : 1;
+        int                             dl_yielded        : 1;
+        int                             dl_non_contending : 1;
 
         /*
          * Bandwidth enforcement timer. Each -deadline task has its
@@ -1246,7 +1247,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
 #define TASK_REPORT_IDLE        (TASK_REPORT + 1)
 #define TASK_REPORT_MAX         (TASK_REPORT_IDLE << 1)
 
-static inline unsigned int __get_task_state(struct task_struct *tsk)
+static inline unsigned int task_state_index(struct task_struct *tsk)
 {
         unsigned int tsk_state = READ_ONCE(tsk->state);
         unsigned int state = (tsk_state | tsk->exit_state) & TASK_REPORT;
@@ -1259,7 +1260,7 @@ static inline unsigned int __get_task_state(struct task_struct *tsk)
         return fls(state);
 }
 
-static inline char __task_state_to_char(unsigned int state)
+static inline char task_index_to_char(unsigned int state)
 {
         static const char state_char[] = "RSDTtXZPI";
 
@@ -1270,7 +1271,7 @@ static inline char __task_state_to_char(unsigned int state)
 
 static inline char task_state_to_char(struct task_struct *tsk)
 {
-        return __task_state_to_char(__get_task_state(tsk));
+        return task_index_to_char(task_state_index(tsk));
 }
 
 /**
diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
new file mode 100644
index 000000000000..d849431c8060
--- /dev/null
+++ b/include/linux/sched/isolation.h
@@ -0,0 +1,51 @@
+#ifndef _LINUX_SCHED_ISOLATION_H
+#define _LINUX_SCHED_ISOLATION_H
+
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/tick.h>
+
+enum hk_flags {
+        HK_FLAG_TIMER           = 1,
+        HK_FLAG_RCU             = (1 << 1),
+        HK_FLAG_MISC            = (1 << 2),
+        HK_FLAG_SCHED           = (1 << 3),
+        HK_FLAG_TICK            = (1 << 4),
+        HK_FLAG_DOMAIN          = (1 << 5),
+};
+
+#ifdef CONFIG_CPU_ISOLATION
+DECLARE_STATIC_KEY_FALSE(housekeeping_overriden);
+extern int housekeeping_any_cpu(enum hk_flags flags);
+extern const struct cpumask *housekeeping_cpumask(enum hk_flags flags);
+extern void housekeeping_affine(struct task_struct *t, enum hk_flags flags);
+extern bool housekeeping_test_cpu(int cpu, enum hk_flags flags);
+extern void __init housekeeping_init(void);
+
+#else
+
+static inline int housekeeping_any_cpu(enum hk_flags flags)
+{
+        return smp_processor_id();
+}
+
+static inline const struct cpumask *housekeeping_cpumask(enum hk_flags flags)
+{
+        return cpu_possible_mask;
+}
+
+static inline void housekeeping_affine(struct task_struct *t,
+                                       enum hk_flags flags) { }
+static inline void housekeeping_init(void) { }
+#endif /* CONFIG_CPU_ISOLATION */
+
+static inline bool housekeeping_cpu(int cpu, enum hk_flags flags)
+{
+#ifdef CONFIG_CPU_ISOLATION
+        if (static_branch_unlikely(&housekeeping_overriden))
+                return housekeeping_test_cpu(cpu, flags);
+#endif
+        return true;
+}
+
+#endif /* _LINUX_SCHED_ISOLATION_H */
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
index db865ed25ef3..e5af028c08b4 100644
--- a/