Updated how NP works in OMLP lock and forbidden zones

1 files changed, 6 insertions, 6 deletions

diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index ef9751542d0a..b73aa0f1c434 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -1066,9 +1066,6 @@ int gedf_env_omlp_lock(struct litmus_lock* l)
                 spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
         }
 
-        // Make the task non-preemptive until the lock is released
-        make_np(t);
-
         tsk_rt(t)->num_locks_held++;
 
         return 0;
@@ -1135,6 +1132,10 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len)
 
                 TS_LOCK_RESUME;
         } else {
+                if (likely(tsk_rt(t)->ctrl_page))
+                        tsk_rt(t)->ctrl_page->sched.np.flag = 1;
+                else
+                        TRACE_TASK(t, "Can't make task user-space np: no ctrl page\n");
                 spin_unlock_irqrestore(&gedf_env->fz_waiters[cpu].lock, flags);
         }
 
@@ -1158,9 +1159,6 @@ static int gedf_env_omlp_unlock(struct litmus_lock* l)
 
         tsk_rt(t)->num_locks_held--;
 
-        // Make the task preemptive again
-        take_np(t);
-
         /* check if there are jobs waiting for this resource */
         next = omlp_dequeue(sem);
         if (next) {
@@ -1204,6 +1202,8 @@ static int gedf_env_omlp_unlock(struct litmus_lock* l)
                 clear_priority_inheritance(t);
 
 out:
+        if (likely(tsk_rt(t)->ctrl_page))
+                tsk_rt(t)->ctrl_page->sched.np.flag = 0;
         spin_unlock_irqrestore(&sem->fifo_wait.lock, flags);
 
         return err;