Messages in this thread Patch in this message | | | From | "Kirill A. Shutemov" <> | Subject | [PATCH 10/12] mm: convert page_mapped_in_vma() to page_check_walk() | Date | Tue, 24 Jan 2017 19:28:22 +0300 |
| |
For consistency, it worth converting all page_check_address() to page_check_walk(), so we could drop the former.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- mm/page_check.c | 30 ++++++++++++++++++++++++++++++ mm/rmap.c | 26 -------------------------- 2 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/mm/page_check.c b/mm/page_check.c index d4b3536a6bf2..5a544ca382a7 100644 --- a/mm/page_check.c +++ b/mm/page_check.c @@ -146,3 +146,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_check_walk pcw = { + .page = page, + .vma = vma, + .flags = PAGE_CHECK_WALK_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; + pcw.address = max(start, vma->vm_start); + if (!page_check_walk(&pcw)) + return 0; + page_check_walk_done(&pcw); + return 1; +} diff --git a/mm/rmap.c b/mm/rmap.c index c9a096ffb242..cb34fd68a23a 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
| |