aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>2015-02-11 18:27:46 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 20:06:05 -0500
commit5c64f52acdbc615e3ef58692f42ee00b83d0225d (patch)
tree0954fd3aa46450a6f26c74ee1df7b6424ebd8a8e /fs/proc
parent14eb6fdd4204d215a14ecd9f84a1ca66faabcc4d (diff)
clear_refs: remove clear_refs_private->vma and introduce clear_refs_test_walk()
clear_refs_write() has some prechecks to determine if we really walk over a given vma. Now we have a test_walk() callback to filter vmas, so let's utilize it. Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Pavel Emelyanov <xemul@parallels.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/task_mmu.c46
1 files changed, 22 insertions, 24 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 73425398b38c..bed0834715a5 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -736,7 +736,6 @@ enum clear_refs_types {
736}; 736};
737 737
738struct clear_refs_private { 738struct clear_refs_private {
739 struct vm_area_struct *vma;
740 enum clear_refs_types type; 739 enum clear_refs_types type;
741}; 740};
742 741
@@ -767,7 +766,7 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
767 unsigned long end, struct mm_walk *walk) 766 unsigned long end, struct mm_walk *walk)
768{ 767{
769 struct clear_refs_private *cp = walk->private; 768 struct clear_refs_private *cp = walk->private;
770 struct vm_area_struct *vma = cp->vma; 769 struct vm_area_struct *vma = walk->vma;
771 pte_t *pte, ptent; 770 pte_t *pte, ptent;
772 spinlock_t *ptl; 771 spinlock_t *ptl;
773 struct page *page; 772 struct page *page;
@@ -801,6 +800,25 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
801 return 0; 800 return 0;
802} 801}
803 802
803static int clear_refs_test_walk(unsigned long start, unsigned long end,
804 struct mm_walk *walk)
805{
806 struct clear_refs_private *cp = walk->private;
807 struct vm_area_struct *vma = walk->vma;
808
809 /*
810 * Writing 1 to /proc/pid/clear_refs affects all pages.
811 * Writing 2 to /proc/pid/clear_refs only affects anonymous pages.
812 * Writing 3 to /proc/pid/clear_refs only affects file mapped pages.
813 * Writing 4 to /proc/pid/clear_refs affects all pages.
814 */
815 if (cp->type == CLEAR_REFS_ANON && vma->vm_file)
816 return 1;
817 if (cp->type == CLEAR_REFS_MAPPED && !vma->vm_file)
818 return 1;
819 return 0;
820}
821
804static ssize_t clear_refs_write(struct file *file, const char __user *buf, 822static ssize_t clear_refs_write(struct file *file, const char __user *buf,
805 size_t count, loff_t *ppos) 823 size_t count, loff_t *ppos)
806{ 824{
@@ -841,6 +859,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
841 }; 859 };
842 struct mm_walk clear_refs_walk = { 860 struct mm_walk clear_refs_walk = {
843 .pmd_entry = clear_refs_pte_range, 861 .pmd_entry = clear_refs_pte_range,
862 .test_walk = clear_refs_test_walk,
844 .mm = mm, 863 .mm = mm,
845 .private = &cp, 864 .private = &cp,
846 }; 865 };
@@ -860,28 +879,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
860 } 879 }
861 mmu_notifier_invalidate_range_start(mm, 0, -1); 880 mmu_notifier_invalidate_range_start(mm, 0, -1);
862 } 881 }
863 for (vma = mm->mmap; vma; vma = vma->vm_next) { 882 walk_page_range(0, ~0UL, &clear_refs_walk);
864 cp.vma = vma;
865 if (is_vm_hugetlb_page(vma))
866 continue;
867 /*
868 * Writing 1 to /proc/pid/clear_refs affects all pages.
869 *
870 * Writing 2 to /proc/pid/clear_refs only affects
871 * Anonymous pages.
872 *
873 * Writing 3 to /proc/pid/clear_refs only affects file
874 * mapped pages.
875 *
876 * Writing 4 to /proc/pid/clear_refs affects all pages.
877 */
878 if (type == CLEAR_REFS_ANON && vma->vm_file)
879 continue;
880 if (type == CLEAR_REFS_MAPPED && !vma->vm_file)
881 continue;
882 walk_page_range(vma->vm_start, vma->vm_end,
883 &clear_refs_walk);
884 }
885 if (type == CLEAR_REFS_SOFT_DIRTY) 883 if (type == CLEAR_REFS_SOFT_DIRTY)
886 mmu_notifier_invalidate_range_end(mm, 0, -1); 884 mmu_notifier_invalidate_range_end(mm, 0, -1);
887 flush_tlb_mm(mm); 885 flush_tlb_mm(mm);