Moved logic to make task NP when checking FZ to occur earlier.

1 files changed, 7 insertions, 4 deletions

diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index 7819ab90069f..65ca2b8c9fd6 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -1100,6 +1100,13 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len)
         t_res = (struct reservation *) tsk_rt(t)->plugin_state;
         gedf_res = container_of(t_res, struct gedf_reservation, res);
 
+        /* make task non-preemptive, even if it must suspend because
+         * of a forbidden zone; will be cleared by a user-space call */
+        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");
+
         /* if in a forbidden zone, wait until the next time slice */
         /* note that we can't use t_res->par_env->res->cur_budget
          * because it is only updated on a call to schedule(), and
@@ -1134,10 +1141,6 @@ 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);
         }