LITMUS: use no_rqlock_work to avoid ksoftirqd deadlock

We can't use tasklets from within the scheduler.
User no_rqlock_work instead.

3 files changed, 15 insertions, 8 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 8fc9f630c8..a4c49111aa 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -173,7 +173,10 @@ static inline lt_t litmus_clock(void)
 #define ns_to_ktime(t)          ktime_add_ns(ktime_set(0, 0), t)
 
 /* The high-resolution release timer for a task. */
-#define release_timer(t) ((t)->rt_param.job_params.release_timer)
+#define release_timer(t) ((t)->rt_param.release_timer)
+
+/* The high-resolution release timer for a task. */
+#define get_domain(t) ((t)->rt_param.domain)
 
 /* Honor the flag in the preempt_count variable that is set
  * when scheduling is in progress.
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 7b2a11c0f2..6489b0c0fd 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -5,7 +5,7 @@
 #ifndef __UNC_RT_DOMAIN_H__
 #define __UNC_RT_DOMAIN_H__
 
-#include <linux/interrupt.h>
+#include <litmus/norqlock.h>
 
 struct _rt_domain;
 
@@ -13,7 +13,7 @@ typedef int (*check_resched_needed_t)(struct _rt_domain *rt);
 typedef void (*release_job_t)(struct task_struct *t, struct _rt_domain *rt);
 
 typedef struct _rt_domain {
-        struct tasklet_struct           release_tasklet;
+        struct no_rqlock_work           arm_timers;
 
         /* runnable rt tasks are in here */
         spinlock_t                      ready_lock;
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 933c1961cb..76be2fe4be 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -38,17 +38,15 @@ struct rt_task {
 /* don't export internal data structures to user space (liblitmus) */
 #ifdef __KERNEL__
 
+struct _rt_domain;
+
 struct rt_job {
         /* Time instant the the job was or will be released.  */
         lt_t    release;
         /* What is the current deadline? */
         lt_t    deadline;
 
-        /* The high-resolution timer used to control its release. */
-        struct hrtimer release_timer;
-
-        /* How much service has this job received so far?
-         */
+        /* How much service has this job received so far? */
         lt_t    exec_time;
 
         /* Which job is this. This is used to let user space
@@ -125,6 +123,12 @@ struct rt_param {
          */
         int old_policy;
         int old_prio;
+
+        /* The high-resolution timer used to control its release. */
+        struct hrtimer release_timer;
+
+        /* ready queue for this task */
+        struct _rt_domain* domain;
 };
 
 /*      Possible RT flags       */