aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2011-01-13 18:47:15 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:32:47 -0500
commit14d1a55cd26f1860f837f37ae42520c7c13b1347 (patch)
treeb80634a6a2a5f306fd1c3fc408993dd9fc98202b /mm
parent05b258e99725112c4febeab4fad23ea2c8908a3a (diff)
thp: add debug checks for mapcount related invariants
Add debug checks for invariants that if broken could lead to mapcount vs page_mapcount debug checks to trigger later in split_huge_page. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 12ee1ea237f5..31250faff390 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -804,6 +804,7 @@ static inline int copy_pmd_range(struct mm_struct *dst_mm, struct mm_struct *src
804 next = pmd_addr_end(addr, end); 804 next = pmd_addr_end(addr, end);
805 if (pmd_trans_huge(*src_pmd)) { 805 if (pmd_trans_huge(*src_pmd)) {
806 int err; 806 int err;
807 VM_BUG_ON(next-addr != HPAGE_PMD_SIZE);
807 err = copy_huge_pmd(dst_mm, src_mm, 808 err = copy_huge_pmd(dst_mm, src_mm,
808 dst_pmd, src_pmd, addr, vma); 809 dst_pmd, src_pmd, addr, vma);
809 if (err == -ENOMEM) 810 if (err == -ENOMEM)
@@ -1015,9 +1016,10 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
1015 do { 1016 do {
1016 next = pmd_addr_end(addr, end); 1017 next = pmd_addr_end(addr, end);
1017 if (pmd_trans_huge(*pmd)) { 1018 if (pmd_trans_huge(*pmd)) {
1018 if (next-addr != HPAGE_PMD_SIZE) 1019 if (next-addr != HPAGE_PMD_SIZE) {
1020 VM_BUG_ON(!rwsem_is_locked(&tlb->mm->mmap_sem));
1019 split_huge_page_pmd(vma->vm_mm, pmd); 1021 split_huge_page_pmd(vma->vm_mm, pmd);
1020 else if (zap_huge_pmd(tlb, vma, pmd)) { 1022 } else if (zap_huge_pmd(tlb, vma, pmd)) {
1021 (*zap_work)--; 1023 (*zap_work)--;
1022 continue; 1024 continue;
1023 } 1025 }