add reclaim_page function in bank_proc.c to recyle all the pages.

And only do_add_pages in the kernel booting stage

1 files changed, 25 insertions, 6 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index 2688d79b353f..9771529876b6 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -38,6 +38,7 @@ unsigned int bank_partition_max = 0x000000ff;
 unsigned int bank_partition_min = 0;
 
 int show_page_pool = 0;
+spinlock_t reclaim_lock;
 
 unsigned int set_partition[9] = {
         0x00000003,  /* Core 0, and Level A*/
@@ -227,7 +228,7 @@ static int do_add_pages(void)
 
         // until all the page lists contain enough pages 
         //for (i =0; i<5; i++) {
-        for (i=0; i< 1024*100;i++) {
+        for (i=0; i< 1024*200;i++) {
 //      while (smallest_nr_pages() < PAGES_PER_COLOR) {
        //         printk("smallest = %d\n", smallest_nr_pages());       
                 page = alloc_page(GFP_HIGHUSER_MOVABLE);
@@ -243,7 +244,7 @@ static int do_add_pages(void)
         //      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();
                 //if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR && color>=32) {
-                if ( PAGES_PER_COLOR && color>=32) {
+                if ( PAGES_PER_COLOR && color>=16*2) {
                         add_page_to_color_list(page);
         //              printk("add page(%d) = color %x, bank %x\n", color, page_color(page), page_bank(page));
                 } else{
@@ -319,7 +320,7 @@ 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);
@@ -327,7 +328,11 @@ out_unlock:
         spin_unlock(&cgroup->lock);
 out:
         if( smallest_nr_pages() == 0)
-                do_add_pages();
+        {
+//              do_add_pages();
+            printk("ERROR(bank_proc.c) = We don't have enough pages in bank_proc.c\n");        
+        
+        }
         return rPage;
 }
 
@@ -367,6 +372,20 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
 }
 
 
+/*
+ * Reclaim pages.
+ */
+void reclaim_page(struct page *page)
+{
+        const unsigned long color = page_list_index(page);
+        unsigned long nr_reclaimed = 0;
+        spin_lock(&reclaim_lock);
+        put_page(page);
+        add_page_to_color_list(page);
+
+        spin_unlock(&reclaim_lock);
+        printk("Reclaimed page(%d) = color %x, bank %x, [color] =%d \n", color, page_color(page), page_bank(page), atomic_read(&color_groups[color].nr_pages));
+}
 
 
 /*
@@ -382,6 +401,8 @@ static int __init init_variables(void)
         NUM_PAGE_LIST = number_banks * number_cachecolors; 
         printk(KERN_WARNING "number of banks = %d, number of cachecolors=%d\n", number_banks, number_cachecolors);
         mutex_init(&void_lockdown_proc);
+        spin_lock_init(&reclaim_lock);
+
 }
 
 
@@ -663,8 +684,6 @@ static int __init litmus_color_init(void)
         int err=0;
         printk("Init bankproc.c\n");
 
-        //INIT_LIST_HEAD(&alloced_pages.list);
-        //spin_lock_init(&alloced_pages.lock);
         init_variables();
 
         printk(KERN_INFO "Registering LITMUS^RT proc color sysctl.\n");