linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
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 v4 04/13] mm: khugepaged: __collapse_huge_page_swapin() use pte_offset_map_ro_nolock()
Date: Tue, 24 Sep 2024 14:09:56 +0800	[thread overview]
Message-ID: <69e1c4483c2d679d3e2c8446264e5878e5b52a97.1727148662.git.zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <cover.1727148662.git.zhengqi.arch@bytedance.com>

In __collapse_huge_page_swapin(), we just use the ptl for pte_same() check
in do_swap_page(). In other places, we directly use pte_offset_map_lock(),
so convert it to using pte_offset_map_ro_nolock().

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/khugepaged.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index f9c39898eaff6..6498721d4783a 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1011,7 +1011,11 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm,
 		};
 
 		if (!pte++) {
-			pte = pte_offset_map_nolock(mm, pmd, address, &ptl);
+			/*
+			 * Here the ptl is only used to check pte_same() in
+			 * do_swap_page(), so readonly version is enough.
+			 */
+			pte = pte_offset_map_ro_nolock(mm, pmd, address, &ptl);
 			if (!pte) {
 				mmap_read_unlock(mm);
 				result = SCAN_PMD_NULL;
-- 
2.20.1



  parent reply	other threads:[~2024-09-24  6:17 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-24  6:09 [PATCH v4 00/13] introduce pte_offset_map_{ro|rw}_nolock() Qi Zheng
2024-09-24  6:09 ` [PATCH v4 01/13] mm: pgtable: " Qi Zheng
2024-09-24  6:24   ` Muchun Song
2024-09-24 12:58   ` David Hildenbrand
2024-09-24  6:09 ` [PATCH v4 02/13] powerpc: assert_pte_locked() use pte_offset_map_ro_nolock() Qi Zheng
2024-09-24  6:09 ` [PATCH v4 03/13] mm: filemap: filemap_fault_recheck_pte_none() " Qi Zheng
2024-09-24  6:09 ` Qi Zheng [this message]
2024-09-24  6:09 ` [PATCH v4 05/13] arm: adjust_pte() use pte_offset_map_rw_nolock() Qi Zheng
2024-09-24  6:09 ` [PATCH v4 06/13] mm: handle_pte_fault() " Qi Zheng
2024-09-24  6:09 ` [PATCH v4 07/13] mm: khugepaged: collapse_pte_mapped_thp() " Qi Zheng
2024-09-24  7:14   ` Muchun Song
2024-09-24  7:29     ` Qi Zheng
2024-09-24  8:52       ` Muchun Song
2024-09-24  8:57         ` Qi Zheng
2024-09-24  9:03           ` Muchun Song
2024-09-24  6:10 ` [PATCH v4 08/13] mm: copy_pte_range() " Qi Zheng
2024-09-24  7:35   ` Muchun Song
2024-09-24  6:10 ` [PATCH v4 09/13] mm: mremap: move_ptes() " Qi Zheng
2024-09-24  7:39   ` Muchun Song
2024-09-24  6:10 ` [PATCH v4 10/13] mm: page_vma_mapped_walk: map_pte() " Qi Zheng
2024-09-24  8:25   ` Muchun Song
2024-09-24  8:33     ` Qi Zheng
2024-09-24  8:39       ` Muchun Song
2024-09-24  8:45         ` Qi Zheng
2024-09-24  6:10 ` [PATCH v4 11/13] mm: userfaultfd: move_pages_pte() " Qi Zheng
2024-09-24  6:10 ` [PATCH v4 12/13] mm: multi-gen LRU: walk_pte_range() " Qi Zheng
2024-09-24 14:39   ` David Hildenbrand
2024-09-24  6:10 ` [PATCH v4 13/13] mm: pgtable: remove pte_offset_map_nolock() Qi Zheng
2024-09-24 13:02   ` David Hildenbrand

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=69e1c4483c2d679d3e2c8446264e5878e5b52a97.1727148662.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