Commit e4b82222 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm: make rmap_one boolean function 

rmap_one's return value controls whether rmap_work should contine to
scan other ptes or not so it's target for changing to boolean.  Return
true if the scan should be continued.  Otherwise, return false to stop
the scanning.

This patch makes rmap_one's return value to boolean.

Link: http://lkml.kernel.org/r/1489555493-14659-10-git-send-email-minchan@kernel.org


Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1df631ae

include/linux/rmap.h

+5 −1
Original line number Diff line number Diff line
@@ -257,7 +257,11 @@ int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma); 
 */

struct rmap_walk_control {

	void *arg;

	int (*rmap_one)(struct page *page, struct vm_area_struct *vma,

	/*

	 * Return false if page table scanning in rmap_walk should be stopped.

	 * Otherwise, return true.

	 */

	bool (*rmap_one)(struct page *page, struct vm_area_struct *vma,

					unsigned long addr, void *arg);

	int (*done)(struct page *page);

	struct anon_vma *(*anon_lock)(struct page *page);

mm/ksm.c

+1 −1
Original line number Diff line number Diff line
@@ -1977,7 +1977,7 @@ again: 
			if (rwc->invalid_vma && rwc->invalid_vma(vma, rwc->arg))

				continue;



			if (SWAP_AGAIN != rwc->rmap_one(page, vma,

			if (!rwc->rmap_one(page, vma,

					rmap_item->address, rwc->arg)) {

				anon_vma_unlock_read(anon_vma);

				return;

mm/migrate.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void putback_movable_pages(struct list_head *l) 
/*

 * Restore a potential migration pte to a working pte entry

 */

static int remove_migration_pte(struct page *page, struct vm_area_struct *vma,

static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma,

				 unsigned long addr, void *old)

{

	struct page_vma_mapped_walk pvmw = {
@@ -253,7 +253,7 @@ static int remove_migration_pte(struct page *page, struct vm_area_struct *vma, 
		update_mmu_cache(vma, pvmw.address, pvmw.pte);

	}



	return SWAP_AGAIN;

	return true;

}



/*

mm/page_idle.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct page *page_idle_get_page(unsigned long pfn) 
	return page;

}



static int page_idle_clear_pte_refs_one(struct page *page,

static bool page_idle_clear_pte_refs_one(struct page *page,

					struct vm_area_struct *vma,

					unsigned long addr, void *arg)

{
@@ -84,7 +84,7 @@ static int page_idle_clear_pte_refs_one(struct page *page, 
		 */

		set_page_young(page);

	}

	return SWAP_AGAIN;

	return true;

}



static void page_idle_clear_pte_refs(struct page *page)

mm/rmap.c

+15 −15
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ struct page_referenced_arg { 
/*

 * arg: page_referenced_arg will be passed

 */

static int page_referenced_one(struct page *page, struct vm_area_struct *vma,

static bool page_referenced_one(struct page *page, struct vm_area_struct *vma,

			unsigned long address, void *arg)

{

	struct page_referenced_arg *pra = arg;
@@ -741,7 +741,7 @@ static int page_referenced_one(struct page *page, struct vm_area_struct *vma, 
		if (vma->vm_flags & VM_LOCKED) {

			page_vma_mapped_walk_done(&pvmw);

			pra->vm_flags |= VM_LOCKED;

			return SWAP_FAIL; /* To break the loop */

			return false; /* To break the loop */

		}



		if (pvmw.pte) {
@@ -781,9 +781,9 @@ static int page_referenced_one(struct page *page, struct vm_area_struct *vma, 
	}



	if (!pra->mapcount)

		return SWAP_SUCCESS; /* To break the loop */

		return false; /* To break the loop */



	return SWAP_AGAIN;

	return true;

}



static bool invalid_page_referenced_vma(struct vm_area_struct *vma, void *arg)
@@ -854,7 +854,7 @@ int page_referenced(struct page *page, 
	return pra.referenced;

}



static int page_mkclean_one(struct page *page, struct vm_area_struct *vma,

static bool page_mkclean_one(struct page *page, struct vm_area_struct *vma,

			    unsigned long address, void *arg)

{

	struct page_vma_mapped_walk pvmw = {
@@ -907,7 +907,7 @@ static int page_mkclean_one(struct page *page, struct vm_area_struct *vma, 
		}

	}



	return SWAP_AGAIN;

	return true;

}



static bool invalid_mkclean_vma(struct vm_area_struct *vma, void *arg)
@@ -1290,7 +1290,7 @@ void page_remove_rmap(struct page *page, bool compound) 
/*

 * @arg: enum ttu_flags will be passed to this argument

 */

static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,

static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,

		     unsigned long address, void *arg)

{

	struct mm_struct *mm = vma->vm_mm;
@@ -1301,12 +1301,12 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, 
	};

	pte_t pteval;

	struct page *subpage;

	int ret = SWAP_AGAIN;

	bool ret = true;

	enum ttu_flags flags = (enum ttu_flags)arg;



	/* munlock has nothing to gain from examining un-locked vmas */

	if ((flags & TTU_MUNLOCK) && !(vma->vm_flags & VM_LOCKED))

		return SWAP_AGAIN;

		return true;



	if (flags & TTU_SPLIT_HUGE_PMD) {

		split_huge_pmd_address(vma, address,
@@ -1329,7 +1329,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, 
					 */

					mlock_vma_page(page);

				}

				ret = SWAP_FAIL;

				ret = false;

				page_vma_mapped_walk_done(&pvmw);

				break;

			}
@@ -1347,7 +1347,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, 
		if (!(flags & TTU_IGNORE_ACCESS)) {

			if (ptep_clear_flush_young_notify(vma, address,

						pvmw.pte)) {

				ret = SWAP_FAIL;

				ret = false;

				page_vma_mapped_walk_done(&pvmw);

				break;

			}
@@ -1437,14 +1437,14 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, 
				 */

				set_pte_at(mm, address, pvmw.pte, pteval);

				SetPageSwapBacked(page);

				ret = SWAP_FAIL;

				ret = false;

				page_vma_mapped_walk_done(&pvmw);

				break;

			}



			if (swap_duplicate(entry) < 0) {

				set_pte_at(mm, address, pvmw.pte, pteval);

				ret = SWAP_FAIL;

				ret = false;

				page_vma_mapped_walk_done(&pvmw);

				break;

			}
@@ -1636,7 +1636,7 @@ static void rmap_walk_anon(struct page *page, struct rmap_walk_control *rwc, 
		if (rwc->invalid_vma && rwc->invalid_vma(vma, rwc->arg))

			continue;



		if (SWAP_AGAIN != rwc->rmap_one(page, vma, address, rwc->arg))

		if (!rwc->rmap_one(page, vma, address, rwc->arg))

			break;

		if (rwc->done && rwc->done(page))

			break;
@@ -1690,7 +1690,7 @@ static void rmap_walk_file(struct page *page, struct rmap_walk_control *rwc, 
		if (rwc->invalid_vma && rwc->invalid_vma(vma, rwc->arg))

			continue;



		if (SWAP_AGAIN != rwc->rmap_one(page, vma, address, rwc->arg))

		if (!rwc->rmap_one(page, vma, address, rwc->arg))

			goto done;

		if (rwc->done && rwc->done(page))

			goto done;

CRA Git | Maintained and supported by SUSTech CRA and CCSE