Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: use VM_BUG_ON_MM where possible

Browse Source 
Dump the contents of the relevant struct_mm when we hit the bug condition.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sasha Levin 2014-10-09 15:28:39 -07:00 committed by Linus Torvalds
parent 31c9afa6db
commit 96dad67ff2
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/fork.c
View File

@ -601,9 +601,8 @@ static void check_mm(struct mm_struct *mm)
printk(KERN_ALERT "BUG: Bad rss-counter state " printk(KERN_ALERT "BUG: Bad rss-counter state "
"mm:%p idx:%d val:%ld\n", mm, i, x); "mm:%p idx:%d val:%ld\n", mm, i, x);
} }
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
VM_BUG_ON(mm->pmd_huge_pte); VM_BUG_ON_MM(mm->pmd_huge_pte, mm);
#endif #endif
} }

2
kernel/sys.c
View File

@ -1634,7 +1634,7 @@ static int prctl_set_mm_exe_file_locked(struct mm_struct *mm, unsigned int fd)
struct inode *inode; struct inode *inode;
int err; int err;
VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem)); VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm);
exe = fdget(fd); exe = fdget(fd);
if (!exe.file) if (!exe.file)

2
mm/huge_memory.c
View File

@ -2048,7 +2048,7 @@ int __khugepaged_enter(struct mm_struct *mm)
return -ENOMEM; return -ENOMEM;
/* __khugepaged_exit() must not run from under us */ /* __khugepaged_exit() must not run from under us */
VM_BUG_ON(khugepaged_test_exit(mm)); VM_BUG_ON_MM(khugepaged_test_exit(mm), mm);
if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags))) { if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags))) {
free_mm_slot(mm_slot); free_mm_slot(mm_slot);
return 0; return 0;

2
mm/mlock.c
View File

@ -235,7 +235,7 @@ long __mlock_vma_pages_range(struct vm_area_struct *vma,
VM_BUG_ON(end & ~PAGE_MASK); VM_BUG_ON(end & ~PAGE_MASK);
VM_BUG_ON_VMA(start < vma->vm_start, vma); VM_BUG_ON_VMA(start < vma->vm_start, vma);
VM_BUG_ON_VMA(end > vma->vm_end, vma); VM_BUG_ON_VMA(end > vma->vm_end, vma);
VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem)); VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm);
gup_flags = FOLL_TOUCH | FOLL_MLOCK; gup_flags = FOLL_TOUCH | FOLL_MLOCK;
/* /*

7
mm/mmap.c
View File

@ -410,8 +410,9 @@ static void validate_mm_rb(struct rb_root *root, struct vm_area_struct *ignore)
for (nd = rb_first(root); nd; nd = rb_next(nd)) { for (nd = rb_first(root); nd; nd = rb_next(nd)) {
struct vm_area_struct *vma; struct vm_area_struct *vma;
vma = rb_entry(nd, struct vm_area_struct, vm_rb); vma = rb_entry(nd, struct vm_area_struct, vm_rb);
BUG_ON(vma != ignore && VM_BUG_ON_VMA(vma != ignore &&
vma->rb_subtree_gap != vma_compute_subtree_gap(vma)); vma->rb_subtree_gap != vma_compute_subtree_gap(vma),
vma);
} }
} }
@ -448,7 +449,7 @@ static void validate_mm(struct mm_struct *mm)
pr_emerg("map_count %d rb %d\n", mm->map_count, i); pr_emerg("map_count %d rb %d\n", mm->map_count, i);
bug = 1; bug = 1;
} }
BUG_ON(bug); VM_BUG_ON_MM(bug, mm);
} }
#else #else
#define validate_mm_rb(root, ignore) do { } while (0) #define validate_mm_rb(root, ignore) do { } while (0)

2
mm/pagewalk.c
View File

@ -177,7 +177,7 @@ int walk_page_range(unsigned long addr, unsigned long end,
if (!walk->mm) if (!walk->mm)
return -EINVAL; return -EINVAL;
VM_BUG_ON(!rwsem_is_locked(&walk->mm->mmap_sem)); VM_BUG_ON_MM(!rwsem_is_locked(&walk->mm->mmap_sem), walk->mm);
pgd = pgd_offset(walk->mm, addr); pgd = pgd_offset(walk->mm, addr);
do { do {