share branch with otherswip-mmap-uncache

2 files changed, 30 insertions, 42 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 84c64c4ef4b5..aebaabf4eb69 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1202,55 +1202,43 @@ static inline int accountable_mapping(struct file *file, vm_flags_t vm_flags)
 }
 
 
-
-
-#if 0
-#ifdef CONFIG_X86_PAT
 static int make_pages_uncache(unsigned long addr, unsigned long end)
 {
-        struct vm_area_struct * vma;
-        int len;
-        int ret;
+        int ret = 0;
+        int nr_pages;
+        struct page **pages;
+        struct vm_area_struct *vma;
+        void *page_addr;
+        void *vaddr;
+        int i;
 
         vma = find_vma(current->mm, addr);
         if (!vma)
                 return -ENOMEM;
 
         BUG_ON(addr >= end);
-        BUG_ON(end > vma->vm_end);
 
-        len = DIV_ROUND_UP(end, PAGE_SIZE) - addr/PAGE_SIZE;
+        nr_pages = DIV_ROUND_UP(end, PAGE_SIZE) - addr/PAGE_SIZE;
+        pages = kmalloc(nr_pages * sizeof(*pages), GFP_KERNEL);
+//      page_addr = (void *)(addr & PAGE_MASK);
+        page_addr = (void *)(vma->vm_start & PAGE_MASK);
 
-        printk("%s: Marking addresses from %p to %p as uncacheable (%d pages).\n", __FUNCTION__, (void*)vma->vm_start, (void*)vma->vm_end, len);
-        ret = set_memory_uc(vma->vm_start, len);
-//      ret = set_memory_uc((unsigned long)pfn_to_kaddr(page_to_pfn(virt_to_page(vma->vm_start))), len);
-        printk("%s: result = %d\n", __FUNCTION__, ret);
-
-        return ret;
-}
-#else
-static int make_pages_uncache(unsigned long addr, unsigned long end)
-{
-        // use ioremap_nocache()?
-        return -ENOMEM;
-}
-#endif
-#endif
+        if (NULL == pages)
+                return -ENOMEM;
 
-static int make_pages_uncache(unsigned long addr, unsigned long end)
-{
-        int len;
-        struct vm_area_struct *vma;
+        for(i = 0; i < nr_pages; ++i, page_addr += PAGE_SIZE) {
+                pages[i] = page_addr;
+        }
 
-        vma = find_vma(current->mm, addr);
-        if (!vma)
-                return -ENOMEM;
+        vaddr = vmap(pages, nr_pages, VM_MAP, pgprot_noncached(vma->vm_page_prot));
+        if (NULL == vaddr)
+                ret = -ENOMEM;
 
-        BUG_ON(addr >= end);
-        BUG_ON(end > vma->vm_end);
+        kfree(pages);
 
-        len = DIV_ROUND_UP(end, PAGE_SIZE) - addr/PAGE_SIZE;
+        printk("uncache ret = %d\n", ret);
 
+        return ret;
 }
 
 unsigned long mmap_region(struct file *file, unsigned long addr,
@@ -1267,6 +1255,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 
         /* Clear old maps */
         error = -ENOMEM;
+
 munmap_back:
         vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
         if (vma && vma->vm_start < addr + len) {
@@ -1396,17 +1385,15 @@ out:
                 if (!mlock_vma_pages_range(vma, addr, addr + len)) {
                         mm->locked_vm += (len >> PAGE_SHIFT);
                 }
-        } else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK)) {
-                if (flags & MAP_UNCACHE) {
-                        printk("populate!\n");
-                }
+        }
+        else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK)) {
                 make_pages_present(addr, addr + len);
         }
-/*
+
         if (flags & MAP_UNCACHE) {
+                /* is this needed with pgprot_noncached() set earlier? */
                 make_pages_uncache(addr, addr + len);
         }
-        */
 
         return addr;
 
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 940257b5774e..916c02e845a6 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -92,7 +92,8 @@ ifndef PERF_DEBUG
   CFLAGS_OPTIMIZE = -O6
 endif
 
-CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
+#CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
+CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
 EXTLIBS = -lpthread -lrt -lelf -lm
 ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 ALL_LDFLAGS = $(LDFLAGS)
@@ -161,7 +162,7 @@ endif
 # Those must not be GNU-specific; they are shared with perl/ which may
 # be built by a different compiler. (Note that this is an artifact now
 # but it still might be nice to keep that distinction.)
-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include
+BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I/home/gelliott/LitmusGPU/litmus-rt/include
 BASIC_LDFLAGS =
 
 # Guard against environment variables