2 files changed, 39 insertions, 6 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index becf92ca54f3..7ab4e32afe12 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1285,6 +1285,7 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         int target_nid, last_cpupid = -1;
         bool page_locked;
         bool migrated = false;
+        int flags = 0;
 
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_same(pmd, *pmdp)))
@@ -1299,6 +1300,14 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
 
         /*
+         * Avoid grouping on DSO/COW pages in specific and RO pages
+         * in general, RO pages shouldn't hurt as much anyway since
+         * they can be in shared cache state.
+         */
+        if (!pmd_write(pmd))
+                flags |= TNF_NO_GROUP;
+
+        /*
          * Acquire the page lock to serialise THP migrations but avoid dropping
          * page_table_lock if at all possible
          */
@@ -1343,8 +1352,10 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         spin_unlock(&mm->page_table_lock);
         migrated = migrate_misplaced_transhuge_page(mm, vma,
                                 pmdp, pmd, addr, page, target_nid);
-        if (migrated)
+        if (migrated) {
+                flags |= TNF_MIGRATED;
                 page_nid = target_nid;
+        }
 
         goto out;
 clear_pmdnuma:
@@ -1362,7 +1373,7 @@ out:
                 page_unlock_anon_vma_read(anon_vma);
 
         if (page_nid != -1)
-                task_numa_fault(last_cpupid, page_nid, HPAGE_PMD_NR, migrated);
+                task_numa_fault(last_cpupid, page_nid, HPAGE_PMD_NR, flags);
 
         return 0;
 }
diff --git a/mm/memory.c b/mm/memory.c
index c57efa25cdbb..eba846bcf124 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3547,6 +3547,7 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         int last_cpupid;
         int target_nid;
         bool migrated = false;
+        int flags = 0;
 
         /*
         * The "pte" at this point cannot be used safely without
@@ -3575,6 +3576,14 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         }
         BUG_ON(is_zero_pfn(page_to_pfn(page)));
 
+        /*
+         * Avoid grouping on DSO/COW pages in specific and RO pages
+         * in general, RO pages shouldn't hurt as much anyway since
+         * they can be in shared cache state.
+         */
+        if (!pte_write(pte))
+                flags |= TNF_NO_GROUP;
+
         last_cpupid = page_cpupid_last(page);
         page_nid = page_to_nid(page);
         target_nid = numa_migrate_prep(page, vma, addr, page_nid);
@@ -3586,12 +3595,14 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
         /* Migrate to the requested node */
         migrated = migrate_misplaced_page(page, vma, target_nid);
-        if (migrated)
+        if (migrated) {
                 page_nid = target_nid;
+                flags |= TNF_MIGRATED;
+        }
 
 out:
         if (page_nid != -1)
-                task_numa_fault(last_cpupid, page_nid, 1, migrated);
+                task_numa_fault(last_cpupid, page_nid, 1, flags);
         return 0;
 }
 
@@ -3632,6 +3643,7 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 int page_nid = -1;
                 int target_nid;
                 bool migrated = false;
+                int flags = 0;
 
                 if (!pte_present(pteval))
                         continue;
@@ -3651,20 +3663,30 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 if (unlikely(!page))
                         continue;
 
+                /*
+                 * Avoid grouping on DSO/COW pages in specific and RO pages
+                 * in general, RO pages shouldn't hurt as much anyway since
+                 * they can be in shared cache state.
+                 */
+                if (!pte_write(pteval))
+                        flags |= TNF_NO_GROUP;
+
                 last_cpupid = page_cpupid_last(page);
                 page_nid = page_to_nid(page);
                 target_nid = numa_migrate_prep(page, vma, addr, page_nid);
                 pte_unmap_unlock(pte, ptl);
                 if (target_nid != -1) {
                         migrated = migrate_misplaced_page(page, vma, target_nid);
-                        if (migrated)
+                        if (migrated) {
                                 page_nid = target_nid;
+                                flags |= TNF_MIGRATED;
+                        }
                 } else {
                         put_page(page);
                 }
 
                 if (page_nid != -1)
-                        task_numa_fault(last_cpupid, page_nid, 1, migrated);
+                        task_numa_fault(last_cpupid, page_nid, 1, flags);
 
                 pte = pte_offset_map_lock(mm, pmdp, addr, &ptl);
         }