12 files changed, 277 insertions, 22 deletions

diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 4a2afa1bac51..b6552b189bcd 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -25,7 +25,7 @@ targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
 
 export CPPFLAGS_vdso.lds += -P -C
 
-VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -Wl,-soname=linux-vdso.so.1 \
+VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
                         -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
 
 $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
@@ -69,7 +69,7 @@ vdso32.so-$(VDSO32-y)		+= sysenter
 vdso32-images                   = $(vdso32.so-y:%=vdso32-%.so)
 
 CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
-VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1
+VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-soname=linux-gate.so.1
 
 # This makes sure the $(obj) subdirectory exists even though vdso32/
 # is not a kbuild sub-make subdirectory.
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 4322d59c0e8f..d5dbc82f0dfc 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -44,6 +44,8 @@ void litmus_exit_task(struct task_struct *tsk);
 
 #define tsk_rt(t)               (&(t)->rt_param)
 
+#define get_server_job(t) (tsk_rt(t)->job_params.fake_job_no)
+
 /*      Realtime utility macros */
 #define get_rt_flags(t)         (tsk_rt(t)->flags)
 #define set_rt_flags(t,f)       (tsk_rt(t)->flags=(f))
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 55419d411614..4293575d3472 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -85,6 +85,7 @@ struct rt_job {
 
         lt_t    real_release;
         lt_t    real_deadline;
+        unsigned int fake_job_no;
 
         /* How much service has this job received so far? */
         lt_t    exec_time;
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 32c23974e45a..0f529fa78b4d 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -69,6 +69,9 @@ typedef long (*admit_task_t)(struct task_struct* tsk);
 
 typedef void (*release_at_t)(struct task_struct *t, lt_t start);
 
+/* TODO remove me */
+typedef void (*release_ts_t)(lt_t time);
+
 struct sched_plugin {
         struct list_head        list;
         /*      basic info              */
@@ -95,6 +98,8 @@ struct sched_plugin {
         task_block_t            task_block;
         task_exit_t             task_exit;
 
+        release_ts_t            release_ts;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /*      locking protocols       */
         allocate_lock_t         allocate_lock;
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 6868a07dac46..368bd3dc3be8 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -181,6 +181,13 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 #define trace_litmus_task_resume(t)
 #define trace_litmus_sys_release(start)
 
+#define trace_litmus_container_param(cid, name)
+#define trace_litmus_server_param(sid, cid, wcet, time)
+#define trace_litmus_server_switch_to(sid, job, tid)
+#define trace_litmus_server_switch_away(sid, job, tid)
+#define trace_litmus_server_release(sid, job, release, deadline)
+#define trace_litmus_server_completion(sid, job)
+
 #endif
 
 
@@ -258,6 +265,35 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
         sched_trace_log_message("%d P%d      [%s@%s:%d]: Took %llu\n\n", \
                 TRACE_ARGS, litmus_clock() - _qt_start)
 
+#define sched_trace_container_param(cid, name)                          \
+        do {                                                            \
+                trace_litmus_container_param(cid, name);                \
+        } while (0)
+
+#define sched_trace_server_param(sid, cid, wcet, period)                \
+        do {                                                            \
+                trace_litmus_server_param(sid, cid, wcet, period);      \
+        } while(0)
+
+#define sched_trace_server_switch_to(sid, job, tid)                     \
+        do {                                                            \
+                trace_litmus_server_switch_to(sid, job, tid);           \
+        } while(0)
+
+#define sched_trace_server_switch_away(sid, job, tid)                   \
+        do {                                                            \
+                trace_litmus_server_switch_away(sid, job, tid);         \
+        } while (0)
+
+#define sched_trace_server_release(sid, job, rel, dead)                 \
+        do {                                                            \
+                trace_litmus_server_release(sid, job, rel, dead);       \
+        } while (0)
+
+#define sched_trace_server_completion(sid, job)                         \
+        do {                                                            \
+                trace_litmus_server_completion(sid, job);               \
+        } while (0)
 
 #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */
 
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 0fffcee02be0..5ca4bef205f0 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -11,10 +11,6 @@
 
 #include <litmus/litmus.h>
 #include <litmus/rt_param.h>
-
-/*
- * Tracing task admission
- */
 TRACE_EVENT(litmus_task_param,
 
         TP_PROTO(struct task_struct *t),
@@ -24,9 +20,9 @@ TRACE_EVENT(litmus_task_param,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          wcet    )
-                __field( lt_t,          period  )
-                __field( lt_t,          phase   )
+                __field( unsigned long long,            wcet    )
+                __field( unsigned long long,            period  )
+                __field( unsigned long long,            phase   )
                 __field( int,           partition )
         ),
 
@@ -56,8 +52,8 @@ TRACE_EVENT(litmus_task_release,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          release )
-                __field( lt_t,          deadline        )
+                __field( unsigned long long,            release )
+                __field( unsigned long long,            deadline        )
         ),
 
         TP_fast_assign(
@@ -84,8 +80,8 @@ TRACE_EVENT(litmus_switch_to,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
-                __field( lt_t,          exec_time       )
+                __field( unsigned long long,            when    )
+                __field( unsigned long long,            exec_time       )
         ),
 
         TP_fast_assign(
@@ -112,8 +108,8 @@ TRACE_EVENT(litmus_switch_away,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
-                __field( lt_t,          exec_time       )
+                __field( unsigned long long,            when    )
+                __field( unsigned long long,            exec_time       )
         ),
 
         TP_fast_assign(
@@ -140,7 +136,7 @@ TRACE_EVENT(litmus_task_completion,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
                 __field( unsigned long, forced  )
         ),
 
@@ -167,7 +163,7 @@ TRACE_EVENT(litmus_task_block,
 
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -190,7 +186,7 @@ TRACE_EVENT(litmus_task_resume,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -208,13 +204,13 @@ TRACE_EVENT(litmus_task_resume,
  */
 TRACE_EVENT(litmus_sys_release,
 
-        TP_PROTO(lt_t *start),
+        TP_PROTO(unsigned long long *start),
 
         TP_ARGS(start),
 
         TP_STRUCT__entry(
-                __field( lt_t,          rel     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            rel     )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -225,6 +221,135 @@ TRACE_EVENT(litmus_sys_release,
         TP_printk("SynRelease(%Lu) at %Lu\n", __entry->rel, __entry->when)
 );
 
+/*
+ * Containers
+ */
+TRACE_EVENT(litmus_container_param,
+
+        TP_PROTO(int cid, const char *name),
+
+        TP_ARGS(cid, name),
+
+        TP_STRUCT__entry(
+                __field( int,  cid )
+                __array( char,  name,   TASK_COMM_LEN   )
+        ),
+
+        TP_fast_assign(
+               memcpy(__entry->name, name, TASK_COMM_LEN);
+               __entry->cid = cid;
+        ),
+
+        TP_printk("container, name: %s, id: %d\n", __entry->name, __entry->cid)
+);
+
+TRACE_EVENT(litmus_server_param,
+
+        TP_PROTO(int sid, int cid, unsigned long long wcet, unsigned long long period),
+
+        TP_ARGS(sid, cid, wcet, period),
+
+        TP_STRUCT__entry(
+                __field( int, sid )
+                __field( int, cid )
+                __field( unsigned long long, wcet )
+                __field( unsigned long long, period )
+        ),
+
+        TP_fast_assign(
+               __entry->cid = cid;
+               __entry->sid = sid;
+               __entry->wcet = wcet;
+               __entry->period = period;
+        ),
+
+        TP_printk("server(%llu, %llu), sid: %llu, cont: %llu\n",
+                  __entry->wcet, __entry->period, __entry->sid, __entry->cid)
+);
+
+TRACE_EVENT(litmus_server_switch_to,
+
+        TP_PROTO(int sid, unsigned int job, int tid),
+
+        TP_ARGS(sid, job, tid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( int, tid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->tid = tid;
+                __entry->job = job;
+        ),
+
+        TP_printk("switch_to(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
+);
+
+TRACE_EVENT(litmus_server_switch_away,
+
+        TP_PROTO(int sid, unsigned int job, int tid),
+
+        TP_ARGS(sid, job, tid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( int, tid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->tid = tid;
+        ),
+
+        TP_printk("switch_away(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
+);
+
+TRACE_EVENT(litmus_server_release,
+
+        TP_PROTO(int sid, unsigned int job, unsigned long long release, unsigned long long deadline),
+
+        TP_ARGS(sid, job, release, deadline),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( unsigned long long, release)
+                __field( unsigned long long, deadline)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->job = job;
+                __entry->release = release;
+                __entry->deadline = deadline;
+        ),
+
+        TP_printk("release(server(%d, %u)), release: %llu, deadline: %llu\n",  __entry->sid, __entry->job, __entry->release, __entry->deadline)
+);
+
+TRACE_EVENT(litmus_server_completion,
+
+        TP_PROTO(int sid, int job),
+
+        TP_ARGS(sid, job),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->job = job;
+        ),
+
+        TP_printk("completion(server(%d, %d))\n", __entry->sid, __entry->job)
+);
+
 #endif /* _SCHED_TASK_TRACEPOINT_H */
 
 /* Must stay outside the protection */
diff --git a/litmus/budget.c b/litmus/budget.c
index 93945e0911a7..172c12b369da 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -124,8 +124,13 @@ void server_release(struct task_struct *t)
         t->rt_param.job_params.exec_time = 0;
         t->rt_param.job_params.release = t->rt_param.job_params.deadline;
         t->rt_param.job_params.deadline +=  get_rt_period(t);
+        t->rt_param.job_params.fake_job_no++;
         /* don't confuse linux */
         t->rt.time_slice = 1;
+
+        sched_trace_server_release(-t->pid, get_server_job(t),
+                                    t->rt_param.job_params.release,
+                                    t->rt_param.job_params.deadline);
 }
 
 module_init(init_budget_enforcement);
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 53b475e840f0..eb8ae7fab95a 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -124,6 +124,11 @@ static int interrupt_cpu;
         STRACE("%s P%d, linked=" TS " " fmt,                    \
               (ce)->domain->name, crit_cpu(ce)->cpu, TA((ce)->linked), ##args)
 
+static int sid(struct crit_entry *ce)
+{
+        return ce->level * num_online_cpus() + crit_cpu(ce)->cpu;
+}
+
 /*
  * Sort CPUs within a global domain's heap.
  */
@@ -302,6 +307,7 @@ static void link_task_to_crit(struct crit_entry *ce,
                                 update_ghost_time(ce->linked);
                         }
                 }
+                sched_trace_server_switch_away(sid(ce), 0, ce->linked->pid);
         }
 
         /* Actually link task */
@@ -317,6 +323,10 @@ static void link_task_to_crit(struct crit_entry *ce,
                         when_to_fire = task->se.exec_start +
                                 tsk_mc_data(task)->mc_job.ghost_budget;
                         arm_ghost(ce, when_to_fire);
+
+                        sched_trace_server_switch_to(sid(ce), 0, 0);
+                } else {
+                        sched_trace_server_switch_to(sid(ce), 0, task->pid);
                 }
         }
 }
@@ -420,8 +430,17 @@ static void link_task_to_cpu(struct cpu_entry *entry, struct task_struct *task)
         BUG_ON(task && tsk_rt(task)->linked_on != entry->cpu);
         BUG_ON(task && is_ghost(task));
 
+        if (entry->linked) {
+                sched_trace_server_switch_away(-entry->linked->pid,
+                                               get_server_job(entry->linked),
+                                               entry->linked->pid);
+        }
+
         if (task){
                 set_rt_flags(task, RT_F_RUNNING);
+                sched_trace_server_switch_to(-task->pid,
+                                             get_server_job(task),
+                                             task->pid);
         }
         entry->linked = task;
 
@@ -655,6 +674,8 @@ static void job_completion(struct task_struct *task, int forced)
 
         /* If server has run out of budget, wait until next release */
         if (budget_exhausted(task)) {
+                sched_trace_server_completion(-task->pid,
+                                              get_server_job(task));
                 server_release(task);
         }
 
@@ -812,6 +833,8 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
         unsigned long flags;
         struct cpu_entry* entry;
         enum crit_level level = tsk_mc_crit(t);
+        char name[TASK_COMM_LEN];
+        strcpy(name, "rtspin");
 
         local_irq_save(flags);
         TRACE("New mixed criticality task %d\n", t->pid);
@@ -823,6 +846,10 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
                 entry = &per_cpu(cpus, task_cpu(t));
         t->rt_param._domain = entry->crit_entries[level].domain;
 
+        sched_trace_container_param(t->pid, name);
+        sched_trace_server_param(-t->pid, t->pid,
+                                 get_exec_cost(t), get_rt_period(t));
+
         /* Setup job params */
         release_at(t, litmus_clock());
         tsk_mc_data(t)->mc_job.ghost_budget = 0;
@@ -836,6 +863,7 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
         }
         t->rt_param.linked_on = NO_CPU;
 
+
         job_arrival(t);
 
         local_irq_restore(flags);
@@ -1141,6 +1169,46 @@ out:
         return ret;
 }
 
+
+static void mc_release_ts(lt_t time)
+{
+        int i, cpu, base_id = 0, cont_id = -1;
+        char name[TASK_COMM_LEN];
+        enum crit_level level;
+        struct cpu_entry *entry;
+        struct crit_entry *ce;
+
+        level = CRIT_LEVEL_A;
+        strcpy(name, "LVL-A");
+        for_each_online_cpu(cpu) {
+                entry = &per_cpu(cpus, cpu);
+                trace_litmus_container_param(++cont_id, &name);
+                ce = &entry->crit_entries[level];
+                sched_trace_server_param(sid(ce), cont_id, 0, 0);
+        }
+
+        level = CRIT_LEVEL_B;
+        strcpy(name, "LVL-B");
+        for_each_online_cpu(cpu) {
+                entry = &per_cpu(cpus, cpu);
+                trace_litmus_container_param(++cont_id, &name);
+                ce = &entry->crit_entries[level];
+                sched_trace_server_param(sid(ce), cont_id, 0, 0);
+        }
+
+        level = CRIT_LEVEL_C;
+        strcpy(name, "LVL-C");
+        trace_litmus_container_param(++cont_id, &name);
+        for_each_online_cpu(cpu) {
+                entry = &per_cpu(cpus, cpu);
+                ce = &entry->crit_entries[level];
+                sched_trace_server_param(sid(ce), cont_id, 0, 0);
+        }
+
+
+
+}
+
 static struct sched_plugin mc_plugin __cacheline_aligned_in_smp = {
         .plugin_name            = "MC",
         .task_new               = mc_task_new,
@@ -1154,6 +1222,7 @@ static struct sched_plugin mc_plugin __cacheline_aligned_in_smp = {
         .release_at             = mc_release_at,
         .deactivate_plugin      = mc_deactivate_plugin,
         .finish_switch          = mc_finish_switch,
+        .release_ts             = mc_release_ts,
 };
 
 static void init_crit_entry(struct crit_entry *ce, enum crit_level level,
diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index af02dfdbb523..4808377b9bb7 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -292,7 +292,7 @@ long mc_ce_admit_task_common(struct task_struct *ts)
                 printk(KERN_INFO "litmus: couldn't get pid struct for %d\n",
                                 ts->pid);
                 goto out;
-        }
+n       }
 
         if (lvl_a_id >= pid_table->num_pid_entries) {
                 printk(KERN_INFO "litmus: level A id greater than expected "
diff --git a/litmus/sched_plugin.c b/litmus/sched_plugin.c
index d54886df1f57..4eaf30659af3 100644
--- a/litmus/sched_plugin.c
+++ b/litmus/sched_plugin.c
@@ -106,6 +106,10 @@ static void litmus_dummy_task_exit(struct task_struct *task)
 {
 }
 
+static void litmus_dummy_release_ts(lt_t time)
+{
+}
+
 static long litmus_dummy_complete_job(void)
 {
         return -ENOSYS;
@@ -147,6 +151,7 @@ struct sched_plugin linux_sched_plugin = {
         .finish_switch = litmus_dummy_finish_switch,
         .activate_plugin = litmus_dummy_activate_plugin,
         .deactivate_plugin = litmus_dummy_deactivate_plugin,
+        .release_ts = litmus_dummy_release_ts,
 #ifdef CONFIG_LITMUS_LOCKING
         .allocate_lock = litmus_dummy_allocate_lock,
 #endif
@@ -185,6 +190,7 @@ int register_sched_plugin(struct sched_plugin* plugin)
         CHECK(complete_job);
         CHECK(activate_plugin);
         CHECK(deactivate_plugin);
+        CHECK(release_ts);
 #ifdef CONFIG_LITMUS_LOCKING
         CHECK(allocate_lock);
 #endif
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index abb06fa53e3a..04f12464686a 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -283,6 +283,9 @@ static void psnedf_task_new(struct task_struct * t, int on_rq, int running)
         TRACE_TASK(t, "psn edf: task new, cpu = %d\n",
                    t->rt_param.task_params.cpu);
 
+        trace_litmus_server_param(0 - t->pid, -1 - get_partition(task),
+                                  get_exec_time(t), get_rt_period(t));
+
         /* setup job parameters */
         release_at(t, litmus_clock());
 
diff --git a/litmus/sync.c b/litmus/sync.c
index bf75fde5450b..f3c9262f7022 100644
--- a/litmus/sync.c
+++ b/litmus/sync.c
@@ -73,6 +73,9 @@ static long do_release_ts(lt_t start)
 
         complete_n(&ts_release, task_count);
 
+        /* TODO: remove this hack */
+        litmus->release_ts(start);
+
         return task_count;
 }