1 files changed, 131 insertions, 4 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index ed195359e65f..bd1fb961436f 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -31,6 +31,9 @@
 #define CACHE_SHIFT 12
 
 #define PAGES_PER_COLOR 2000
+#define NUM_BANKS       8
+#define NUM_COLORS      16
+
 unsigned int NUM_PAGE_LIST;  //8*16
 
 unsigned int number_banks;
@@ -77,6 +80,10 @@ unsigned int bank_index[9] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
+int node_index[9] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
 struct mutex void_lockdown_proc;
 
 
@@ -138,7 +145,100 @@ unsigned int num_by_bitmask_index(unsigned int bitmask, unsigned int index)
     return pos;
 }
 
+static inline unsigned int first_index(unsigned long node)
+{
+        unsigned int bank_no = 0, color_no = 0;
+        
+        while(bank_no < NUM_BANKS) {
+                if ((bank_partition[node]>>bank_no) & 0x1)
+                        break;
+                bank_no++;
+        }
+        while(color_no < NUM_COLORS) {
+                if ((set_partition[node]>>color_no) & 0x1)
+                        break;
+                color_no++;
+        }
+        return NUM_COLORS*bank_no + color_no; 
+}
+
+static inline unsigned int last_index(unsigned long node)
+{
+        unsigned int bank_no = 7, color_no = 15;
+        
+        while(bank_no >= 0) {
+                if ((bank_partition[node]>>bank_no) & 0x1)
+                        break;
+                bank_no--;
+        }
+        while(color_no >= 0) {
+                if ((set_partition[node]>>color_no) & 0x1)
+                        break;
+                color_no--;
+        }
+        return NUM_COLORS*bank_no + color_no; 
+}
 
+static inline unsigned int next_color(unsigned long node, unsigned int current_color)
+{
+        int try = 0, ret = 0;
+        current_color++;
+        if (current_color == NUM_COLORS) {
+                current_color = 0;
+                ret = 1;
+        }
+        
+        while (try < NUM_COLORS) {
+                if ((set_partition[node]>>current_color)&0x1)
+                        break;
+                current_color++;
+                if (current_color == NUM_COLORS) {
+                        current_color = 0;
+                        ret = 1;
+                }
+                try++;
+        }
+        if (!ret)
+                return current_color;
+        else
+                return current_color + NUM_COLORS;
+}
+
+static inline unsigned int next_bank(unsigned long node, unsigned int current_bank)
+{
+        int try = 0;
+        current_bank++;
+        if (current_bank == NUM_BANKS) {
+                current_bank = 0;
+        }
+        
+        while (try < NUM_BANKS) {
+                if ((bank_partition[node]>>current_bank)&0x1)
+                        break;
+                current_bank++;
+                if (current_bank == NUM_BANKS) {
+                        current_bank = 0;
+                }
+                try++;
+        }
+        return current_bank;
+}
+
+static inline unsigned int get_next_index(unsigned long node, unsigned int current_index)
+{
+        unsigned int bank_no, color_no, color_ret, bank_ret;
+        bank_no = current_index>>4;
+        color_no = current_index - bank_no*NUM_COLORS;
+        bank_ret = bank_no;
+        color_ret = next_color(node, color_no);
+        if (color_ret >= NUM_COLORS) {
+                // next bank
+                color_ret -= NUM_COLORS;
+                bank_ret = next_bank(node, bank_no);
+        }
+
+        return bank_ret * NUM_COLORS + color_ret;
+}
 
 /* Decoding page color, 0~15 */ 
 static inline unsigned int page_color(struct page *page)
@@ -327,11 +427,12 @@ static struct page *new_alloc_page_color( unsigned long color)
 out_unlock:
         spin_unlock(&cgroup->lock);
 out:
+/*
         if( smallest_nr_pages() == 0) {
         //do_add_pages();
                 //printk(KERN_ALERT "ERROR(bank_proc.c) = We don't have enough pages in bank_proc.c\n");        
         }
-
+*/
         return rPage;
 }
 
@@ -361,7 +462,8 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         unsigned int color;
         int try = 0;
         
-
+        
+/*
     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]);
@@ -373,16 +475,41 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
     bank_index[node] = (bank_index[node]+1) % counting_one_set(bank_partition[node]);
         while (!rPage)  {
                 try++;
-                if (try>=64)
+                if (try>=256)
                         break;
                 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(KERN_ALERT "out of page! requesting node  = %d, idx = %d\n", node, idx);
                 rPage =  new_alloc_page_color(idx);
                 set_index[node] = (set_index[node]+1) % counting_one_set(set_partition[node]);
         bank_index[node] = (bank_index[node]+1) % counting_one_set(bank_partition[node]);
         }
-    
+*/  
+        unsigned int idx;
+        
+        if (node_index[node] == -1)
+                idx = first_index(node);
+        else
+                idx = node_index[node];
+        
+        BUG_ON(idx<0 || idx>127);
+        rPage =  new_alloc_page_color(idx);
+        if (node_index[node] == last_index(node))
+                node_index[node] = first_index(node);
+        else
+                node_index[node]++;
+
+        while (!rPage)  {
+                try++;
+                if (try>=256)
+                        break;
+                idx = get_next_index(node, idx);
+                printk(KERN_ALERT "try = %d out of page! requesting node  = %d, idx = %d\n", try, node, idx);
+                BUG_ON(idx<0 || idx>127);
+                rPage =  new_alloc_page_color(idx);
+        }
+        node_index[node] = idx;
         return rPage; 
 }