adaptive: check for pending weight changes on scheduler tick

2 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/rt_param.h b/include/linux/rt_param.h
index d14e2129b1..f0690a4af4 100644
--- a/include/linux/rt_param.h
+++ b/include/linux/rt_param.h
@@ -211,6 +211,7 @@ typedef struct task_rt_param {
         ((t)->rt_param.service_level[get_cur_sl(t)])
 #define get_cur_sl(t)           ((t)->rt_param.cur_service_level)
 #define get_max_sl(t)           ((t)->rt_param.no_service_levels - 1)
+#define get_opt_sl(t)           ((t)->rt_param.opt_level)
 
 #define is_realtime(t)          ((t)->rt_param.is_realtime)
 #define is_subject_to_srp(t)    ((t)->rt_param.subject_to_srp)
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index 0eaba83758..e36d74ae2c 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -588,12 +588,18 @@ static reschedule_check_t adaptive_scheduler_tick(void)
 
 
         /* only the first CPU needs to release jobs */
-        if (get_rt_mode() == MODE_RT_RUN && smp_processor_id() == 0) {
+        if (get_rt_mode() == MODE_RT_RUN) {
                 queue_lock_irqsave(&adaptive_lock, flags);
                 
                 /* (1) run the optimizer if it did not trigger often enough */
                 if (time_before_eq(last_optimizer_run + optimizer_period, jiffies))
                         adaptive_optimize();
+                else if (is_realtime(t) && 
+                         get_cur_sl(t) != get_opt_sl(t) &&
+                         time_before_eq(t->rt_param.opt_change, jiffies)) {
+                        opt_time = jiffies;
+                        enact_weight_change(t);
+                }
 
                 /* (2) try to release pending jobs */
                 adaptive_release_jobs();