aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-12-11 19:01:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 20:22:24 -0500
commita1dd450bcb1a05e8218b9aac0ee36f8755d8a140 (patch)
treea46f3306e3802b59ed5df6eef0e03b8b11cca30c /mm/memory.c
parenteb2db439a3203ae86c35ad277ac4a3268a94baa1 (diff)
mm: thp: set the accessed flag for old pages on access fault
On x86 memory accesses to pages without the ACCESSED flag set result in the ACCESSED flag being set automatically. With the ARM architecture a page access fault is raised instead (and it will continue to be raised until the ACCESSED flag is set for the appropriate PTE/PMD). For normal memory pages, handle_pte_fault will call pte_mkyoung (effectively setting the ACCESSED flag). For transparent huge pages, pmd_mkyoung will only be called for a write fault. This patch ensures that faults on transparent hugepages which do not result in a CoW update the access flags for the faulting pmd. Signed-off-by: Will Deacon <will.deacon@arm.com> Cc: Chris Metcalf <cmetcalf@tilera.com> Acked-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: Andrea Arcangeli <aarcange@redhat.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Ni zhan Chen <nizhan.chen@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 221fc9ffcab1..765377385632 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3537,8 +3537,9 @@ retry:
3537 3537
3538 barrier(); 3538 barrier();
3539 if (pmd_trans_huge(orig_pmd)) { 3539 if (pmd_trans_huge(orig_pmd)) {
3540 if (flags & FAULT_FLAG_WRITE && 3540 unsigned int dirty = flags & FAULT_FLAG_WRITE;
3541 !pmd_write(orig_pmd) && 3541
3542 if (dirty && !pmd_write(orig_pmd) &&
3542 !pmd_trans_splitting(orig_pmd)) { 3543 !pmd_trans_splitting(orig_pmd)) {
3543 ret = do_huge_pmd_wp_page(mm, vma, address, pmd, 3544 ret = do_huge_pmd_wp_page(mm, vma, address, pmd,
3544 orig_pmd); 3545 orig_pmd);
@@ -3550,6 +3551,9 @@ retry:
3550 if (unlikely(ret & VM_FAULT_OOM)) 3551 if (unlikely(ret & VM_FAULT_OOM))
3551 goto retry; 3552 goto retry;
3552 return ret; 3553 return ret;
3554 } else {
3555 huge_pmd_set_accessed(mm, vma, address, pmd,
3556 orig_pmd, dirty);
3553 } 3557 }
3554 return 0; 3558 return 0;
3555 } 3559 }