Changes to rtspin for mixed criticality (MC).

Add options to rtspin to set the criticality level using the -r flag.

You must be using a kernel that has support for mixed criticality
(has include/litmus/sched_mc.h for struct definitions, etc.).

4 files changed, 43 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index db94ffb..ae06ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ arch/${include-${ARCH}}/include/asm/%.h: \
         cp $< $@
 
 litmus-headers = include/litmus/rt_param.h include/litmus/unistd_32.h \
-        include/litmus/unistd_64.h
+        include/litmus/unistd_64.h include/litmus/sched_mc.h
 
 unistd-headers = \
   $(foreach file,${unistd-${ARCH}},arch/${include-${ARCH}}/include/asm/$(file))
diff --git a/bin/rtspin.c b/bin/rtspin.c
index ae76941..c5a2600 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -5,6 +5,9 @@
 #include <unistd.h>
 #include <time.h>
 #include <assert.h>
+#include <strings.h>
+
+#include <litmus/sched_mc.h>
 
 
 #include "litmus.h"
@@ -21,6 +24,7 @@ static void usage(char *error) {
                 "       rt_spin -l\n"
                 "\n"
                 "COMMON-OPTS = [-w] [-p PARTITION] [-c CLASS] [-s SCALE]\n"
+                "              [-r CRITICALITY = [a|b|c|d]]\n"
                 "\n"
                 "WCET and PERIOD are milliseconds, DURATION is seconds.\n");
         exit(EXIT_FAILURE);
@@ -161,7 +165,21 @@ static int job(double exec_time, double program_end)
         }
 }
 
-#define OPTSTR "p:c:wlveo:f:s:"
+enum crit_level str2crit(const char* str)
+{
+        if (0 == strncasecmp("a", str, 1))
+                return CRIT_LEVEL_A;
+        else if (0 == strncasecmp("b", str, 1))
+                return CRIT_LEVEL_B;
+        else if (0 == strncasecmp("c", str, 1))
+                return CRIT_LEVEL_C;
+        else if (0 == strncasecmp("d", str, 1))
+                return CRIT_LEVEL_D;
+        /* failure */
+        return NUM_CRIT_LEVELS;
+}
+
+#define OPTSTR "p:c:wlveo:f:s:r:"
 
 int main(int argc, char** argv)
 {
@@ -182,6 +200,8 @@ int main(int argc, char** argv)
         double scale = 1.0;
         task_class_t class = RT_CLASS_HARD;
         int cur_job, num_jobs;
+        enum crit_level crit = NUM_CRIT_LEVELS;
+        struct mc_task mc_task;
 
         progname = argv[0];
 
@@ -214,6 +234,11 @@ int main(int argc, char** argv)
                 case 's':
                         scale = atof(optarg);
                         break;
+                case 'r':
+                        crit = str2crit(optarg);
+                        if (NUM_CRIT_LEVELS == crit)
+                                usage("Bad crit level.");
+                        break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -281,6 +306,14 @@ int main(int argc, char** argv)
         if (ret < 0)
                 bail_out("could not setup rt task params");
 
+        if (NUM_CRIT_LEVELS != crit)
+        {
+                mc_task.crit = crit;
+                ret = set_rt_task_mc_param(gettid(), &mc_task);
+                if (ret < 0)
+                        bail_out("could not setup rt mixed criticality params");
+        }
+
         init_litmus();
 
         ret = task_mode(LITMUS_RT_TASK);
diff --git a/include/litmus.h b/include/litmus.h
index 52435d8..b693e5c 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -26,6 +26,9 @@ int be_migrate_to(int target_cpu);
 int set_rt_task_param(pid_t pid, struct rt_task* param);
 int get_rt_task_param(pid_t pid, struct rt_task* param);
 
+struct mc_task;
+int set_rt_task_mc_param(pid_t pid, struct mc_task *param);
+
 /* setup helper */
 
 /* times are given in ms */
diff --git a/src/syscalls.c b/src/syscalls.c
index d800141..ef1ea17 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -88,3 +88,8 @@ int null_call(cycles_t *timestamp)
 {
         return syscall(__NR_null_call, timestamp);
 }
+
+int set_rt_task_mc_param(pid_t pid, struct mc_task *param)
+{
+        return syscall(__NR_set_rt_task_mc_param, pid, param);
+}