Don't preempt before time check in sleep_until_next_release()

Avoid preempting jobs that are about to go to sleep soon anyway.

2 files changed, 6 insertions, 3 deletions

diff --git a/include/litmus/jobs.h b/include/litmus/jobs.h
index 7db931b2b89f..1770e21b97c9 100644
--- a/include/litmus/jobs.h
+++ b/include/litmus/jobs.h
@@ -7,6 +7,5 @@ void release_at(struct task_struct *t, lt_t start);
 long default_wait_for_release_at(lt_t release_time);
 long complete_job(void);
 long complete_job_oneshot(void);
-long sleep_until_next_release(void);
 
 #endif
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 80649d989499..6199423086f8 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -90,12 +90,15 @@ long complete_job(void)
         return 0;
 }
 
+static long sleep_until_next_release(void);
 
 /* alternative job completion implementation that suspends the task */
 long complete_job_oneshot(void)
 {
         struct task_struct *t = current;
 
+        preempt_disable();
+
         TRACE_CUR("job completes at %llu (deadline: %llu)\n", litmus_clock(),
                 get_deadline(t));
 
@@ -106,13 +109,14 @@ long complete_job_oneshot(void)
         return sleep_until_next_release();
 }
 
-long sleep_until_next_release(void)
+/* assumes caller has disabled preemptions;
+ * re-enables preemptions before returning */
+static long sleep_until_next_release(void)
 {
         struct task_struct *t = current;
         ktime_t next_release;
         long err;
 
-        preempt_disable();
         next_release = ns_to_ktime(get_release(t));
 
         TRACE_CUR("next_release=%llu\n", get_release(t));