Allocate colored pages according to color ctrl page.

2 files changed, 39 insertions, 37 deletions

diff --git a/litmus/color.c b/litmus/color.c
index a3cc193418c0..6f017e388c12 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -10,10 +10,6 @@
 #include <litmus/color.h>
 #include <litmus/litmus.h> /* for in_list(...) */
 
-#define MPRINT(fmt, args...) \
-        printk(KERN_INFO "[%s@%s:%d]: " fmt, \
-                        __FUNCTION__, __FILE__, __LINE__, ## args)
-
 #define PAGES_PER_COLOR 2000
 
 /*
@@ -77,10 +73,14 @@ struct page* get_colored_page(unsigned long color)
 {
         struct color_group *cgroup;
         struct page *page = NULL;
-        BUG_ON(color >= nr_colors);
+
+        if (color >= nr_colors)
+                goto out;
+
         cgroup = &color_groups[color];
         spin_lock(&cgroup->lock);
         if (unlikely(!atomic_read(&cgroup->nr_pages))) {
+                TRACE_CUR("No free %lu colored pages.\n", color);
                 printk(KERN_WARNING "no free %lu colored pages.\n", color);
                 goto out_unlock;
         }
@@ -91,6 +91,7 @@ struct page* get_colored_page(unsigned long color)
         ClearPageLRU(page);
 out_unlock:
         spin_unlock(&cgroup->lock);
+out:
         return page;
 }
 
@@ -117,7 +118,7 @@ static int do_add_pages(void)
                 page = alloc_page(GFP_HIGHUSER | __GFP_ZERO |
                                 __GFP_MOVABLE);
                 if (unlikely(!page)) {
-                        MPRINT("could not allocate pages\n");
+                        printk(KERN_WARNING "Could not allocate pages.\n");
                         ret = -ENOMEM;
                         goto out;
                 }
@@ -146,8 +147,6 @@ static int do_reclaim_pages(void)
                         ClearPageLRU(page);
                         add_page_to_color_list(page);
                         nr_reclaimed++;
-                        TRACE_CUR("Reclaimed page (pfn:%lu phys:0x%lx).\n",
-                                        page_to_pfn(page), page_to_phys(page));
                 }
         }
         spin_unlock(&alloced_pages.lock);
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index b8218b6d1d9c..6e7ab3a28b87 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -11,11 +11,6 @@
 #define ALLOC_NAME      "litmus/color_alloc"
 #define CTRL_NAME       "litmus/color_ctrl"
 
-static struct non_rt_colors {
-        spinlock_t lock;
-        unsigned long color;
-} non_rt_colors;
-
 extern unsigned long nr_colors;
 
 /***********************************************************
@@ -145,25 +140,27 @@ out:
  * Allocation device
 ***********************************************************/
 
-static int map_colored_pages_non_rt(struct vm_area_struct *vma)
+#define vma_nr_pages(vma) \
+        ({unsigned long v = ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT); v;})
+
+#define next_color(c) ({unsigned long _x = (c + 1) % nr_colors; _x;})
+
+static int do_map_colored_pages(struct vm_area_struct *vma)
 {
-        unsigned long color, mapped;
+        const unsigned long nr_pages = vma_nr_pages(vma);
+        unsigned long mapped;
+        uint32_t *cur_color;
         int err;
-        const unsigned long nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 
-        spin_lock(&non_rt_colors.lock);
-        color = non_rt_colors.color;
-        non_rt_colors.color = (non_rt_colors.color + nr_pages) % nr_colors;
-        spin_unlock(&non_rt_colors.lock);
+        TRACE_CUR(ALLOC_NAME ": allocating %lu pages\n", nr_pages);
 
-        TRACE_CUR(ALLOC_NAME ": allocating %lu pages from color %lu.\n",
-                        nr_pages, color);
-
-        for (mapped = 0; mapped < nr_pages;
-                        mapped++, color = (color + 1) % nr_colors)
+        for (mapped = 0, cur_color = tsk_rt(current)->color_ctrl_page->colors;
+                        mapped < nr_pages;
+                        mapped++, cur_color++)
         {
+                const unsigned long color = *cur_color;
+                const unsigned long addr = vma->vm_start + (mapped << PAGE_SHIFT);
                 struct page *page = get_colored_page(color);
-                const unsigned long addr = vma->vm_start + PAGE_SIZE * mapped;
 
                 if (!page) {
                         TRACE_CUR(ALLOC_NAME ": Could not get page with "
@@ -189,17 +186,25 @@ static int map_colored_pages_non_rt(struct vm_area_struct *vma)
         return err;
 }
 
-static int map_colored_pages_rt(struct vm_area_struct *vma)
-{
-        /* TODO */
-        return -EINVAL;
-}
-
 static int map_colored_pages(struct vm_area_struct *vma)
 {
-        if (likely(is_realtime(current)))
-                return map_colored_pages_rt(vma);
-        return map_colored_pages_non_rt(vma);
+        int err = 0;
+
+        if (!tsk_rt(current)->color_ctrl_page) {
+                TRACE_CUR("Process has no color control page.\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        if (COLORS_PER_CONTROL_PAGE < vma_nr_pages(vma)) {
+                TRACE_CUR("Max page request %lu but want %lu.\n",
+                                COLORS_PER_CONTROL_PAGE, vma_nr_pages(vma));
+                err = -EINVAL;
+                goto out;
+        }
+        err = do_map_colored_pages(vma);
+out:
+        return err;
 }
 
 static void litmus_color_alloc_vm_close(struct vm_area_struct *vma)
@@ -297,8 +302,6 @@ static int __init init_dev(const char* name, struct miscdevice *dev)
 static int __init init_color_devices(void)
 {
         int err;
-        spin_lock_init(&non_rt_colors.lock);
-        non_rt_colors.color = 0;
 
         printk("Allocating LITMUS^RT color devices.\n");
         err = init_dev(ALLOC_NAME, &litmus_color_alloc_dev);