PGM supportwip-mc2-new

1 files changed, 20 insertions, 2 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index d72039067689..d2815f52876e 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -140,10 +140,16 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
         if (tp.relative_deadline == 0)
                 tp.relative_deadline = tp.period;
 
-        if (tp.exec_cost <= 0)
+        if (tp.exec_cost <= 0) {
+                printk(KERN_INFO "litmus: real-time task %d rejected "
+                        "because declared job execution time <= 0.", pid);
                 goto out_unlock;
-        if (tp.period <= 0)
+        }
+        if (tp.period <= 0) {
+                printk(KERN_INFO "litmus: real-time task %d rejected "
+                                "because declared job period <= 0.", pid);
                 goto out_unlock;
+        }
         if (min(tp.relative_deadline, tp.period) < tp.exec_cost) /*density check*/
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
@@ -169,6 +175,13 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
                 goto out_unlock;
         }
 
+        if (tp.pgm_type < PGM_NOT_A_NODE || tp.pgm_type > PGM_INTERNAL) {
+                printk(KERN_INFO "litmus: real-time task %d rejected "
+                           "because of unknown PGM node type specified (%d)\n",
+                           pid, tp.pgm_type);
+                goto out_unlock;
+        }
+
         target->rt_param.task_params = tp;
 
         retval = 0;
@@ -549,6 +562,10 @@ long litmus_admit_task(struct task_struct* tsk)
         if (get_rt_relative_deadline(tsk) == 0 ||
             get_exec_cost(tsk) >
                         min(get_rt_relative_deadline(tsk), get_rt_period(tsk)) ) {
+                printk(KERN_INFO "litmus: invalid task parameters "
+                        "(e = %lu, p = %lu, d = %lu)\n",
+                        get_exec_cost(tsk), get_rt_period(tsk),
+                        get_rt_relative_deadline(tsk));
                 TRACE_TASK(tsk,
                         "litmus admit: invalid task parameters "
                         "(e = %lu, p = %lu, d = %lu)\n",
@@ -580,6 +597,7 @@ long litmus_admit_task(struct task_struct* tsk)
         if (!retval) {
                 sched_trace_task_name(tsk);
                 sched_trace_task_param(tsk);
+                sched_trace_pgm_param(tsk);
                 atomic_inc(&rt_task_count);
         }