debugging

2 files changed, 12 insertions, 3 deletions

diff --git a/litmus/color.c b/litmus/color.c
index dad2f07b154a..ae6c3f6b8206 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -59,13 +59,17 @@ void add_page_to_color_list(struct page *page)
         list_add_tail(&page->lru, &cgroup->list);
         atomic_inc(&cgroup->nr_pages);
         SetPageLRU(page);
+        SetPageReserved(page);
         spin_unlock(&cgroup->lock);
 }
 
 void add_page_to_alloced_list(struct page *page)
 {
         BUG_ON(in_list(&page->lru) || PageLRU(page));
-        BUG_ON(!page_mapped(page) || page_count(page) < 2);
+        //BUG_ON(!page_mapped(page) || page_count(page) < 2);
+        TRACE_CUR("pfn:%d page_mapped:%d page_count:%d\n",
+                        page_to_pfn(page), page_mapped(page),
+                        page_count(page));
         spin_lock(&alloced_pages.lock);
         list_add_tail(&page->lru, &alloced_pages.list);
         SetPageLRU(page);
@@ -151,6 +155,9 @@ static int do_reclaim_pages(void)
         unsigned long nr_reclaimed = 0;
         spin_lock(&alloced_pages.lock);
         list_for_each_entry_safe(page, page_tmp, &alloced_pages.list, lru) {
+                TRACE_CUR("pfn:%8lu page_mapped:%d page_count:%d\n",
+                                page_to_pfn(page), page_mapped(page),
+                                page_count(page));
                 if (1 == page_count(page) && !page_mapped(page)) {
                         list_del(&page->lru);
                         ClearPageLRU(page);
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index 10ab1e6b1161..c6e500722819 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -179,9 +179,11 @@ static int do_map_colored_pages(struct vm_area_struct *vma)
                 TRACE_CUR(ALLOC_NAME ": insert page (pa:0x%10llx, pfn:%8lu, "
                                 "color:%3lu) at 0x%lx\n", page_to_phys(page),
                                 page_to_pfn(page), this_color, addr);
-                err = vm_insert_page(vma, addr, page);
+                //err = vm_insert_page(vma, addr, page);
+                err = remap_pfn_range(vma, addr, page_to_pfn(page),
+                                PAGE_SIZE, PAGE_SHARED);
                 if (err) {
-                        TRACE_CUR(ALLOC_NAME ": vm_insert_page() failed "
+                        TRACE_CUR(ALLOC_NAME ": remap_pfn_range() failed "
                                         "(%d)\n", err);
                         /* TODO unmap mapped pages */
                         err = -EINVAL;