Fixed b-OMLP bugs

1 files changed, 18 insertions, 11 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index d4635c74df1c..52db1435d5c9 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -1137,16 +1137,17 @@ int gsnedf_omlp_budgeted_lock(struct litmus_lock* l, lt_t fz_len)
 
         spin_lock_irqsave(&sem->fifo_wait.lock, flags);
 
+        /* resource is not free => must suspend and wait */
+        litmus_current_budget(&budget_used, &budget_remaining);
+        if (budget_remaining < fz_len) {
+                /* Not enough budget for the CS => deny forbidden zone access */
+                TRACE_CUR("failed forbidden zone check, %llu / %llu budget needed\n",
+                        budget_remaining, fz_len);
+                spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
+                return -EACCES;
+        }
+
         if (sem->owner) {
-                /* resource is not free => must suspend and wait */
-                litmus_current_budget(&budget_used, &budget_remaining);
-                if (fz_len < budget_remaining) {
-                        /* Not enough budget for the CS => deny forbidden zone access */
-                        TRACE_CUR("failed forbidden zone check, %llu / %llu budget needed\n",
-                                budget_remaining, fz_len);
-                        spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
-                        return -EACCES;
-                }
 
                 init_prio_waitqueue_entry(&pwq, t, get_deadline(t));
 
@@ -1183,7 +1184,7 @@ int gsnedf_omlp_budgeted_lock(struct litmus_lock* l, lt_t fz_len)
 
 int gsnedf_omlp_lock(struct litmus_lock* l)
 {
-        return gsnedf_omlp_budgeted_lock(l, ULLONG_MAX);
+        return gsnedf_omlp_budgeted_lock(l, 0);
 }
 
 int gsnedf_omlp_unlock(struct litmus_lock* l)
@@ -1236,7 +1237,13 @@ int gsnedf_omlp_unlock(struct litmus_lock* l)
 
         /* we make ourself preemptive again and lose priority inheritance (if any) */
         take_np(t);
-        clear_priority_inheritance(t);
+        if (tsk_rt(t)->inh_task)
+                clear_priority_inheritance(t);
+        else {
+                raw_spin_lock(&gsnedf_lock);
+                check_for_preemptions();
+                raw_spin_unlock(&gsnedf_lock);
+        }
 
         spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);