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 v5 06/13] mm: handle_pte_fault() use pte_offset_map_rw_nolock()
Date: Thu, 26 Sep 2024 14:46:19 +0800 [thread overview]
Message-ID: <af8d694853b44c5a6018403ae435440e275854c7.1727332572.git.zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <cover.1727332572.git.zhengqi.arch@bytedance.com>
In handle_pte_fault(), we may modify the vmf->pte after acquiring the
vmf->ptl, so convert it to using pte_offset_map_rw_nolock(). But since we
will do the pte_same() check, so there is no need to get pmdval to do
pmd_same() check, just pass a dummy variable to it.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
---
mm/memory.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index a245d28787034..6432b636d1ba7 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5750,14 +5750,24 @@ static vm_fault_t handle_pte_fault(struct vm_fault *vmf)
vmf->pte = NULL;
vmf->flags &= ~FAULT_FLAG_ORIG_PTE_VALID;
} else {
+ pmd_t dummy_pmdval;
+
/*
* A regular pmd is established and it can't morph into a huge
* pmd by anon khugepaged, since that takes mmap_lock in write
* mode; but shmem or file collapse to THP could still morph
* it into a huge pmd: just retry later if so.
+ *
+ * Use the maywrite version to indicate that vmf->pte may be
+ * modified, but since we will use pte_same() to detect the
+ * change of the !pte_none() entry, there is no need to recheck
+ * the pmdval. Here we chooes to pass a dummy variable instead
+ * of NULL, which helps new user think about why this place is
+ * special.
*/
- vmf->pte = pte_offset_map_nolock(vmf->vma->vm_mm, vmf->pmd,
- vmf->address, &vmf->ptl);
+ vmf->pte = pte_offset_map_rw_nolock(vmf->vma->vm_mm, vmf->pmd,
+ vmf->address, &dummy_pmdval,
+ &vmf->ptl);
if (unlikely(!vmf->pte))
return 0;
vmf->orig_pte = ptep_get_lockless(vmf->pte);
--
2.20.1
next prev parent reply other threads:[~2024-09-26 6:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-26 6:46 [PATCH v5 00/13] introduce pte_offset_map_{ro|rw}_nolock() Qi Zheng
2024-09-26 6:46 ` [PATCH v5 01/13] mm: pgtable: " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 02/13] powerpc: assert_pte_locked() use pte_offset_map_ro_nolock() Qi Zheng
2024-09-26 6:46 ` [PATCH v5 03/13] mm: filemap: filemap_fault_recheck_pte_none() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 04/13] mm: khugepaged: __collapse_huge_page_swapin() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 05/13] arm: adjust_pte() use pte_offset_map_rw_nolock() Qi Zheng
2024-09-26 6:46 ` Qi Zheng [this message]
2024-09-26 6:46 ` [PATCH v5 07/13] mm: khugepaged: collapse_pte_mapped_thp() " Qi Zheng
2024-09-26 7:07 ` Muchun Song
2024-09-26 6:46 ` [PATCH v5 08/13] mm: copy_pte_range() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 09/13] mm: mremap: move_ptes() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 10/13] mm: page_vma_mapped_walk: map_pte() " Qi Zheng
2024-09-26 7:08 ` Muchun Song
2024-09-26 6:46 ` [PATCH v5 11/13] mm: userfaultfd: move_pages_pte() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 12/13] mm: multi-gen LRU: walk_pte_range() " Qi Zheng
2024-09-26 6:46 ` [PATCH v5 13/13] mm: pgtable: remove pte_offset_map_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=af8d694853b44c5a6018403ae435440e275854c7.1727332572.git.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