omlp_fz_police bug fixupdate_litmus_2019

4 files changed, 14 insertions, 13 deletions

diff --git a/kernel/sched/litmus.c b/kernel/sched/litmus.c
index a28aa5ab28f7..2e3ca79d39a9 100644
--- a/kernel/sched/litmus.c
+++ b/kernel/sched/litmus.c
@@ -362,7 +362,7 @@ const struct sched_class litmus_sched_class = {
          * cpu-hotplug or cpu throttling. Allows Litmus to use up to 1.0
          * CPU capacity.
          */
-        .next                   = &stop_sched_class,
+        .next                   = &fair_sched_class,
         .enqueue_task           = enqueue_task_litmus,
         .dequeue_task           = dequeue_task_litmus,
         .yield_task             = yield_task_litmus,
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index babfdd90c6a5..12d40dfd715f 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2363,7 +2363,7 @@ static unsigned int get_rr_interval_rt(struct rq *rq, struct task_struct *task)
 }
 
 const struct sched_class rt_sched_class = {
-        .next                   = &fair_sched_class,
+        .next                   = &litmus_sched_class,
         .enqueue_task           = enqueue_task_rt,
         .dequeue_task           = dequeue_task_rt,
         .yield_task             = yield_task_rt,
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index c4f7afbe90c0..ebbd4c05289b 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1798,7 +1798,7 @@ static inline void set_next_task(struct rq *rq, struct task_struct *next)
  * class, but existing plugins (that predate the stop-machine class) depend on
  * the assumption that LITMUS^RT plugins are the top scheduling class.
  */
-#define sched_class_highest (&litmus_sched_class)
+#define sched_class_highest (&stop_sched_class)
 
 /*
 #ifdef CONFIG_SMP
diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index c5dd7032ab42..395852076773 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -1165,6 +1165,9 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len, lt_
         spin_unlock_irqrestore(&gedf_env->fz_waiters[0].lock, flags);
         spin_lock_irqsave(&gedf_env->fz_waiters[cpu].lock, flags);
 
+        BUG_ON(!tsk_rt(t)->ctrl_page);
+        tsk_rt(t)->ctrl_page->fz_progress = FZ_DONE;
+
         /* cancel fz police timer */
         hrtimer_try_to_cancel(&sem->police_timer);
 
@@ -1173,8 +1176,6 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len, lt_
         remaining_component_budget = timeslice_end - litmus_clock();
 
         if (remaining_component_budget < fz_len) {
-                if (likely(tsk_rt(t)->ctrl_page))
-                        tsk_rt(t)->ctrl_page->fz_progress = 0;
                 /* go on a wait queue to be woken up when the parent reservation
                 * is next scheduled */
                 init_waitqueue_entry(&wait, t);
@@ -1193,8 +1194,6 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len, lt_
         } else
                 spin_unlock_irqrestore(&gedf_env->fz_waiters[cpu].lock, flags);
 
-        BUG_ON(!tsk_rt(t)->ctrl_page);
-
         tsk_rt(t)->ctrl_page->sched.np.flag = 1;
         tsk_rt(t)->ctrl_page->fz_progress = FZ_PRE_GPU_LAUNCH;
         hrtimer_start(&sem->police_timer,
@@ -1293,13 +1292,16 @@ static enum hrtimer_restart omlp_fz_police(struct hrtimer *timer)
         unsigned long flags;
         struct kernel_siginfo info;
 
+        spin_lock_irqsave(&sem->fifo_wait.lock, flags);
+        if (t != sem->owner) {
+                spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
+                return HRTIMER_NORESTART;
+        }
+
         BUG_ON(!tsk_rt(t)->ctrl_page);
 
         if (tsk_rt(t)->ctrl_page->fz_progress) {
                 /* we try to unlock for the task that violated fz */
-                spin_lock_irqsave(&sem->fifo_wait.lock, flags);
-
-                BUG_ON(sem->owner != t);
 
                 __gedf_env_omlp_unlock(sem, t); 
 
@@ -1310,11 +1312,10 @@ static enum hrtimer_restart omlp_fz_police(struct hrtimer *timer)
                 info.si_int = -(int)tsk_rt(t)->ctrl_page->fz_progress;
                 send_sig_info(SIGTERM, &info, t);
 
-                tsk_rt(t)->ctrl_page->fz_progress = FZ_DONE;
+                //tsk_rt(t)->ctrl_page->fz_progress = FZ_DONE;
                 tsk_rt(t)->ctrl_page->sched.np.flag = 0;
-
-                spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
         }
+        spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
 
         return HRTIMER_NORESTART;
 }