re-enable klmirqd for workqueues, and grace reboot

3 files changed, 28 insertions, 6 deletions

diff --git a/include/litmus/litmus_softirq.h b/include/litmus/litmus_softirq.h
index cfef08187464..e9590835dc19 100644
--- a/include/litmus/litmus_softirq.h
+++ b/include/litmus/litmus_softirq.h
@@ -153,14 +153,27 @@ static inline int _litmus_tasklet_hi_schedule_first(
 //////////////
 
 extern int __litmus_schedule_work(
-        struct work_struct* w,
+        struct work_struct *w,
         struct task_struct *klmirqd_thread);
 
 static inline int litmus_schedule_work(
-        struct work_struct* w,
+        struct work_struct *w,
+        struct task_struct *klmirqd_thread)
+{
+        int ret = 0;
+        if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(w))) {
+                ret = __litmus_schedule_work(w, klmirqd_thread);
+        }
+        return(ret);
+}
+
+static inline int _litmus_schedule_work(
+        struct work_struct *w,
         struct task_struct *klmirqd_thread)
 {
         return(__litmus_schedule_work(w, klmirqd_thread));
 }
 
+
+
 #endif
diff --git a/include/litmus/nvidia_info.h b/include/litmus/nvidia_info.h
index 0ebe9c10c6a2..7db4a32af734 100644
--- a/include/litmus/nvidia_info.h
+++ b/include/litmus/nvidia_info.h
@@ -28,7 +28,15 @@ u32 get_work_nv_device_num(const struct work_struct *t);
 struct task_struct* get_nv_max_device_owner(u32 target_device_id);
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
-struct task_struct* get_nv_klmirqd_thread(u32 target_device_id);
+struct task_struct* get_and_lock_nvklmirqd_thread(u32 target_device_id, unsigned long* flags);
+void unlock_nvklmirqd_thread(u32 target_device_id, unsigned long* flags);
+struct task_struct* get_nvklmirqd_thread(u32 target_device_id);
+
+#if defined(CONFIG_LITMUS_NVIDIA_WORKQ_ON) || defined(CONFIG_LITMUS_NVIDIA_WORKQ_ON_DEDICATED)
+struct task_struct* get_and_lock_nvklmworkqd_thread(u32 target_device_id, unsigned long* flags);
+void unlock_nvklmworkqd_thread(u32 target_device_id, unsigned long* flags);
+struct task_struct* get_nvklmworkqd_thread(u32 target_device_id);
+#endif
 #endif
 
 /* call when the GPU-holding task, t, blocks */
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 2598cdf6088e..0d22c275dd72 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -103,7 +103,8 @@ struct st_tasklet_end_data {
 
 struct st_work_release_data {
         u64 when;
-        u64 __unused;
+        u32 device;
+        u32 __unused;
 } __attribute__((packed));
 
 struct st_work_begin_data {
@@ -408,8 +409,8 @@ feather_callback void do_sched_trace_migration(unsigned long id,
         SCHED_TRACE2(SCHED_TRACE_BASE_ID + 13, do_sched_trace_tasklet_end, t, flushed)
 
 
-#define sched_trace_work_release(t) \
-        SCHED_TRACE(SCHED_TRACE_BASE_ID + 14, do_sched_trace_work_release, t)
+#define sched_trace_work_release(t, d) \
+        SCHED_TRACE2(SCHED_TRACE_BASE_ID + 14, do_sched_trace_work_release, t, d)
 
 #define sched_trace_work_begin(t, e) \
         SCHED_TRACE2(SCHED_TRACE_BASE_ID + 15, do_sched_trace_work_begin, t, e)