Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d1b09c authored by Sasha Levin's avatar Sasha Levin Committed by Linus Torvalds
Browse files

mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA 



Trivially convert a few VM_BUG_ON calls to VM_BUG_ON_VMA to extract
more information when they trigger.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
Reviewed-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michel Lespinasse <walken@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa3759cc

include/linux/huge_mm.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ extern int __pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma, 
static inline int pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl)

{

	VM_BUG_ON(!rwsem_is_locked(&vma->vm_mm->mmap_sem));

	VM_BUG_ON_VMA(!rwsem_is_locked(&vma->vm_mm->mmap_sem), vma);

	if (pmd_trans_huge(*pmd))

		return __pmd_trans_huge_lock(pmd, vma, ptl);

	else

include/linux/rmap.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *); 
static inline void anon_vma_merge(struct vm_area_struct *vma,

				  struct vm_area_struct *next)

{

	VM_BUG_ON(vma->anon_vma != next->anon_vma);

	VM_BUG_ON_VMA(vma->anon_vma != next->anon_vma, vma);

	unlink_anon_vmas(next);

}

mm/huge_memory.c

+3 −3
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
	unsigned long mmun_end;		/* For mmu_notifiers */



	ptl = pmd_lockptr(mm, pmd);

	VM_BUG_ON(!vma->anon_vma);

	VM_BUG_ON_VMA(!vma->anon_vma, vma);

	haddr = address & HPAGE_PMD_MASK;

	if (is_huge_zero_pmd(orig_pmd))

		goto alloc;
@@ -2083,7 +2083,7 @@ int khugepaged_enter_vma_merge(struct vm_area_struct *vma) 
	if (vma->vm_ops)

		/* khugepaged not yet working on file or special mappings */

		return 0;

	VM_BUG_ON(vma->vm_flags & VM_NO_THP);

	VM_BUG_ON_VMA(vma->vm_flags & VM_NO_THP, vma);

	hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;

	hend = vma->vm_end & HPAGE_PMD_MASK;

	if (hstart < hend)
@@ -2406,7 +2406,7 @@ static bool hugepage_vma_check(struct vm_area_struct *vma) 
		return false;

	if (is_vma_temporary_stack(vma))

		return false;

	VM_BUG_ON(vma->vm_flags & VM_NO_THP);

	VM_BUG_ON_VMA(vma->vm_flags & VM_NO_THP, vma);

	return true;

}

mm/hugetlb.c

+7 −7
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static inline struct resv_map *inode_resv_map(struct inode *inode) 


static struct resv_map *vma_resv_map(struct vm_area_struct *vma)

{

	VM_BUG_ON(!is_vm_hugetlb_page(vma));

	VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);

	if (vma->vm_flags & VM_MAYSHARE) {

		struct address_space *mapping = vma->vm_file->f_mapping;

		struct inode *inode = mapping->host;
@@ -449,8 +449,8 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma) 


static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map)

{

	VM_BUG_ON(!is_vm_hugetlb_page(vma));

	VM_BUG_ON(vma->vm_flags & VM_MAYSHARE);

	VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);

	VM_BUG_ON_VMA(vma->vm_flags & VM_MAYSHARE, vma);



	set_vma_private_data(vma, (get_vma_private_data(vma) &

				HPAGE_RESV_MASK) | (unsigned long)map);
@@ -458,15 +458,15 @@ static void set_vma_resv_map(struct vm_area_struct *vma, struct resv_map *map) 


static void set_vma_resv_flags(struct vm_area_struct *vma, unsigned long flags)

{

	VM_BUG_ON(!is_vm_hugetlb_page(vma));

	VM_BUG_ON(vma->vm_flags & VM_MAYSHARE);

	VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);

	VM_BUG_ON_VMA(vma->vm_flags & VM_MAYSHARE, vma);



	set_vma_private_data(vma, get_vma_private_data(vma) | flags);

}



static int is_vma_resv_set(struct vm_area_struct *vma, unsigned long flag)

{

	VM_BUG_ON(!is_vm_hugetlb_page(vma));

	VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);



	return (get_vma_private_data(vma) & flag) != 0;

}
@@ -474,7 +474,7 @@ static int is_vma_resv_set(struct vm_area_struct *vma, unsigned long flag) 
/* Reset counters to 0 and clear all HPAGE_RESV_* flags */

void reset_vma_resv_huge_pages(struct vm_area_struct *vma)

{

	VM_BUG_ON(!is_vm_hugetlb_page(vma));

	VM_BUG_ON_VMA(!is_vm_hugetlb_page(vma), vma);

	if (!(vma->vm_flags & VM_MAYSHARE))

		vma->vm_private_data = (void *)0;

}

mm/interval_tree.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void vma_interval_tree_insert_after(struct vm_area_struct *node, 
	struct vm_area_struct *parent;

	unsigned long last = vma_last_pgoff(node);



	VM_BUG_ON(vma_start_pgoff(node) != vma_start_pgoff(prev));

	VM_BUG_ON_VMA(vma_start_pgoff(node) != vma_start_pgoff(prev), node);



	if (!prev->shared.linear.rb.rb_right) {

		parent = prev;