4 files changed, 72 insertions, 3 deletions

diff --git a/arch/x86/include/asm/feather_trace.h b/arch/x86/include/asm/feather_trace.h
index 86a4303fce7a..4fd31633405d 100644
--- a/arch/x86/include/asm/feather_trace.h
+++ b/arch/x86/include/asm/feather_trace.h
@@ -11,8 +11,7 @@ static inline unsigned long long ft_timestamp(void)
 #ifdef CONFIG_X86_32
 #include "feather_trace_32.h"
 #else
-/* not ready for integration yet */
-//#include "feather_trace_64.h"
+#include "feather_trace_64.h"
 #endif
 
 #endif
diff --git a/arch/x86/include/asm/feather_trace_64.h b/arch/x86/include/asm/feather_trace_64.h
new file mode 100644
index 000000000000..1cffa4eec5f4
--- /dev/null
+++ b/arch/x86/include/asm/feather_trace_64.h
@@ -0,0 +1,69 @@
+/* Do not directly include this file. Include feather_trace.h instead */
+
+/* regparm is the default on x86_64 */
+#define feather_callback
+
+# define _EVENT_TABLE(id,from,to) \
+            ".section __event_table, \"aw\"\n\t" \
+            ".balign 8\n\t" \
+            ".quad " #id  ", 0, " #from ", " #to " \n\t" \
+            ".previous \n\t"
+
+/*
+ * x86_64 callee only owns rbp, rbx, r12 -> r15
+ * the called can freely modify the others
+ */
+#define CLOBBER_LIST    "memory", "cc", "rdi", "rsi", "rdx", "rcx", \
+                        "r8", "r9", "r10", "r11", "rax"
+
+#define ft_event(id, callback)                                  \
+        __asm__ __volatile__(                                   \
+            "1: jmp 2f                                    \n\t" \
+            " call " #callback "                          \n\t" \
+            _EVENT_TABLE(id,1b,2f) \
+            "2:                                           \n\t" \
+        : : : CLOBBER_LIST)
+
+#define ft_event0(id, callback)                                 \
+        __asm__ __volatile__(                                   \
+            "1: jmp 2f                                    \n\t" \
+            " movq $" #id ", %%rdi                        \n\t" \
+            " call " #callback "                          \n\t" \
+            _EVENT_TABLE(id,1b,2f) \
+            "2:                                           \n\t" \
+        : :  : CLOBBER_LIST)
+
+#define ft_event1(id, callback, param)                          \
+        __asm__ __volatile__(                                   \
+            "1: jmp 2f                                    \n\t" \
+            " movq %0, %%rsi                              \n\t" \
+            " movq $" #id ", %%rdi                        \n\t" \
+            " call " #callback "                          \n\t" \
+            _EVENT_TABLE(id,1b,2f) \
+            "2:                                           \n\t" \
+        : : "r" (param)  : CLOBBER_LIST)
+
+#define ft_event2(id, callback, param, param2)                  \
+        __asm__ __volatile__(                                   \
+            "1: jmp 2f                                    \n\t" \
+            " movq %1, %%rdx                              \n\t" \
+            " movq %0, %%rsi                              \n\t" \
+            " movq $" #id ", %%rdi                        \n\t" \
+            " call " #callback "                          \n\t" \
+            _EVENT_TABLE(id,1b,2f) \
+            "2:                                           \n\t" \
+        : : "r" (param), "r" (param2)  : CLOBBER_LIST)
+
+#define ft_event3(id, callback, p, p2, p3)                      \
+        __asm__ __volatile__(                                   \
+            "1: jmp 2f                                    \n\t" \
+            " movq %2, %%rcx                              \n\t" \
+            " movq %1, %%rdx                              \n\t" \
+            " movq %0, %%rsi                              \n\t" \
+            " movq $" #id ", %%rdi                        \n\t" \
+            " call " #callback "                          \n\t" \
+            _EVENT_TABLE(id,1b,2f) \
+            "2:                                           \n\t" \
+        : : "r" (p), "r" (p2), "r" (p3)  : CLOBBER_LIST)
+
+#define __ARCH_HAS_FEATHER_TRACE
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index c780fdfcccae..b452be1d2256 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -96,6 +96,7 @@ static inline struct task_struct* __peek_ready(rt_domain_t* rt)
 
 static inline int  is_queued(struct task_struct *t)
 {
+        BUG_ON(!tsk_rt(t)->heap_node);
         return bheap_node_in_heap(tsk_rt(t)->heap_node);
 }
 
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index b59105110d7f..39a543e22d41 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -64,7 +64,7 @@ module_init(init_sched_task_trace);
 
 static inline struct st_event_record* get_record(u8 type, struct task_struct* t)
 {
-        struct st_event_record* rec;
+        struct st_event_record* rec = NULL;
         struct local_buffer* buf;
 
         buf = &get_cpu_var(st_event_buffer);