From: Qi Zheng <zhengqi.arch@bytedance.com>
To: david@redhat.com, hughd@google.com, willy@infradead.org,
muchun.song@linux.dev, vbabka@kernel.org,
akpm@linux-foundation.org, rppt@kernel.org,
vishal.moola@gmail.com, peterx@redhat.com, ryan.roberts@arm.com,
christophe.leroy2@cs-soprasteria.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org,
Qi Zheng <zhengqi.arch@bytedance.com>
Subject: [PATCH v3 08/14] mm: copy_pte_range() use pte_offset_map_rw_nolock()
Date: Wed, 4 Sep 2024 16:40:16 +0800 [thread overview]
Message-ID: <20240904084022.32728-9-zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <20240904084022.32728-1-zhengqi.arch@bytedance.com>
In copy_pte_range(), we may modify the src_pte entry after holding the
src_ptl, so convert it to using pte_offset_map_rw_nolock(). Since we may
free the PTE page in retract_page_tables() without holding the read lock
of mmap_lock, so we still need to get pmdval and do pmd_same() check after
the ptl is held.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
---
Hi Muchun, since the code has changed, I dropped your Reviewed-by tag here.
mm/memory.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/mm/memory.c b/mm/memory.c
index 06674f94b7a4e..47974cc4bd7f2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1082,6 +1082,7 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,
struct mm_struct *src_mm = src_vma->vm_mm;
pte_t *orig_src_pte, *orig_dst_pte;
pte_t *src_pte, *dst_pte;
+ pmd_t pmdval;
pte_t ptent;
spinlock_t *src_ptl, *dst_ptl;
int progress, max_nr, ret = 0;
@@ -1107,13 +1108,28 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,
ret = -ENOMEM;
goto out;
}
- src_pte = pte_offset_map_nolock(src_mm, src_pmd, addr, &src_ptl);
+
+ /*
+ * Since we may free the PTE page in retract_page_tables() without
+ * holding the read lock of mmap_lock, so we still need to do a
+ * pmd_same() check after holding the PTL.
+ */
+ src_pte = pte_offset_map_rw_nolock(src_mm, src_pmd, addr, &pmdval,
+ &src_ptl);
if (!src_pte) {
pte_unmap_unlock(dst_pte, dst_ptl);
/* ret == 0 */
goto out;
}
spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING);
+
+ if (unlikely(!pmd_same(pmdval, pmdp_get_lockless(src_pmd)))) {
+ pte_unmap_unlock(src_pte, src_ptl);
+ pte_unmap_unlock(dst_pte, dst_ptl);
+ /* ret == 0 */
+ goto out;
+ }
+
orig_src_pte = src_pte;
orig_dst_pte = dst_pte;
arch_enter_lazy_mmu_mode();
--
2.20.1
next prev parent reply other threads:[~2024-09-04 8:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 8:40 [PATCH v3 00/14] introduce pte_offset_map_{ro|rw}_nolock() Qi Zheng
2024-09-04 8:40 ` [PATCH v3 01/14] mm: pgtable: " Qi Zheng
2024-09-06 7:20 ` Muchun Song
2024-09-12 9:28 ` Qi Zheng
2024-09-04 8:40 ` [PATCH v3 02/14] arm: adjust_pte() use pte_offset_map_rw_nolock() Qi Zheng
2024-09-04 8:40 ` [PATCH v3 03/14] powerpc: assert_pte_locked() use pte_offset_map_ro_nolock() Qi Zheng
2024-09-04 8:40 ` [PATCH v3 04/14] mm: filemap: filemap_fault_recheck_pte_none() " Qi Zheng
2024-09-04 8:40 ` [PATCH v3 05/14] mm: khugepaged: __collapse_huge_page_swapin() " Qi Zheng
2024-09-04 8:40 ` [PATCH v3 06/14] mm: handle_pte_fault() use pte_offset_map_rw_nolock() Qi Zheng
2024-09-04 8:40 ` [PATCH v3 07/14] mm: khugepaged: collapse_pte_mapped_thp() " Qi Zheng
2024-09-04 8:40 ` Qi Zheng [this message]
2024-09-05 8:57 ` [PATCH v3 08/14] mm: copy_pte_range() " Muchun Song
2024-09-05 10:55 ` Qi Zheng
2024-09-04 8:40 ` [PATCH v3 09/14] mm: mremap: move_ptes() " Qi Zheng
2024-09-05 9:25 ` Muchun Song
2024-09-05 10:56 ` Qi Zheng
2024-09-04 8:40 ` [PATCH v3 10/14] mm: page_vma_mapped_walk: map_pte() " Qi Zheng
2024-09-05 12:07 ` Muchun Song
2024-09-12 9:30 ` Qi Zheng
2024-09-04 8:40 ` [PATCH v3 11/14] mm: userfaultfd: move_pages_pte() " Qi Zheng
2024-09-05 12:20 ` Muchun Song
2024-09-04 8:40 ` [PATCH v3 12/14] mm: multi-gen LRU: walk_pte_range() " Qi Zheng
2024-09-05 12:23 ` Muchun Song
2024-09-04 8:40 ` [PATCH v3 13/14] mm: pgtable: remove pte_offset_map_nolock() Qi Zheng
2024-09-05 12:23 ` Muchun Song
2024-09-04 8:40 ` [PATCH v3 14/14] mm: khugepaged: retract_page_tables() use pte_offset_map_rw_nolock() Qi Zheng
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=20240904084022.32728-9-zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=christophe.leroy2@cs-soprasteria.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=muchun.song@linux.dev \
--cc=peterx@redhat.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=vbabka@kernel.org \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox