Insert trigger for enter_np()/exit_np() tracing.

2 files changed, 13 insertions, 0 deletions

diff --git a/include/linux/trace.h b/include/linux/trace.h
index e241ed45be..ae3fd3bfce 100644
--- a/include/linux/trace.h
+++ b/include/linux/trace.h
@@ -48,6 +48,11 @@ asmlinkage void save_timestamp(unsigned long event);
 #define TS_PLUGIN_TICK_START            TIMESTAMP(130)
 #define TS_PLUGIN_TICK_END              TIMESTAMP(131)
 
+#define TS_ENTER_NP_START               TIMESTAMP(140)
+#define TS_ENTER_NP_END                 TIMESTAMP(141)
+
+#define TS_EXIT_NP_START                TIMESTAMP(150)
+#define TS_EXIT_NP_END                  TIMESTAMP(151)
 
 
 #endif /* !_SYS_TRACE_H_ */
diff --git a/kernel/litmus.c b/kernel/litmus.c
index 4b0788ae8e..3715d4df6e 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -236,6 +236,8 @@ asmlinkage long sys_sleep_next_period(void)
 asmlinkage long sys_enter_np(void)
 {
         int retval = -EINVAL;
+        preempt_disable();
+        TS_ENTER_NP_START;
         if (!is_realtime(current))
                 goto out;       
         /* Let the plugin decide. The default callback will return -EPERM.
@@ -244,6 +246,8 @@ asmlinkage long sys_enter_np(void)
         TRACE("enter_np(%s/%d) => %d and np=%d\n", 
               current->comm,  current->pid, retval, is_np(current));
       out:
+        TS_ENTER_NP_END;
+        preempt_enable();
         return retval;
 }
 
@@ -258,6 +262,8 @@ asmlinkage long sys_enter_np(void)
 asmlinkage long sys_exit_np(void)
 {
         int retval = -EINVAL;
+        preempt_disable();
+        TS_EXIT_NP_START;
         if (!is_realtime(current))
                 goto out;       
         /* Let the plugin decide. The default callback will return -EPERM.
@@ -266,6 +272,8 @@ asmlinkage long sys_exit_np(void)
         TRACE("exit_np(%s/%d) => %d and np=%d\n", 
               current->comm, current->pid, retval, is_np(current));
       out:
+        TS_EXIT_NP_END;
+        preempt_enable();
         return retval;
 }