Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1566823

[PATCHv2 10/12] mm: convert page_mapped_in_vma() to page_vma_mapped_walk()

Show all headers | View raw

For consistency, it worth converting all page_check_address() to
page_vma_mapped_walk(), so we could drop the former.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 mm/page_vma_mapped.c | 30 ++++++++++++++++++++++++++++++
 mm/rmap.c            | 26 --------------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index 63168b4baf19..13929f2418b0 100644
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -179,3 +179,33 @@ next_pte:	do {
 		}
 	}
 }
+
+/**
+ * page_mapped_in_vma - check whether a page is really mapped in a VMA
+ * @page: the page to test
+ * @vma: the VMA to test
+ *
+ * Returns 1 if the page is mapped into the page tables of the VMA, 0
+ * if the page is not mapped into the page tables of this VMA.  Only
+ * valid for normal file or anonymous VMAs.
+ */
+int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
+{
+	struct page_vma_mapped_walk pvmw = {
+		.page = page,
+		.vma = vma,
+		.flags = PVMW_SYNC,
+	};
+	unsigned long start, end;
+
+	start = __vma_address(page, vma);
+	end = start + PAGE_SIZE * (hpage_nr_pages(page) - 1);
+
+	if (unlikely(end < vma->vm_start || start >= vma->vm_end))
+		return 0;
+	pvmw.address = max(start, vma->vm_start);
+	if (!page_vma_mapped_walk(&pvmw))
+		return 0;
+	page_vma_mapped_walk_done(&pvmw);
+	return 1;
+}
diff --git a/mm/rmap.c b/mm/rmap.c
index 95183dbea2eb..5d5e504c41d8 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -756,32 +756,6 @@ pte_t *__page_check_address(struct page *page, struct mm_struct *mm,
 	return NULL;
 }
 
-/**
- * page_mapped_in_vma - check whether a page is really mapped in a VMA
- * @page: the page to test
- * @vma: the VMA to test
- *
- * Returns 1 if the page is mapped into the page tables of the VMA, 0
- * if the page is not mapped into the page tables of this VMA.  Only
- * valid for normal file or anonymous VMAs.
- */
-int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
-{
-	unsigned long address;
-	pte_t *pte;
-	spinlock_t *ptl;
-
-	address = __vma_address(page, vma);
-	if (unlikely(address < vma->vm_start || address >= vma->vm_end))
-		return 0;
-	pte = page_check_address(page, vma->vm_mm, address, &ptl, 1);
-	if (!pte)			/* the page is not in this mm */
-		return 0;
-	pte_unmap_unlock(pte, ptl);
-
-	return 1;
-}
-
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 /*
  * Check that @page is mapped at @address into @mm. In contrast to
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv2 00/12] Fix few rmap-related THP bugs "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 04/12] mm: fix handling PTE-mapped THPs in page_idle_clear_pte_refs() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 08/12] mm, ksm: convert write_protect_page() to page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 11/12] mm: drop page_check_address{,_transhuge} "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 10/12] mm: convert page_mapped_in_vma() to page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
    Re: [PATCHv2 10/12] mm: convert page_mapped_in_vma() to page_vma_mapped_walk() "Hillf Danton" <hillf.zj@alibaba-inc.com> - 2017-01-26 08:40 +0100
  [PATCHv2 07/12] mm: convert try_to_unmap_one() to page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
    Re: [PATCHv2 07/12] mm: convert try_to_unmap_one() to  page_vma_mapped_walk() kbuild test robot <lkp@intel.com> - 2017-01-25 20:10 +0100
    Re: [PATCHv2 07/12] mm: convert try_to_unmap_one() to  page_vma_mapped_walk() kbuild test robot <lkp@intel.com> - 2017-01-25 20:10 +0100
    Re: [PATCHv2 07/12] mm: convert try_to_unmap_one() to  page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 23:50 +0100
  [PATCHv2 06/12] mm: convert page_mkclean_one() to page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 12/12] mm: convert remove_migration_pte() to page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
  [PATCHv2 02/12] mm: introduce page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 19:30 +0100
    Re: [PATCHv2 02/12] mm: introduce page_vma_mapped_walk() "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-01-25 21:40 +0100
    Re: [PATCHv2 02/12] mm: introduce page_vma_mapped_walk() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-01-25 23:50 +0100

csiph-web