From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: Andrea Arcangeli <aarcange@redhat.com>, Hugh Dickins <hughd@google.com>, Rik van Riel <riel@redhat.com>, Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH 09/12] mm, uprobes: convert __replace_page() to page_check_walk() Date: Tue, 24 Jan 2017 19:28:21 +0300 [thread overview] Message-ID: <20170124162824.91275-10-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <20170124162824.91275-1-kirill.shutemov@linux.intel.com> 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> --- kernel/events/uprobes.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 1e65c79e52a6..6dbaa93b22fa 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -153,14 +153,19 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, struct page *old_page, struct page *new_page) { struct mm_struct *mm = vma->vm_mm; - spinlock_t *ptl; - pte_t *ptep; + struct page_check_walk pcw = { + .page = old_page, + .vma = vma, + .address = addr, + }; int err; /* For mmu_notifiers */ const unsigned long mmun_start = addr; const unsigned long mmun_end = addr + PAGE_SIZE; struct mem_cgroup *memcg; + VM_BUG_ON_PAGE(PageTransHuge(old_page), old_page); + err = mem_cgroup_try_charge(new_page, vma->vm_mm, GFP_KERNEL, &memcg, false); if (err) @@ -171,11 +176,11 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end); err = -EAGAIN; - ptep = page_check_address(old_page, mm, addr, &ptl, 0); - if (!ptep) { + if (!page_check_walk(&pcw)) { mem_cgroup_cancel_charge(new_page, memcg, false); goto unlock; } + VM_BUG_ON_PAGE(addr != pcw.address, old_page); get_page(new_page); page_add_new_anon_rmap(new_page, vma, addr, false); @@ -187,14 +192,15 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, inc_mm_counter(mm, MM_ANONPAGES); } - flush_cache_page(vma, addr, pte_pfn(*ptep)); - ptep_clear_flush_notify(vma, addr, ptep); - set_pte_at_notify(mm, addr, ptep, mk_pte(new_page, vma->vm_page_prot)); + flush_cache_page(vma, addr, pte_pfn(*pcw.pte)); + ptep_clear_flush_notify(vma, addr, pcw.pte); + set_pte_at_notify(mm, addr, pcw.pte, + mk_pte(new_page, vma->vm_page_prot)); page_remove_rmap(old_page, false); if (!page_mapped(old_page)) try_to_free_swap(old_page); - pte_unmap_unlock(ptep, ptl); + page_check_walk_done(&pcw); if (vma->vm_flags & VM_LOCKED) munlock_vma_page(old_page); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: Andrea Arcangeli <aarcange@redhat.com>, Hugh Dickins <hughd@google.com>, Rik van Riel <riel@redhat.com>, Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH 09/12] mm, uprobes: convert __replace_page() to page_check_walk() Date: Tue, 24 Jan 2017 19:28:21 +0300 [thread overview] Message-ID: <20170124162824.91275-10-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <20170124162824.91275-1-kirill.shutemov@linux.intel.com> 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> --- kernel/events/uprobes.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 1e65c79e52a6..6dbaa93b22fa 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -153,14 +153,19 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, struct page *old_page, struct page *new_page) { struct mm_struct *mm = vma->vm_mm; - spinlock_t *ptl; - pte_t *ptep; + struct page_check_walk pcw = { + .page = old_page, + .vma = vma, + .address = addr, + }; int err; /* For mmu_notifiers */ const unsigned long mmun_start = addr; const unsigned long mmun_end = addr + PAGE_SIZE; struct mem_cgroup *memcg; + VM_BUG_ON_PAGE(PageTransHuge(old_page), old_page); + err = mem_cgroup_try_charge(new_page, vma->vm_mm, GFP_KERNEL, &memcg, false); if (err) @@ -171,11 +176,11 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end); err = -EAGAIN; - ptep = page_check_address(old_page, mm, addr, &ptl, 0); - if (!ptep) { + if (!page_check_walk(&pcw)) { mem_cgroup_cancel_charge(new_page, memcg, false); goto unlock; } + VM_BUG_ON_PAGE(addr != pcw.address, old_page); get_page(new_page); page_add_new_anon_rmap(new_page, vma, addr, false); @@ -187,14 +192,15 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, inc_mm_counter(mm, MM_ANONPAGES); } - flush_cache_page(vma, addr, pte_pfn(*ptep)); - ptep_clear_flush_notify(vma, addr, ptep); - set_pte_at_notify(mm, addr, ptep, mk_pte(new_page, vma->vm_page_prot)); + flush_cache_page(vma, addr, pte_pfn(*pcw.pte)); + ptep_clear_flush_notify(vma, addr, pcw.pte); + set_pte_at_notify(mm, addr, pcw.pte, + mk_pte(new_page, vma->vm_page_prot)); page_remove_rmap(old_page, false); if (!page_mapped(old_page)) try_to_free_swap(old_page); - pte_unmap_unlock(ptep, ptl); + page_check_walk_done(&pcw); if (vma->vm_flags & VM_LOCKED) munlock_vma_page(old_page); -- 2.11.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-01-24 16:31 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-24 16:28 [PATCH 00/12] Fix few rmap-related THP bugs Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 01/12] uprobes: split THPs before trying replace them Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 18:08 ` Rik van Riel 2017-01-24 18:08 ` Rik van Riel 2017-01-24 21:28 ` Andrew Morton 2017-01-24 21:28 ` Andrew Morton 2017-01-24 22:22 ` Kirill A. Shutemov 2017-01-24 22:22 ` Kirill A. Shutemov 2017-01-24 22:35 ` Andrew Morton 2017-01-24 22:35 ` Andrew Morton 2017-01-24 22:56 ` Kirill A. Shutemov 2017-01-24 22:56 ` Kirill A. Shutemov 2017-01-25 16:55 ` Srikar Dronamraju 2017-01-25 16:55 ` Srikar Dronamraju 2017-01-25 17:44 ` Rik van Riel 2017-01-25 17:44 ` Kirill A. Shutemov 2017-01-25 17:44 ` Kirill A. Shutemov 2017-01-25 18:35 ` Johannes Weiner 2017-01-25 18:35 ` Johannes Weiner 2017-01-25 18:38 ` Kirill A. Shutemov 2017-01-25 18:38 ` Kirill A. Shutemov 2017-01-26 2:54 ` Srikar Dronamraju 2017-01-26 2:54 ` Srikar Dronamraju 2017-01-25 18:22 ` Johannes Weiner 2017-01-25 18:22 ` Johannes Weiner 2017-01-24 16:28 ` [PATCH 02/12] mm: introduce page_check_walk() Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 21:41 ` Andrew Morton 2017-01-24 21:41 ` Andrew Morton 2017-01-24 22:50 ` Kirill A. Shutemov 2017-01-24 22:50 ` Kirill A. Shutemov 2017-01-24 22:55 ` Andrew Morton 2017-01-24 22:55 ` Andrew Morton 2017-01-25 17:53 ` Kirill A. Shutemov 2017-01-25 17:53 ` Kirill A. Shutemov 2017-01-25 1:19 ` kbuild test robot 2017-01-25 1:19 ` kbuild test robot 2017-01-25 1:59 ` kbuild test robot 2017-01-25 1:59 ` kbuild test robot 2017-01-24 16:28 ` [PATCH 03/12] mm: fix handling PTE-mapped THPs in page_referenced() Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 04/12] mm: fix handling PTE-mapped THPs in page_idle_clear_pte_refs() Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 05/12] mm, rmap: check all VMAs that PTE-mapped THP can be part of Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 06/12] mm: convert page_mkclean_one() to page_check_walk() Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-25 1:44 ` kbuild test robot 2017-01-25 1:44 ` kbuild test robot 2017-01-25 2:00 ` kbuild test robot 2017-01-25 2:00 ` kbuild test robot 2017-01-24 16:28 ` [PATCH 07/12] mm: convert try_to_unmap_one() " Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-25 3:13 ` kbuild test robot 2017-01-25 3:13 ` kbuild test robot 2017-01-24 16:28 ` [PATCH 08/12] mm, ksm: convert write_protect_page() " Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov [this message] 2017-01-24 16:28 ` [PATCH 09/12] mm, uprobes: convert __replace_page() " Kirill A. Shutemov 2017-01-26 2:58 ` Srikar Dronamraju 2017-01-26 2:58 ` Srikar Dronamraju 2017-01-24 16:28 ` [PATCH 10/12] mm: convert page_mapped_in_vma() " Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 11/12] mm: drop page_check_address{,_transhuge} Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-24 16:28 ` [PATCH 12/12] mm: convert remove_migration_pte() to page_check_walk() Kirill A. Shutemov 2017-01-24 16:28 ` Kirill A. Shutemov 2017-01-25 1:54 ` kbuild test robot 2017-01-25 1:54 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170124162824.91275-10-kirill.shutemov@linux.intel.com \ --to=kirill.shutemov@linux.intel.com \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=hughd@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=riel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.