solve the bug in bank_proc.c

1 files changed, 79 insertions, 16 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index 7cf07ee1dad9..3cf9cda9bbc0 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -26,7 +26,7 @@
 #define CACHE_MASK  0x0000f000      
 #define CACHE_SHIFT 12
 
-#define PAGES_PER_COLOR 256
+#define PAGES_PER_COLOR 512
 unsigned int NUM_PAGE_LIST;  //8*16
 
 unsigned int number_banks;
@@ -37,6 +37,8 @@ unsigned int set_partition_min = 0;
 unsigned int bank_partition_max = 0x000000ff;
 unsigned int bank_partition_min = 0;
 
+int show_page_pool = 0;
+
 unsigned int set_partition[9] = {
         0x00000003,  /* Core 0, and Level A*/
         0x00000003,  /* Core 0, and Level B*/
@@ -58,7 +60,7 @@ unsigned int bank_partition[9] = {
         0x00000040,  /* Core 2, and Level B*/
         0x00000080,  /* Core 3, and Level A*/
         0x00000080,  /* Core 3, and Level B*/
-        0x0000000f,  /* Level C */
+        0x0000000c,  /* Level C */
 };
 
 unsigned int set_index[9] = {
@@ -161,9 +163,11 @@ static inline unsigned int page_list_index(struct page *page)
  */
 static unsigned long smallest_nr_pages(void)
 {
-        unsigned long i, min_pages = -1;
+        unsigned long i, min_pages;
         struct color_group *cgroup;
-        for (i = 0; i < NUM_PAGE_LIST; ++i) {
+        cgroup = &color_groups[16*2];
+        min_pages =atomic_read(&cgroup->nr_pages); 
+        for (i = 16*2; i < NUM_PAGE_LIST; ++i) {
                 cgroup = &color_groups[i];
                 if (atomic_read(&cgroup->nr_pages) < min_pages)
                         min_pages = atomic_read(&cgroup->nr_pages);
@@ -175,9 +179,13 @@ static void show_nr_pages(void)
 {
         unsigned long i;
         struct color_group *cgroup;
+        printk("show nr pages***************************************\n");
         for (i = 0; i < NUM_PAGE_LIST; ++i) {
                 cgroup = &color_groups[i];
-                printk("i =%d, nr_pages = %d\n", i, atomic_read(&cgroup->nr_pages));
+                printk("(%03d) =  %03d, ", i, atomic_read(&cgroup->nr_pages));
+                if((i % 8) ==7){
+                    printk("\n");
+                }
         }
 }
 
@@ -193,6 +201,7 @@ void add_page_to_color_list(struct page *page)
         spin_lock(&cgroup->lock);
         list_add_tail(&page->lru, &cgroup->list);
         atomic_inc(&cgroup->nr_pages);
+        SetPageLRU(page);
         spin_unlock(&cgroup->lock);
 }
 
@@ -210,30 +219,65 @@ static int do_add_pages(void)
         unsigned long color;
         int ret = 0;
         int i = 0;
+        int free_counter = 0;
+        unsigned long counter[128]= {0}; 
+        
+        printk("Before refill : \n");
+        show_nr_pages();
 
         // until all the page lists contain enough pages 
         //for (i =0; i<5; i++) {
-        while (smallest_nr_pages() < PAGES_PER_COLOR) {
-        
+        for (i=0; i< 1024*100;i++) {
+//      while (smallest_nr_pages() < PAGES_PER_COLOR) {
+       //         printk("smallest = %d\n", smallest_nr_pages());       
                 page = alloc_page(GFP_HIGHUSER_MOVABLE);
+            //    page = alloc_pages_exact_node(0, GFP_HIGHUSER_MOVABLE, 0);
+        
                 if (unlikely(!page)) {
                         printk(KERN_WARNING "Could not allocate pages.\n");
                         ret = -ENOMEM;
                         goto out;
                 }
                 color = page_list_index(page);
+                counter[color]++;
+        //      printk("page(%d) = color %x, bank %x, [color] =%d \n", color, page_color(page), page_bank(page), atomic_read(&color_groups[color].nr_pages));
                 //show_nr_pages();
-                //printk("before : nr_pages = %d\n", atomic_read(&color_groups[color].nr_pages));
-                if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR) {
+                if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR && color>=32) {
                         add_page_to_color_list(page);
+        //              printk("add page(%d) = color %x, bank %x\n", color, page_color(page), page_bank(page));
                 } else{
                         // Pages here will be freed later 
                         list_add_tail(&page->lru, &free_later);
+                        free_counter++;
+                        //list_del(&page->lru);
+                //        __free_page(page);
+        //              printk("useless page(%d) = color %x, bank %x\n", color,  page_color(page), page_bank(page));
                 }
                //show_nr_pages();
-                //printk("after : nr_pages = %d\n", atomic_read(&color_groups[color].nr_pages));
+                /*
+                if(free_counter >= PAGES_PER_COLOR)
+                {
+                    printk("free unwanted page list eariler");
+                    free_counter = 0;
+                    list_for_each_entry_safe(page, page_tmp, &free_later, lru) {
+                        list_del(&page->lru);
+                        __free_page(page);
+                    }
+
+                    show_nr_pages();
+                }
+                */
+        }
+        printk("page counter = \n");
+        for (i=0; i<128; i++)
+        {
+            printk("(%03d) = %4d, ", i , counter[i]);
+            if(i%8 == 7){
+                printk("\n");
+            }
 
         }
+        printk("After refill : \n");
         show_nr_pages();
 #if 1
         // Free the unwanted pages
@@ -274,10 +318,10 @@ static struct  page *new_alloc_page_color( unsigned long color)
         }
         rPage = list_first_entry(&cgroup->list, struct page, lru);
         BUG_ON(page_count(rPage) > 1);
-        get_page(rPage);
+//      get_page(rPage);
         list_del(&rPage->lru);
         atomic_dec(&cgroup->nr_pages);
-//      ClearPageLRU(rPage);
+        ClearPageLRU(rPage);
 out_unlock:
         spin_unlock(&cgroup->lock);
 out:
@@ -311,7 +355,7 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         unsigned int idx = 0;
         idx += num_by_bitmask_index(set_partition[node], set_index[node]);
         idx += number_cachecolors* num_by_bitmask_index(bank_partition[node], bank_index[node]);
-        printk("node  = %d, idx = %d\n", node, idx);
+        //printk("node  = %d, idx = %d\n", node, idx);
 
         rPage =  new_alloc_page_color(idx);
         
@@ -407,7 +451,21 @@ out:
         return ret;
 }
 
-
+int show_page_pool_handler(struct ctl_table *table, int write, void __user *buffer,
+                size_t *lenp, loff_t *ppos)
+{
+        int ret = 0, i = 0;
+        mutex_lock(&void_lockdown_proc);
+        ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
+        if (ret)
+                goto out;
+        if (write) {
+            show_nr_pages();
+        }
+out:
+        mutex_unlock(&void_lockdown_proc);
+        return ret;
+}
 static struct ctl_table cache_table[] =
 {
         
@@ -573,8 +631,13 @@ static struct ctl_table cache_table[] =
                 .extra1         = &bank_partition_min,
                 .extra2         = &bank_partition_max,
         },      
-
-
+        {
+                .procname       = "show_page_pool",
+                .mode           = 0666,
+                .proc_handler   = show_page_pool_handler,
+                .data           = &show_page_pool,
+                .maxlen         = sizeof(show_page_pool),
+        },      
         { }
 };