1 files changed, 50 insertions, 16 deletions

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 1c42e08fdfaa..4d7b1a3e4d01 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -216,7 +216,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
 
 asmlinkage void __do_softirq(void)
 {
-    struct softirq_action *h; 
+    struct softirq_action *h;
     __u32 pending;
     int max_restart = MAX_SOFTIRQ_RESTART;
     int cpu;
@@ -254,10 +254,10 @@ restart:
                        softirq_to_name[vec_nr], h->action,
                        prev_count, preempt_count());
                 preempt_count() = prev_count;
-            }   
+            }
 
             rcu_bh_qs(cpu);
-        }   
+        }
         h++;
         pending >>= 1;
     } while (pending);
@@ -412,13 +412,45 @@ struct tasklet_head
 static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
 static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
 
+#ifdef CONFIG_LITMUS_NVIDIA
+static int __do_nv_now(struct tasklet_struct* tasklet)
+{
+        int success = 1;
+
+        if(tasklet_trylock(tasklet)) {
+                if (!atomic_read(&tasklet->count)) {
+                        if (!test_and_clear_bit(TASKLET_STATE_SCHED, &tasklet->state)) {
+                                BUG();
+                        }
+                        tasklet->func(tasklet->data);
+                        tasklet_unlock(tasklet);
+                }
+                else {
+                        success = 0;
+                }
+
+                tasklet_unlock(tasklet);
+        }
+        else {
+                success = 0;
+        }
+
+        return success;
+}
+#endif
+
 
 void __tasklet_schedule(struct tasklet_struct *t)
 {
 #ifdef CONFIG_LITMUS_NVIDIA
         if(is_nvidia_func(t->func))
         {
-                u32 nvidia_device = get_tasklet_nv_device_num(t);       
+#if 0
+                // do nvidia tasklets right away and return
+                if(__do_nv_now(t))
+                        return;
+#else
+                u32 nvidia_device = get_tasklet_nv_device_num(t);
                 //              TRACE("%s: Handling NVIDIA tasklet for device\t%u\tat\t%llu\n",
                 //                        __FUNCTION__, nvidia_device,litmus_clock());
 
@@ -438,7 +470,7 @@ void __tasklet_schedule(struct tasklet_struct *t)
                         if(is_realtime(device_owner))
                         {
                                 TRACE("%s: Handling NVIDIA tasklet for device %u at %llu\n",
-                                          __FUNCTION__, nvidia_device,litmus_clock());                          
+                                          __FUNCTION__, nvidia_device,litmus_clock());
                                 TRACE("%s: the owner task %d of NVIDIA Device %u is RT-task\n",
                                           __FUNCTION__,device_owner->pid,nvidia_device);
 
@@ -461,7 +493,9 @@ void __tasklet_schedule(struct tasklet_struct *t)
                         }
                 }
                 unlock_nv_registry(nvidia_device, &flags);
+#endif
         }
+
 #endif
 
         ___tasklet_schedule(t);
@@ -487,19 +521,19 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
 {
 #ifdef CONFIG_LITMUS_NVIDIA
         if(is_nvidia_func(t->func))
-        {       
+        {
                 u32 nvidia_device = get_tasklet_nv_device_num(t);
                 //              TRACE("%s: Handling NVIDIA tasklet for device\t%u\tat\t%llu\n",
                 //                        __FUNCTION__, nvidia_device,litmus_clock());
 
                 unsigned long flags;
                 struct task_struct* device_owner;
-                
+
                 lock_nv_registry(nvidia_device, &flags);
-                
+
                 device_owner = get_nv_max_device_owner(nvidia_device);
 
-                if(device_owner==NULL) 
+                if(device_owner==NULL)
                 {
                         t->owner = NULL;
                 }
@@ -508,10 +542,10 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
                         if( is_realtime(device_owner))
                         {
                                 TRACE("%s: Handling NVIDIA tasklet for device %u\tat %llu\n",
-                                          __FUNCTION__, nvidia_device,litmus_clock());                          
+                                          __FUNCTION__, nvidia_device,litmus_clock());
                                 TRACE("%s: the owner task %d of NVIDIA Device %u is RT-task\n",
                                           __FUNCTION__,device_owner->pid,nvidia_device);
-                                
+
                                 t->owner = device_owner;
                                 sched_trace_tasklet_release(t->owner);
                                 if(likely(_litmus_tasklet_hi_schedule(t,nvidia_device)))
@@ -553,15 +587,15 @@ EXPORT_SYMBOL(___tasklet_hi_schedule);
 void __tasklet_hi_schedule_first(struct tasklet_struct *t)
 {
         BUG_ON(!irqs_disabled());
-#ifdef CONFIG_LITMUS_NVIDIA     
+#ifdef CONFIG_LITMUS_NVIDIA
         if(is_nvidia_func(t->func))
-        {       
+        {
                 u32 nvidia_device = get_tasklet_nv_device_num(t);
                 //              TRACE("%s: Handling NVIDIA tasklet for device\t%u\tat\t%llu\n",
                 //                        __FUNCTION__, nvidia_device,litmus_clock());
                 unsigned long flags;
                 struct task_struct* device_owner;
-                
+
                 lock_nv_registry(nvidia_device, &flags);
 
                 device_owner = get_nv_max_device_owner(nvidia_device);
@@ -576,10 +610,10 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
                         {
                                 TRACE("%s: Handling NVIDIA tasklet for device %u at %llu\n",
                                           __FUNCTION__, nvidia_device,litmus_clock());
-                                
+
                                 TRACE("%s: the owner task %d of NVIDIA Device %u is RT-task\n",
                                           __FUNCTION__,device_owner->pid,nvidia_device);
-                                
+
                                 t->owner = device_owner;
                                 sched_trace_tasklet_release(t->owner);
                                 if(likely(_litmus_tasklet_hi_schedule_first(t,nvidia_device)))