Move nr_colors into color_cache_info and extern it for everyone.

5 files changed, 36 insertions, 24 deletions

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 482e068a236a..95d5636720a6 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1217,8 +1217,6 @@ static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
 
 #include <litmus/color.h>
 
-extern struct color_cache_info color_cache_info;
-
 static void set_color_vars(void)
 {
         struct _cpuid4_info *leaf = CPUID4_INFO_IDX(
diff --git a/include/litmus/color.h b/include/litmus/color.h
index 250f08a6e1f3..03524692511a 100644
--- a/include/litmus/color.h
+++ b/include/litmus/color.h
@@ -14,8 +14,12 @@ struct color_cache_info {
         unsigned long line_size;
         unsigned long ways;
         unsigned long sets;
+        unsigned long nr_colors;
 };
 
+/* defined in litmus/color.c */
+extern struct color_cache_info color_cache_info;
+
 struct page* get_colored_page(unsigned long);
 void add_page_to_color_list(struct page*);
 void add_page_to_alloced_list(struct page*, struct vm_area_struct*);
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 2991fff58bc6..7dfcd333bd18 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -78,13 +78,17 @@ struct control_page {
 };
 
 #ifndef __KERNEL__
-/* XXX This is a terrible hack. */
-#if defined(CONFIG_X86)
+/*
+ * XXX This is a terrible hack so liblitmus can use the PAGE_SIZE macro.
+ * We should fix liblitmus to do setup the page size at runtime.
+ */
+#if (ARCH == x86_64)
 #define PAGE_SIZE 4096
-#elif defined(CONFIG_SPARC) || (ARCH == sparc64)
+#elif (ARCH == sparc64)
 #define PAGE_SIZE 8192
-#endif /* X86/SPARC */
 #endif
+#endif /* ifndef __KERNEL__ */
+
 typedef uint8_t color_t;
 #define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / sizeof(color_t))
 struct color_ctrl_page {
diff --git a/litmus/color.c b/litmus/color.c
index 93d12a718543..21bb0ee81895 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -32,10 +32,7 @@ static struct color_group *color_groups;
 
 
 /* non-static: extern'ed in various files */
-unsigned long nr_colors;
-#ifdef CONFIG_X86
 struct color_cache_info color_cache_info;
-#endif
 int color_sysctl_add_pages_data;
 
 static inline unsigned long page_color(struct page *page)
@@ -67,7 +64,7 @@ struct page* get_colored_page(unsigned long color)
         struct color_group *cgroup;
         struct page *page = NULL;
 
-        if (color >= nr_colors)
+        if (color >= color_cache_info.nr_colors)
                 goto out;
 
         cgroup = &color_groups[color];
@@ -93,7 +90,7 @@ static unsigned long smallest_nr_pages(void)
 {
         unsigned long i, min_pages = -1;
         struct color_group *cgroup;
-        for (i = 0; i < nr_colors; ++i) {
+        for (i = 0; i < color_cache_info.nr_colors; ++i) {
                 cgroup = &color_groups[i];
                 if (atomic_read(&cgroup->nr_pages) < min_pages)
                         min_pages = atomic_read(&cgroup->nr_pages);
@@ -226,7 +223,7 @@ int color_nr_pages_handler(struct ctl_table *table, int write, void __user *buff
                 ret = -EPERM;
                 goto out;
         }
-        for (i = 0; i < nr_colors; ++i) {
+        for (i = 0; i < color_cache_info.nr_colors; ++i) {
                 cgroup = &color_groups[i];
                 buf = ((char*)table->data) + used;
                 used += snprintf(buf, table->maxlen - used, ONE_COLOR_FMT,
@@ -275,16 +272,24 @@ static int __init init_mask(void)
         BUG_ON(PAGE_SIZE >= (color_cache_info.sets  << line_size_log));
         color_mask = ((color_cache_info.sets << line_size_log) - 1) ^
                 (PAGE_SIZE - 1);
-        nr_colors = (color_mask >> PAGE_SHIFT) + 1;
+        color_cache_info.nr_colors = (color_mask >> PAGE_SHIFT) + 1;
 out:
         return err;
 }
 #elif defined(CONFIG_SPARC) /* X86 */
 static int __init init_mask(void)
 {
-        /* bits 17:13 */
-        color_mask = 0x3e000UL;
-        nr_colors = (1 << hweight_long(color_mask));
+        /*
+         * Static assuming we are using Flare (our Niagara machine).
+         * This machine has weirdness with cache banks, and I don't want
+         * to waste time trying to auto-detect this.
+         */
+        color_mask = 0x3e000UL;                   /* bits 17:13 */
+        color_cache_info.size = 3 * 1024 * 1024;  /* 3 MB */
+        color_cache_info.line_size = 64;
+        color_cache_info.ways = 12;
+        color_cache_info.sets = 1024 * 4;
+        color_cache_info.nr_colors = (1 << hweight_long(color_mask));
         return 0;
 }
 #endif /* SPARC/X86 */
@@ -297,14 +302,15 @@ static int __init init_color_groups(void)
         unsigned long i;
         int err = 0;
 
-        color_groups = kmalloc(nr_colors * sizeof(struct color_group), GFP_KERNEL);
+        color_groups = kmalloc(color_cache_info.nr_colors *
+                        sizeof(struct color_group), GFP_KERNEL);
         if (!color_groups) {
                 printk(KERN_WARNING "Could not allocate color groups.\n");
                 err = -ENOMEM;
                 goto out;
         }
 
-        for (i = 0; i < nr_colors; ++i) {
+        for (i = 0; i < color_cache_info.nr_colors; ++i) {
                 cgroup = &color_groups[i];
                 atomic_set(&cgroup->nr_pages, 0);
                 INIT_LIST_HEAD(&cgroup->list);
@@ -326,9 +332,9 @@ static int __init init_color(void)
 
         err = init_mask();
         printk("PAGE_SIZE: %lu  Color mask: 0x%lx  Total colors: %lu\n",
-                        PAGE_SIZE, color_mask, nr_colors);
+                        PAGE_SIZE, color_mask, color_cache_info.nr_colors);
 
-        BUG_ON(LOCKDEP_MAX_NR_COLORS < nr_colors);
+        BUG_ON(LOCKDEP_MAX_NR_COLORS < color_cache_info.nr_colors);
         err = init_color_groups();
         return err;
 }
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index d681f57be01f..7ccdaf03740b 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -102,8 +102,6 @@ static int map_color_ctrl_page(struct vm_area_struct *vma)
         /* Map it into the vma. Make sure to use PAGE_SHARED, otherwise
          * userspace actually gets a copy-on-write page. */
         err = remap_pfn_range(vma, vma->vm_start, pfn, PAGE_SIZE, PAGE_SHARED);
-        TRACE_CUR("page shared: guess:0x1(63)...1??111  actual:0x%lx\n", PAGE_SHARED);
-        /* present, RW, user, accessed, NX=63 */
 
         if (err)
                 TRACE_CUR(CTRL_NAME ": remap_pfn_range() failed (%d)\n", err);
@@ -181,10 +179,12 @@ static int do_map_colored_pages(struct vm_area_struct *vma)
                 clear_user_highpage(page, addr);
 #endif
                 TRACE_CUR(ALLOC_NAME ": insert page (pa:0x%10llx, pfn:%8lu, "
-                                "color:%3lu) at 0x%lx (flags:%lx prot:%lx\n",
+                                "color:%3lu) at 0x%lx (flags:%16lx prot:%16lx) "
+                                "PAGE_SHARED:0x%16lx\n",
                                 page_to_phys(page),
                                 page_to_pfn(page), this_color, addr,
-                                vma->vm_flags, pgprot_val(vma->vm_page_prot));
+                                vma->vm_flags, pgprot_val(vma->vm_page_prot),
+                                PAGE_SHARED);
                 //err = vm_insert_page(vma, addr, page);
                 err = remap_pfn_range(vma, addr, page_to_pfn(page),
                                 PAGE_SIZE, PAGE_SHARED);