Commit 45f83cef authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

mm: thp: fix up pmd_trans_unstable() locations 



pmd_trans_unstable() should be called before pmd_offset_map() in the
locations where the mmap_sem is held for reading.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mark Salter <msalter@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 623e3db9

fs/proc/task_mmu.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -781,9 +781,6 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
	int err = 0;

	int err = 0;

	pagemap_entry_t pme = make_pme(PM_NOT_PRESENT);

	pagemap_entry_t pme = make_pme(PM_NOT_PRESENT);





	if (pmd_trans_unstable(pmd))

		return 0;



	/* find the first VMA at or above 'addr' */

	/* find the first VMA at or above 'addr' */

	vma = find_vma(walk->mm, addr);

	vma = find_vma(walk->mm, addr);

	spin_lock(&walk->mm->page_table_lock);

	spin_lock(&walk->mm->page_table_lock);
@@ -802,6 +799,8 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
		return err;

		return err;

	}

	}





	if (pmd_trans_unstable(pmd))

		return 0;

	for (; addr != end; addr += PAGE_SIZE) {

	for (; addr != end; addr += PAGE_SIZE) {





		/* check to see if we've left 'vma' behind

		/* check to see if we've left 'vma' behind

mm/memcontrol.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -5306,6 +5306,8 @@ static int mem_cgroup_count_precharge_pte_range(pmd_t *pmd, 
		return 0;

		return 0;

	}

	}





	if (pmd_trans_unstable(pmd))

		return 0;

	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	for (; addr != end; pte++, addr += PAGE_SIZE)

	for (; addr != end; pte++, addr += PAGE_SIZE)

		if (get_mctgt_type(vma, addr, *pte, NULL))

		if (get_mctgt_type(vma, addr, *pte, NULL))
@@ -5502,6 +5504,8 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, 
		return 0;

		return 0;

	}

	}





	if (pmd_trans_unstable(pmd))

		return 0;

retry:

retry:

	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	for (; addr != end; addr += PAGE_SIZE) {

	for (; addr != end; addr += PAGE_SIZE) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE