9/22/2016

1 files changed, 116 insertions, 13 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 8f378ac675d7..60d7e38cf73d 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -36,6 +36,9 @@
 #include <linux/rmap.h>
 #include "internal.h"
 
+#include <litmus/litmus.h>
+#include <litmus/mc2_common.h>
+
 #define CREATE_TRACE_POINTS
 #include <trace/events/filemap.h>
 
@@ -970,13 +973,23 @@ repeat:
         page = NULL;
         pagep = radix_tree_lookup_slot(&mapping->page_tree, offset);
         if (pagep) {
-                void *pdesc;
-                pdesc = radix_tree_deref_slot(pagep);
-                if (pdesc)
-                        page = (struct page*)pdesc;
-                //page = radix_tree_deref_slot(pagep);
+                page = radix_tree_deref_slot(pagep);
                 if (unlikely(!page))
                         goto out;
+                if (is_pcache_desc(page)) {
+                        struct pcache_desc *pcd;
+
+printk(KERN_INFO "PCACHE_DESC\n");
+
+                        pcd = ptr_to_pcache_desc(page);
+                        page = pcd->master;
+                        page_cache_get_speculative(page);
+                        
+                        unreplicate_pcache(mapping, page->index);
+
+                        goto out;
+                }
+                        
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page))
                                 goto repeat;
@@ -1175,6 +1188,21 @@ repeat:
                 page = radix_tree_deref_slot(slot);
                 if (unlikely(!page))
                         continue;
+                
+                if (is_pcache_desc(page)) {
+                        struct pcache_desc *pcd;
+
+printk(KERN_INFO "PCACHE_DESC\n");
+
+                        pcd = ptr_to_pcache_desc(page);
+                        page = pcd->master;
+                        page_cache_get_speculative(page);
+                        
+                        unreplicate_pcache(mapping, page->index);
+
+                        goto export;
+                }
+                
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page))
                                 goto restart;
@@ -1238,6 +1266,20 @@ repeat:
                 if (unlikely(!page))
                         continue;
 
+                if (is_pcache_desc(page)) {
+                        struct pcache_desc *pcd;
+
+printk(KERN_INFO "PCACHE_DESC\n");
+
+                        pcd = ptr_to_pcache_desc(page);
+                        page = pcd->master;
+                        page_cache_get_speculative(page);
+                        
+                        unreplicate_pcache(mapping, page->index);
+
+                        goto export;
+                }
+                
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page)) {
                                 /*
@@ -1264,7 +1306,7 @@ repeat:
                         page_cache_release(page);
                         goto repeat;
                 }
-
+export:
                 pages[ret] = page;
                 if (++ret == nr_pages)
                         break;
@@ -1306,6 +1348,21 @@ repeat:
                 if (unlikely(!page))
                         break;
 
+                if (is_pcache_desc(page)) {
+                        struct pcache_desc *pcd;
+
+printk(KERN_INFO "PCACHE_DESC\n");
+
+                        pcd = ptr_to_pcache_desc(page);
+                        page = pcd->master;
+                        if (!page_cache_get_speculative(page))
+                                goto repeat;
+                        
+                        unreplicate_pcache(mapping, page->index);
+
+                        goto export;
+                }
+                
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page)) {
                                 /*
@@ -1331,7 +1388,7 @@ repeat:
                         page_cache_release(page);
                         goto repeat;
                 }
-
+export:
                 /*
                  * must check mapping and index after taking the ref.
                  * otherwise we can get both false positives and false
@@ -1382,6 +1439,10 @@ repeat:
                 if (unlikely(!page))
                         continue;
 
+                if (is_pcache_desc(page)) {
+                        BUG();
+                }
+                        
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page)) {
                                 /*
@@ -1489,7 +1550,13 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
 
                 cond_resched();
 find_page:
-                page = find_get_page(mapping, index);
+                if (tsk_mc2_data(current)) {
+                        printk(KERN_INFO "RT  Task file_read1\n");
+                        page = find_get_page_readonly(mapping, index);
+                }
+                else
+                        page = find_get_page(mapping, index);
+                
                 if (!page) {
                         page_cache_sync_readahead(mapping,
                                         ra, filp,
@@ -1526,7 +1593,6 @@ page_ok:
                  * part of the page is not copied back to userspace (unless
                  * another truncate extends the file - this is desired though).
                  */
-
                 isize = i_size_read(inode);
                 end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
                 if (unlikely(!isize || index > end_index)) {
@@ -1544,7 +1610,16 @@ page_ok:
                         }
                 }
                 nr = nr - offset;
-
+        
+                if (tsk_mc2_data(current)) {
+                        printk(KERN_INFO "RT  Task file_read2\n");
+                        page_cache_release(page);
+                        page = find_get_page_readonly(mapping, index);
+                        if (!page) {
+                                BUG();
+                        }
+                }
+                
                 /* If users can be writing to this page using arbitrary
                  * virtual addresses, take care about potential aliasing
                  * before reading the page on the kernel side.
@@ -1885,7 +1960,13 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         /*
          * Do we have something in the page cache already?
          */
-        page = find_get_page(mapping, offset);
+        if (tsk_mc2_data(current)) {
+                printk(KERN_INFO "RT  Task filemap_fault1\n");
+                page = find_get_page_readonly(mapping, offset);
+        }
+        else
+                page = find_get_page(mapping, offset);
+        
         if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) {
                 /*
                  * We found the page, so try async readahead before
@@ -1899,7 +1980,13 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
                 ret = VM_FAULT_MAJOR;
 retry_find:
-                page = find_get_page(mapping, offset);
+                if (tsk_mc2_data(current)) {
+                        printk(KERN_INFO "RT  Task filemap_fault2\n");
+                        page = find_get_page_readonly(mapping, offset);
+                }
+                else
+                        page = find_get_page(mapping, offset);
+                
                 if (!page)
                         goto no_cached_page;
         }
@@ -2007,6 +2094,22 @@ repeat:
                 page = radix_tree_deref_slot(slot);
                 if (unlikely(!page))
                         goto next;
+                
+                if (is_pcache_desc(page)) {
+                        struct pcache_desc *pcd;
+
+printk(KERN_INFO "PCACHE_DESC\n");
+
+                        pcd = ptr_to_pcache_desc(page);
+                        page = pcd->master;
+                        if (!page_cache_get_speculative(page))
+                                goto repeat;
+                        
+                        unreplicate_pcache(mapping, page->index);
+
+                        goto export;
+                }
+                
                 if (radix_tree_exception(page)) {
                         if (radix_tree_deref_retry(page))
                                 break;
@@ -2022,7 +2125,7 @@ repeat:
                         page_cache_release(page);
                         goto repeat;
                 }
-
+export:
                 if (!PageUptodate(page) ||
                                 PageReadahead(page) ||
                                 PageHWPoison(page))