Integrate ft_irq_fired() with Linux

This patch hooks up Feather-Trace's ft_irq_fired() handler with
Linux's interrupt handling infrastructure.

4 files changed, 25 insertions, 0 deletions

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index f4af03404b97..b01723cf13cf 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -7,6 +7,7 @@
 #include <linux/vtime.h>
 #include <asm/hardirq.h>
 
+#include <litmus/trace_irq.h>
 
 extern void synchronize_irq(unsigned int irq);
 extern bool synchronize_hardirq(unsigned int irq);
@@ -37,6 +38,7 @@ extern void rcu_nmi_exit(void);
                 account_irq_enter_time(current);        \
                 preempt_count_add(HARDIRQ_OFFSET);      \
                 trace_hardirq_enter();                  \
+                ft_irq_fired();                         \
         } while (0)
 
 /*
@@ -67,6 +69,7 @@ extern void irq_exit(void);
                 preempt_count_add(NMI_OFFSET + HARDIRQ_OFFSET); \
                 rcu_nmi_enter();                                \
                 trace_hardirq_enter();                          \
+                ft_irq_fired();                                 \
         } while (0)
 
 #define nmi_exit()                                              \
diff --git a/include/litmus/trace_irq.h b/include/litmus/trace_irq.h
new file mode 100644
index 000000000000..0d0c042ba9c3
--- /dev/null
+++ b/include/litmus/trace_irq.h
@@ -0,0 +1,14 @@
+#ifndef _LITMUS_TRACE_IRQ_H_
+#define _LITMUS_TRACE_IRQ_H_
+
+#ifdef CONFIG_SCHED_OVERHEAD_TRACE
+
+void ft_irq_fired(void);
+
+#else
+
+#define ft_irq_fired() /* nothing to do */
+
+#endif
+
+#endif
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 123673291ffb..f286554e3395 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1550,7 +1550,12 @@ void scheduler_ipi(void)
         preempt_fold_need_resched();
 
         if (llist_empty(&this_rq()->wake_list) && !got_nohz_idle_kick())
+        {
+                /* If we don't call irq_enter(), we need to triggger the IRQ
+                 * tracing manually. */
+                ft_irq_fired();
                 return;
+        }
 
         /*
          * Not all reschedule IPI handlers call irq_enter/irq_exit, since
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 479e4436f787..99fe8b877e53 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -244,6 +244,9 @@ asmlinkage __visible void __do_softirq(void)
          */
         current->flags &= ~PF_MEMALLOC;
 
+        /* Mark Feather-Trace samples as "disturbed". */
+        ft_irq_fired();
+
         pending = local_softirq_pending();
         account_irq_enter_time(current);