Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933823AbbENRLW (ORCPT ); Thu, 14 May 2015 13:11:22 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:21197 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030279AbbENRKt (ORCPT ); Thu, 14 May 2015 13:10:49 -0400 From: Sasha Levin To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, kirill@shutemov.name, Sasha Levin Subject: [PATCH 10/11] mm: debug: kill VM_BUG_ON_MM Date: Thu, 14 May 2015 13:10:13 -0400 Message-Id: <1431623414-1905-11-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431623414-1905-1-git-send-email-sasha.levin@oracle.com> References: <1431623414-1905-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3717 Lines: 111 Just use VM_BUG() instead. Signed-off-by: Sasha Levin --- include/linux/mmdebug.h | 8 -------- kernel/fork.c | 2 +- mm/gup.c | 2 +- mm/huge_memory.c | 2 +- mm/mmap.c | 2 +- mm/pagewalk.c | 2 +- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 5106ab5..b810800 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -20,13 +20,6 @@ char *format_mm(const struct mm_struct *mm, char *buf, char *end); } \ } while (0) #define VM_BUG_ON(cond) VM_BUG(cond, "%s\n", __stringify(cond)) -#define VM_BUG_ON_MM(cond, mm) \ - do { \ - if (unlikely(cond)) { \ - pr_emerg("%pZm", mm); \ - BUG(); \ - } \ - } while (0) #define VM_WARN_ON(cond) WARN_ON(cond) #define VM_WARN_ON_ONCE(cond) WARN_ON_ONCE(cond) #define VM_WARN_ONCE(cond, format...) WARN_ONCE(cond, format) @@ -41,7 +34,6 @@ static char *format_mm(const struct mm_struct *mm, char *buf, char *end) } #define VM_BUG(cond, fmt...) BUILD_BUG_ON_INVALID(cond) #define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond) -#define VM_BUG_ON_MM(cond, mm) VM_BUG_ON(cond) #define VM_WARN_ON(cond) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond) diff --git a/kernel/fork.c b/kernel/fork.c index 2e67086..3dd29c1 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -645,7 +645,7 @@ static void check_mm(struct mm_struct *mm) mm_nr_pmds(mm)); #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS - VM_BUG_ON_MM(mm->pmd_huge_pte, mm); + VM_BUG(mm->pmd_huge_pte, "%pZm", mm); #endif } diff --git a/mm/gup.c b/mm/gup.c index 0b851ac..57cc2de 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -848,7 +848,7 @@ long populate_vma_page_range(struct vm_area_struct *vma, VM_BUG_ON(end & ~PAGE_MASK); VM_BUG(start < vma->vm_start, "%pZv", vma); VM_BUG(end > vma->vm_end, "%pZv", vma); - VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm); + VM_BUG(!rwsem_is_locked(&mm->mmap_sem), "%pZm", mm); gup_flags = FOLL_TOUCH | FOLL_POPULATE; /* diff --git a/mm/huge_memory.c b/mm/huge_memory.c index ed222a4..3d6d6c5 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2071,7 +2071,7 @@ int __khugepaged_enter(struct mm_struct *mm) return -ENOMEM; /* __khugepaged_exit() must not run from under us */ - VM_BUG_ON_MM(khugepaged_test_exit(mm), mm); + VM_BUG(khugepaged_test_exit(mm), "%pZm", mm); if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags))) { free_mm_slot(mm_slot); return 0; diff --git a/mm/mmap.c b/mm/mmap.c index f2db320..311a795 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -464,7 +464,7 @@ static void validate_mm(struct mm_struct *mm) pr_emerg("map_count %d rb %d\n", mm->map_count, i); bug = 1; } - VM_BUG_ON_MM(bug, mm); + VM_BUG(bug, "%pZm", mm); } #else #define validate_mm_rb(root, ignore) do { } while (0) diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 29f2f8b..952cddc 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -249,7 +249,7 @@ int walk_page_range(unsigned long start, unsigned long end, if (!walk->mm) return -EINVAL; - VM_BUG_ON_MM(!rwsem_is_locked(&walk->mm->mmap_sem), walk->mm); + VM_BUG(!rwsem_is_locked(&walk->mm->mmap_sem), "%pZm", walk->mm); vma = find_vma(walk->mm, start); do { -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/