1 files changed, 33 insertions, 4 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index bf802b760e1f..fad4220ae49f 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -400,7 +400,7 @@ config LITMUS_SOFTIRQD_NONE
           Don't schedule tasklets in Litmus.  Default.
 
 config LITMUS_SOFTIRQD
-        bool "Spawn klmirqd interrupt handling threads."
+        bool "Enable klmirqd interrupt (and workqueue) handling threads."
         help
           Create klmirqd interrupt handling threads.  Work must be
           specifically dispatched to these workers.  (Softirqs for
@@ -423,11 +423,10 @@ endchoice
            
 
 config LITMUS_NVIDIA
-          bool "Litmus handling of NVIDIA interrupts."
+          bool "Litmus handling of NVIDIA driver."
           default n
           help
-            Direct tasklets from NVIDIA devices to Litmus's klmirqd
-                or PAI interrupt handling routines.
+            Enable Litmus control of NVIDIA driver tasklet/workqueues.
 
                 If unsure, say No.
 
@@ -444,6 +443,36 @@ config LITMUS_NVIDIA_NONSPLIT_INTERRUPTS
 
                 If unsure, say No.
 
+choice
+          prompt "Litmus handling of NVIDIA workqueues."
+          depends on LITMUS_NVIDIA
+          default LITMUS_NVIDIA_WORKQ_OFF
+          help
+                Select method for handling NVIDIA workqueues.
+
+config LITMUS_NVIDIA_WORKQ_OFF
+          bool "Use Linux's default work queues."
+          help
+                Let Linux process all NVIDIA work queue items.
+
+config LITMUS_NVIDIA_WORKQ_ON
+          bool "Schedule work with interrupt thread."
+          depends on LITMUS_SOFTIRQD
+          help
+                Direct work queue items from NVIDIA devices Litmus's
+                klmirqd handling routines. Use the same thread
+                as interrupt handling.
+
+config LITMUS_NVIDIA_WORKQ_ON_DEDICATED
+          bool "Sechedule work in dedicated threads."
+          depends on LITMUS_SOFTIRQD
+          help
+                Direct work queue items from NVIDIA devices to Litmus's
+                klmirqd handling routines. Use dedicated thread for
+                work (seperate thread from interrupt handling).
+
+endchoice
+
 config LITMUS_AFFINITY_AWARE_GPU_ASSINGMENT
           bool "Enable affinity-aware heuristics to improve GPU assignment."
           depends on LITMUS_NVIDIA && LITMUS_AFFINITY_LOCKING