Fix up color proc CPU servers.

1 files changed, 51 insertions, 90 deletions

diff --git a/litmus/color_proc.c b/litmus/color_proc.c
index 3ad010f21b02..a8bcd145ccf0 100644
--- a/litmus/color_proc.c
+++ b/litmus/color_proc.c
@@ -5,27 +5,33 @@
 #include <litmus/sched_trace.h>
 #include <litmus/color.h>
 
-#define SPERIOD_LEN  7
-#define SPERIOD_FILE "period"
-#define SWCET_LEN    5
-#define SWCET_FILE   "wcet"
-
 extern int color_sysctl_add_pages_data; /* litmus/color.c */
 
 static int zero = 0;
 static int one = 1;
+/* used as names for server proc entries */
+char *period_str = "period";
+char *wcet_str = "wcet";
+
+/* servers have a WCET and period */
+#define NR_SERVER_PARAMS 2
+#define CPU_NAME_LEN     3
+struct color_cpu_server {
+        char name[CPU_NAME_LEN];
+        unsigned long wcet;
+        unsigned long period;
+        /* the + 1 is for the sentinel element */
+        struct ctl_table table[NR_SERVER_PARAMS + 1];
+};
+static struct color_cpu_server color_cpu_servers[NR_CPUS];
 
-static unsigned long *server_wcet;
-static unsigned long *server_period;
+/* the + 1 is for the sentinel element */
+static struct ctl_table color_cpu_tables[NR_CPUS + 1];
 
 #define NR_PAGES_INDEX 0 /* location of nr_pages in the table below */
 static struct ctl_table color_table[] =
 {
         {
-                .procname       = "servers",
-                .mode           = 0555,
-        },
-        {
                 /* you MUST update NR_PAGES_INDEX if you move this entry */
                 .procname       = "nr_pages",
                 .mode           = 0444,
@@ -34,6 +40,11 @@ static struct ctl_table color_table[] =
                 .maxlen         = 0,            /* also set later */
         },
         {
+                .procname       = "servers",
+                .mode           = 0555,
+                .child          = color_cpu_tables,
+        },
+        {
                 .procname       = "add_pages",
                 .data           = &color_sysctl_add_pages_data,
                 .maxlen         = sizeof(int),
@@ -66,20 +77,23 @@ static struct ctl_table litmus_dir_table[] = {
 
 int color_server_params(int cpu, unsigned long *wcet, unsigned long *period)
 {
+        struct color_cpu_server *svr;
+
         if (cpu >= num_online_cpus()) {
                 printk(KERN_WARNING "Cannot access illegal CPU: %d\n", cpu);
                 return -EFAULT;
         }
 
-        if (server_wcet[cpu] == 0 || server_period[cpu] == 0) {
+        svr = &color_cpu_servers[cpu];
+        if (svr->wcet == 0 || svr->period == 0) {
                 printk(KERN_WARNING "Server %d is uninitialized!\n", cpu);
                 return -EPERM;
         }
 
-        *wcet = server_wcet[cpu];
-        *period = server_period[cpu];
+        *wcet = svr->wcet;
+        *period = svr->period;
 
-        TRACE("For %d: %lu, %lu\n", cpu, server_wcet[cpu], server_period[cpu]);
+        TRACE("For %d: %lu, %lu\n", cpu, svr->wcet, svr->period);
 
         return 0;
 }
@@ -107,82 +121,44 @@ static void __init init_server_entry(struct ctl_table *entry,
         entry->mode = 0666;
         entry->proc_handler = proc_doulongvec_minmax;
         entry->data = parameter;
-        entry->maxlen = sizeof(unsigned long);
+        entry->maxlen = sizeof(*parameter);
 }
 
-static int __init init_cpu_entry(struct ctl_table *cpu_table, int cpu)
+static int __init init_cpu_entry(struct ctl_table *cpu_table,
+                struct color_cpu_server *svr, int cpu)
 {
-        char *name;
-        size_t size;
-        struct ctl_table *server_table, *entry;
-
-        server_wcet[cpu] = 0;
-        server_period[cpu] = 0;
+        struct ctl_table *entry = svr->table;
 
         printk(KERN_INFO "Creating cpu %d\n", cpu);
 
-        size = sizeof(ctl_table) * 3;
-        server_table = kmalloc(size, GFP_ATOMIC);
-        if (!server_table) {
-                printk(KERN_WARNING "Could not allocate "
-                       "color server proc for CPU %d.\n", cpu);
-                return -ENOMEM;
-        }
-        memset(server_table, 0, size);
-
-        /* Server WCET */
-        name = kmalloc(SWCET_LEN, GFP_ATOMIC);
-        if (!name) {
-                return -ENOMEM;
-        }
-        strcpy(name, SWCET_FILE);
-        entry = &server_table[0];
-        init_server_entry(entry, &server_wcet[cpu], name);
-
-
-        /* Server period */
-        name = kmalloc(SPERIOD_LEN, GFP_ATOMIC);
-        if (!name) {
-                return -ENOMEM;
-        }
-        strcpy(name, SPERIOD_FILE);
-        entry = &server_table[1];
-        init_server_entry(entry, &server_period[cpu], name);
+        init_server_entry(entry, &svr->wcet, wcet_str);
+        entry++;
+        init_server_entry(entry, &svr->period, period_str);
 
-        name = kmalloc(3, GFP_ATOMIC);
-        if (!name) {
-                return -ENOMEM;
-        }
-        snprintf(name, 2, "%d", cpu);
-        cpu_table->procname = name;
+        /* minus one for the null byte */
+        snprintf(svr->name, CPU_NAME_LEN - 1, "%d", cpu);
+        cpu_table->procname = svr->name;
         cpu_table->mode = 0555;
-        cpu_table->child = server_table;
+        cpu_table->child = svr->table;
 
         return 0;
 }
 
-static int __init init_server_entries(struct ctl_table *cpu_tables)
+static int __init init_server_entries(void)
 {
-        size_t size;
-        int ret, cpu;
+        int cpu, err = 0;
         struct ctl_table *cpu_table;
-
-        size = sizeof(unsigned long) * num_online_cpus();
-        server_wcet = kmalloc(size, GFP_ATOMIC);
-        server_period = kmalloc(size, GFP_ATOMIC);
-        if (!server_wcet || !server_period) {
-                printk(KERN_WARNING "Could not allocate server parameters.\n");
-                return -ENOMEM;
-        }
+        struct color_cpu_server *svr;
 
         for_each_online_cpu(cpu) {
-                cpu_table = &cpu_tables[cpu];
-                ret = init_cpu_entry(cpu_table, cpu);
-                if (ret) {
-                        return ret;
-                }
+                cpu_table = &color_cpu_tables[cpu];
+                svr = &color_cpu_servers[cpu];
+                err = init_cpu_entry(cpu_table, svr, cpu);
+                if (err)
+                        goto out;
         }
-        return 0;
+out:
+        return err;
 }
 
 
@@ -191,8 +167,6 @@ static struct ctl_table_header *litmus_sysctls;
 static int __init litmus_sysctl_init(void)
 {
         int ret = 0;
-        size_t size;
-        struct ctl_table *cpu_tables;
 
         printk(KERN_INFO "Registering LITMUS^RT proc sysctl.\n");
         litmus_sysctls = register_sysctl_table(litmus_dir_table);
@@ -205,22 +179,9 @@ static int __init litmus_sysctl_init(void)
         if (ret)
                 goto out;
 
-
-        size = sizeof(ctl_table) * (num_online_cpus() + 2);
-        cpu_tables = kmalloc(size, GFP_ATOMIC);
-        if (!cpu_tables) {
-                printk(KERN_WARNING "Could not allocate color CPU proc.\n");
-                ret = -ENOMEM;
-                goto out;
-        }
-        memset(cpu_tables, 0, size);
-
-        ret = init_server_entries(cpu_tables);
+        ret = init_server_entries();
         if (ret)
                 goto out;
-
-        color_table[0].child = cpu_tables;
-
 out:
         return ret;
 }