Added KUTrace Support

Moved sched_litmus back to the top scheduling class

1 files changed, 24 insertions, 0 deletions

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 3f8e22615812..24f30bb65ac4 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -37,6 +37,8 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/syscalls.h>
 
+#include <linux/kutrace.h>
+
 #ifdef CONFIG_CONTEXT_TRACKING
 /* Called on entry from user mode with IRQs off. */
 __visible inline void enter_from_user_mode(void)
@@ -287,7 +289,29 @@ __visible void do_syscall_64(unsigned long nr, struct pt_regs *regs)
 
         if (likely(nr < NR_syscalls)) {
                 nr = array_index_nospec(nr, NR_syscalls);
+                /* dsites 2019.03.05 track all syscalls and normal returns */
+                /* Pass in low 16 bits of call arg0 and return value */
+                kutrace1(KUTRACE_SYSCALL64 | kutrace_map_nr(nr), regs->di & 0xFFFFul);
+
                 regs->ax = sys_call_table[nr](regs);
+
+                /* dsites 2019.03.05 track all syscalls and normal returns */
+                /* Pass in low 16 bits of return value */
+                kutrace1(KUTRACE_SYSRET64 | kutrace_map_nr(nr), regs->ax & 0xFFFFul);
+#ifdef CONFIG_KUTRACE
+        } else if ((nr == __NR_kutrace_control) &&
+                           (kutrace_global_ops.kutrace_trace_control != NULL)) {
+                BUILD_BUG_ON_MSG(NR_syscalls > __NR_kutrace_control,
+                                "__NR_kutrace_control is too small");
+                BUILD_BUG_ON_MSG(16 > TASK_COMM_LEN,
+                                "TASK_COMM_LEN is less than 16");
+
+                /* Calling kutrace_control(u64 command, u64 arg) */
+                /* see arch/x86/calling.h: */
+                /* syscall arg0 in rdi (command), arg1 in rsi (arg) */
+                regs->ax = (*kutrace_global_ops.kutrace_trace_control)(
+                        regs->di, regs->si);
+#endif
 #ifdef CONFIG_X86_X32_ABI
         } else if (likely((nr & __X32_SYSCALL_BIT) &&
                           (nr & ~__X32_SYSCALL_BIT) < X32_NR_syscalls)) {