From nobody Mon Dec 1 22:03:23 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DCEF25F7A9 for ; Thu, 27 Nov 2025 01:15:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206129; cv=none; b=bNx0cU0Z2yRFLNK6xOwFL5oCIVWgUMaRg5ZLg6ZoJSz9vEKgCJnW1TsBXd0orTFYasxmUQzhiObQe1BU7pkcl6LcE0vDZAFKcJw7niBBj1CHhopnqRgzm5Tw/vr4DuQBg32LsXZXgYKqj1BIVNqCWWaoNC8Wb66Gn0U6vMkvxY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206129; c=relaxed/simple; bh=8JJsvVVFPtkdjob7EPNBW66C8ozHB8IqOnQbl2EHZ6M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=gK6fuqX4I4Y4OPKGU//srPY715kqgwY0LqQPUJf1lvjKPjFf/biNTW29c5kf+HezCF33mOM8vzm2keNsg1EaSFSd6VXKB/4iPT7sFUkzWn2FQm754mTvn1oy9om0XsN3haGHUC+PiIxrJt4YaI9+yPJiAc+jy8lkTTNY5WK9FPw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EZOR+N3h; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EZOR+N3h" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3414de5b27eso271838a91.0 for ; Wed, 26 Nov 2025 17:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764206127; x=1764810927; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FWpzj6B5gF6DB+hbE+NOEZVJH7N1deEp/v5DIh9IZkw=; b=EZOR+N3hkmro5Ut8Jfxo4xO48EhJnknBiNAIoZeF9d2ogUOxKJfHUbh5FBfLS04nsO lf+EoSErPy1wSrLlKYzhSPUEEqlf2j5+vHur+bzQwvA5A7G7sQ8+bFX6kEb58HF2MUwm 6QZZN/kQkAhdd82rIHrBUs1zhCsPfc6aU6BwBUj5YlA0xKHo8dM9+D2r37WbhywScYJq q/XIxhUDinBb5nCQAKG8pjXTjViLgp3M2RUSS1m5oJoKiZcdhe3FnmkgZwnih77qn+XP 3PAjit8IE/HGGcNYrno0u9oIp2fdL7grRA8f6GkE7/25xJUmHDhz8+KppoVanR3eVfAU Cwyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764206127; x=1764810927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FWpzj6B5gF6DB+hbE+NOEZVJH7N1deEp/v5DIh9IZkw=; b=fM3GFbmlOuetkYmjgLbW15D/962hfIsEltoKSr69e/IOncbAMjKwDBZEEEsT/bTwyN DrymW/4HpO1qKRc+5qUKH4S4cwDXWKBi5Lf2DpljAwZiQ7J3wA8SrM6ZaqEu37+dadnC nE791XeqboMXeaq+/0i2tWlzwh4S32FW95IUdbdblMMYsLzLqn9UvymQDb1TwAgauIwY S+FbWbbJXA1UU1oHijMJoN8UHBC5CCujVkWmi+Wgw0N82oTtk1ZuUeSE7I+PJh7ncBa2 3s+mcyDufQ+3sslB/QLxnXdmiHk6Vt9bqhVeoYIuUB2XZ4stooc8jdm+p6U/wW56nQUw 3grg== X-Forwarded-Encrypted: i=1; AJvYcCWr9RNHLcEKgGxAKBECNvR7gMBlI2lMjqYD03FV7kbxVYWX9V73PCo321Bef0FUe1zQpF6PxyLWrMB4qaI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxz8ecITgyWMs2RIVtCtsYGDhdBqBOKl/nHy4YGYNQ6F2hugOW6 hNY9D3WhX13w2jyhsn4xvAULynICoW7zRX26YuJSuSxlTayltMwwVxRS X-Gm-Gg: ASbGncu5W+YEPgeUpDitWiCItbJNSRg/528jTw6iFgkO4QrTHN087ApJNemYAgVF0lF OPWQ6A7ZKeobcgRvGEcG5OtaCopEsxDz2L2sGoU0sIPkHnHqGlAxkk/ON5/A2Ootx3mNxeLRDE5 5/BYP5XipCF4Vl4zNKX/vmQCQaf0+Z+O5h1WXuhbL3RedY4bVGgDPoyWMw6eLiTMxa+jT4gVzxZ 4liVObuEwHp2artNhNEnrpG5dM4WKxiZURo/IjsEe2fr+kFxiVA0u+8vEgJwoME8x/R6NkoRMqR 7fjwWB12EJ9Y0QAp7zpG5KCq5xB6aOj92fZii+u+yRsyI9LR1c3MCGmSVLHz/BVvR3F6qfKiJzn V7FvlOU6EB0CzQK4LrqhRsaACOtoA9met6HsljEMdv/WfV9FNkMeaSOwGkPAVcgSfIuX4faVDjR K1KlW7Qdm93SFOAtsKbZcr54NJ X-Google-Smtp-Source: AGHT+IEbVGx3N69Si7CHlaljqaf40tFMimNr+eyLkblnTtUDUiJAn2jdCvTJXncBxHt/s07HBZRGvQ== X-Received: by 2002:a17:90b:48c6:b0:340:5c38:3a56 with SMTP id 98e67ed59e1d1-34733f5cef1mr21117170a91.37.1764206126598; Wed, 26 Nov 2025 17:15:26 -0800 (PST) Received: from Barrys-MBP.hub ([47.72.129.29]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7c414c226f9sm22447356b3a.53.2025.11.26.17.15.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Nov 2025 17:15:25 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: Oven Liyang , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Pedro Falcato , Jarkko Sakkinen , Oscar Salvador , Kuninori Morimoto , Mark Rutland , Ada Couprie Diaz , Robin Murphy , =?UTF-8?q?Kristina=20Mart=C5=A1enko?= , Kevin Brodsky , Yeoreum Yun , Wentao Guan , Thorsten Blum , Steven Rostedt , Yunhui Cui , Nam Cao , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song Subject: [RFC PATCH 1/2] mm/filemap: Retry fault by VMA lock if the lock was released for I/O Date: Thu, 27 Nov 2025 09:14:37 +0800 Message-Id: <20251127011438.6918-2-21cnbao@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20251127011438.6918-1-21cnbao@gmail.com> References: <20251127011438.6918-1-21cnbao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Oven Liyang If the current page fault is using the per-VMA lock, and we only released the lock to wait for I/O completion (e.g., using folio_lock()), then when the fault is retried after the I/O completes, it should still qualify for the per-VMA-lock path. Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Huacai Chen Cc: WANG Xuerui Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: Alexandre Ghiti Cc: Alexander Gordeev Cc: Gerald Schaefer Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: x86@kernel.org Cc: H. Peter Anvin Cc: David Hildenbrand Cc: Lorenzo Stoakes Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Mike Rapoport Cc: Suren Baghdasaryan Cc: Michal Hocko Cc: Matthew Wilcox Cc: Pedro Falcato Cc: Jarkko Sakkinen Cc: Oscar Salvador Cc: Kuninori Morimoto Cc: Mark Rutland Cc: Ada Couprie Diaz Cc: Robin Murphy Cc: Kristina Mart=C5=A1enko Cc: Kevin Brodsky Cc: Yeoreum Yun Cc: Wentao Guan Cc: Thorsten Blum Cc: Steven Rostedt Cc: Yunhui Cui Cc: Nam Cao Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-riscv@lists.infradead.org Cc: linux-s390@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org Cc: Chris Li Cc: Kairui Song Cc: Kemeng Shi Cc: Nhat Pham Cc: Baoquan He Signed-off-by: Oven Liyang Signed-off-by: Barry Song Acked-by: Pedro Falcato --- arch/arm/mm/fault.c | 5 +++++ arch/arm64/mm/fault.c | 5 +++++ arch/loongarch/mm/fault.c | 4 ++++ arch/powerpc/mm/fault.c | 5 ++++- arch/riscv/mm/fault.c | 4 ++++ arch/s390/mm/fault.c | 4 ++++ arch/x86/mm/fault.c | 4 ++++ include/linux/mm_types.h | 9 +++++---- mm/filemap.c | 5 ++++- 9 files changed, 39 insertions(+), 6 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2bc828a1940c..49fc0340821c 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -313,6 +313,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, str= uct pt_regs *regs) if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, addr); if (!vma) goto lock_mmap; @@ -342,6 +343,10 @@ do_page_fault(unsigned long addr, unsigned int fsr, st= ruct pt_regs *regs) goto no_context; return 0; } + + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 retry: diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 125dfa6c613b..842f50b99d3e 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -622,6 +622,7 @@ static int __kprobes do_page_fault(unsigned long far, u= nsigned long esr, if (!(mm_flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, addr); if (!vma) goto lock_mmap; @@ -668,6 +669,10 @@ static int __kprobes do_page_fault(unsigned long far, = unsigned long esr, goto no_context; return 0; } + + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 retry: diff --git a/arch/loongarch/mm/fault.c b/arch/loongarch/mm/fault.c index 2c93d33356e5..738f495560c0 100644 --- a/arch/loongarch/mm/fault.c +++ b/arch/loongarch/mm/fault.c @@ -219,6 +219,7 @@ static void __kprobes __do_page_fault(struct pt_regs *r= egs, if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, address); if (!vma) goto lock_mmap; @@ -265,6 +266,9 @@ static void __kprobes __do_page_fault(struct pt_regs *r= egs, no_context(regs, write, address); return; } + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 retry: diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 806c74e0d5ab..cb7ffc20c760 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -487,6 +487,7 @@ static int ___do_page_fault(struct pt_regs *regs, unsig= ned long address, if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, address); if (!vma) goto lock_mmap; @@ -516,7 +517,9 @@ static int ___do_page_fault(struct pt_regs *regs, unsig= ned long address, =20 if (fault_signal_pending(fault, regs)) return user_mode(regs) ? 0 : SIGBUS; - + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 /* When running in the kernel we expect faults to occur only to diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 04ed6f8acae4..b94cf57c2b9a 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -347,6 +347,7 @@ void handle_page_fault(struct pt_regs *regs) if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, addr); if (!vma) goto lock_mmap; @@ -376,6 +377,9 @@ void handle_page_fault(struct pt_regs *regs) no_context(regs, addr); return; } + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 retry: diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index e1ad05bfd28a..8d91c6495e13 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -286,6 +286,7 @@ static void do_exception(struct pt_regs *regs, int acce= ss) flags |=3D FAULT_FLAG_WRITE; if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; +retry_vma: vma =3D lock_vma_under_rcu(mm, address); if (!vma) goto lock_mmap; @@ -310,6 +311,9 @@ static void do_exception(struct pt_regs *regs, int acce= ss) handle_fault_error_nolock(regs, 0); return; } + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: retry: vma =3D lock_mm_and_find_vma(mm, address, regs); diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 998bd807fc7b..6023d0083903 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1324,6 +1324,7 @@ void do_user_addr_fault(struct pt_regs *regs, if (!(flags & FAULT_FLAG_USER)) goto lock_mmap; =20 +retry_vma: vma =3D lock_vma_under_rcu(mm, address); if (!vma) goto lock_mmap; @@ -1353,6 +1354,9 @@ void do_user_addr_fault(struct pt_regs *regs, ARCH_DEFAULT_PKEY); return; } + /* If the first try is only about waiting for the I/O to complete */ + if (fault & VM_FAULT_RETRY_VMA) + goto retry_vma; lock_mmap: =20 retry: diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index b71625378ce3..12b2d65ef1b9 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1670,10 +1670,11 @@ enum vm_fault_reason { VM_FAULT_NOPAGE =3D (__force vm_fault_t)0x000100, VM_FAULT_LOCKED =3D (__force vm_fault_t)0x000200, VM_FAULT_RETRY =3D (__force vm_fault_t)0x000400, - VM_FAULT_FALLBACK =3D (__force vm_fault_t)0x000800, - VM_FAULT_DONE_COW =3D (__force vm_fault_t)0x001000, - VM_FAULT_NEEDDSYNC =3D (__force vm_fault_t)0x002000, - VM_FAULT_COMPLETED =3D (__force vm_fault_t)0x004000, + VM_FAULT_RETRY_VMA =3D (__force vm_fault_t)0x000800, + VM_FAULT_FALLBACK =3D (__force vm_fault_t)0x001000, + VM_FAULT_DONE_COW =3D (__force vm_fault_t)0x002000, + VM_FAULT_NEEDDSYNC =3D (__force vm_fault_t)0x004000, + VM_FAULT_COMPLETED =3D (__force vm_fault_t)0x008000, VM_FAULT_HINDEX_MASK =3D (__force vm_fault_t)0x0f0000, }; =20 diff --git a/mm/filemap.c b/mm/filemap.c index 7d15a9c216ef..57dfd2211109 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3464,6 +3464,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) struct folio *folio; vm_fault_t ret =3D 0; bool mapping_locked =3D false; + bool retry_by_vma_lock =3D false; =20 max_idx =3D DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); if (unlikely(index >=3D max_idx)) @@ -3560,6 +3561,8 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) */ if (fpin) { folio_unlock(folio); + if (vmf->flags & FAULT_FLAG_VMA_LOCK) + retry_by_vma_lock =3D true; goto out_retry; } if (mapping_locked) @@ -3610,7 +3613,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) filemap_invalidate_unlock_shared(mapping); if (fpin) fput(fpin); - return ret | VM_FAULT_RETRY; + return ret | VM_FAULT_RETRY | (retry_by_vma_lock ? VM_FAULT_RETRY_VMA : 0= ); } EXPORT_SYMBOL(filemap_fault); =20 --=20 2.39.3 (Apple Git-146) From nobody Mon Dec 1 22:03:23 2025 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76A7219D08F for ; Thu, 27 Nov 2025 01:15:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206150; cv=none; b=qZozqvtRgleDkOpHm+VsKYtuskXIS1exrZcNoosEwwyuxFhExVH2GG55t14ciR/YNCCuDlxkRZp6dG0gCG3ktvwQ6zgaHIlcWoNcp4IhiemBYfPz0XPjrLvo8tLFOtz3AC6Va2BiZ4INvzlPDVXx8YnVKOiOL6akFAGhkdBfPP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206150; c=relaxed/simple; bh=j3aN58VJ49CNxC1tU6w+qQp3Kagn9SOUYyn6llCeIRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=gOIwx4fciR0QaXB1cun2OAJGm8wD/f9PInZIkG20IfCA7mXt8oGL68YHmSNUvDhycxxhj0Q4Ii1CUgzUbkqOEYTb0tGEduBz+16bxWQPD6MFsgHontRDDv0OmFv1q7f79j6Nd9/wvj/Z7g9dJi9O9n/7oHAlL21YrCKxO5K3f+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=inDW6ydf; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="inDW6ydf" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7b22ffa2a88so286340b3a.1 for ; Wed, 26 Nov 2025 17:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764206148; x=1764810948; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W4p1bn22G2i0XoJzrL7o1dUUJ8ghtmPDbFaXYxRwFkI=; b=inDW6ydfRS1eT9wsaJ6zpvEae53AArZX5zsf9AMiIjpBhuZtexzRWSCxsmF8DzYHiL oWD2e148UGBAg3QlKNiZIS8getDWQ+9MnfRC0wwbAi5Ht8nFq2cc1fecKBpeL/Uua6bZ C1bB+Arwb6vHCZicborKNPvxBi48w6IIXDxG9Tz6+T/YmrpMm8dumxtT+RRkJP1DF+NA 92znTl+1bcivU2tIJ5yEDb8SZ7wR0YzABHFMpo4ZmAX3RqbiZMF/HRY6aVr8rokWinTu +lA8+fN8t4jXCiXnUYbWkHwBXVk3b7Q8HlJjVMaw9H5zP22E2/+CA3prVyO2VeSHJAyy v3pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764206148; x=1764810948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=W4p1bn22G2i0XoJzrL7o1dUUJ8ghtmPDbFaXYxRwFkI=; b=LpuRWZkhGXnpZqUphHPT2wME25KEnr59gTTUIsFDzO78KSRHfIVkc9Rq/PabkLWggF oFyD6zXrLqxvsvF4VIiaBFsQ+YSnvJ3r3L06gY9PuA6iv6vB2RR+I07yuTA9TUaLSIBI U7bEqApyuD4zY9kwD+mrKkiL1le/99jUiBirb0dUcD09tnZhz1RSgjn+odv8cddTGuxr 6ObgMCpCyDVQGwJSgA3F6/biTtwTI+BKuxW8e2T9jjmIn0rvPRSyNdhcNgcIOE+t6XoX 9H87rGBPr+3N0Y8WpqjuGkTWNbSZmhX6y0h9A3sZhsvcCgVQ/1pjptlw9UEuEtlKQZpy t1Fg== X-Forwarded-Encrypted: i=1; AJvYcCVrKBfE9B2BexDiGYlCAXdZ9g4Nesaas8IaBWgw6M4iR0D/0lyRxnLiADX0vte5M5RTAg6WLEXJ/MnsR9I=@vger.kernel.org X-Gm-Message-State: AOJu0YyVHidPaLpGiDKMi0DZxYI+PpFX6fErz54VCyjMKjc+1UxvHTkx t8GitL1aCwaYybaH95rGbK1wm5oz3NHy7fHch9ywAVfxE6BSFjjes5dL X-Gm-Gg: ASbGnct9ueS+0q1O+cF3pdjpDygMc59BpsqxutST/tdzR4dZF5IwUHQMx5fR5FaCx9Z DSQ+1+11HCfZt5G9UqG6itbkmnj8JPp4P+5EI8z5jnYMKkb9TbJUPK/fyA7XnXE7nptBtWSV0uH e5KDm7GFmMmAIgazPlARUcQIl6MWO8VTxGQ3dyhrxheqRCZBAubafmzz0IaIiMabrGDBJZ+MEg/ UfcRSP07M7utFkT+7SMH8XNkM4ZIxg0l2M64Vj7MZMEK99DTgrrWexB/Dl0ACMAm7mtCy1w32Bi D9lxGyKLcGj3nHwtN2M3Ei1qhCZSvCByZnVcsKLgzXbnSVUuhjLDc+yOA/naNUIB8I2Lp72ZIz2 R2ktQiM8JkgmYyZ3B/gS0hrZND3ggtPvyNkznIbtGVF8xXRUWItppJSXbQ+YTh3c5gee+rnYkT6 Nbdb6JdfkU1O9NcqJA+AC8gfeqpbMCaMXDKow= X-Google-Smtp-Source: AGHT+IHM/YJW2qPboNwUb7KDGSWGsZmmt6gqbwAlILL0AqNuX4PEwg/PSJbXIFKwaU4zyLqhhDzUUA== X-Received: by 2002:a05:6a00:4616:b0:77f:2dc4:4c16 with SMTP id d2e1a72fcca58-7c58e016d67mr22034173b3a.21.1764206147616; Wed, 26 Nov 2025 17:15:47 -0800 (PST) Received: from Barrys-MBP.hub ([47.72.129.29]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7c414c226f9sm22447356b3a.53.2025.11.26.17.15.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Nov 2025 17:15:46 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: Barry Song , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , Matthew Wilcox , Pedro Falcato , Jarkko Sakkinen , Oscar Salvador , Kuninori Morimoto , Oven Liyang , Mark Rutland , Ada Couprie Diaz , Robin Murphy , =?UTF-8?q?Kristina=20Mart=C5=A1enko?= , Kevin Brodsky , Yeoreum Yun , Wentao Guan , Thorsten Blum , Steven Rostedt , Yunhui Cui , Nam Cao , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [RFC PATCH 2/2] mm/swapin: Retry swapin by VMA lock if the lock was released for I/O Date: Thu, 27 Nov 2025 09:14:38 +0800 Message-Id: <20251127011438.6918-3-21cnbao@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20251127011438.6918-1-21cnbao@gmail.com> References: <20251127011438.6918-1-21cnbao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Barry Song If the current do_swap_page() took the per-VMA lock and we dropped it only to wait for I/O completion (e.g., use folio_wait_locked()), then when do_swap_page() is retried after the I/O completes, it should still qualify for the per-VMA-lock path. Cc: David Hildenbrand Cc: Lorenzo Stoakes Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Mike Rapoport Cc: Suren Baghdasaryan Cc: Michal Hocko Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: Alexandre Ghiti Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Huacai Chen Cc: WANG Xuerui Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: Alexander Gordeev Cc: Gerald Schaefer Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: x86@kernel.org Cc: H. Peter Anvin Cc: Matthew Wilcox Cc: Pedro Falcato Cc: Jarkko Sakkinen Cc: Oscar Salvador Cc: Kuninori Morimoto Cc: Oven Liyang Cc: Mark Rutland Cc: Ada Couprie Diaz Cc: Robin Murphy Cc: Kristina Mart=C5=A1enko Cc: Kevin Brodsky Cc: Yeoreum Yun Cc: Wentao Guan Cc: Thorsten Blum Cc: Steven Rostedt Cc: Yunhui Cui Cc: Nam Cao Cc: Chris Li Cc: Kairui Song Cc: Kemeng Shi Cc: Nhat Pham Cc: Baoquan He Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-riscv@lists.infradead.org Cc: linux-s390@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Barry Song --- mm/memory.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 4f933fedd33e..7f70f0324dcf 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4654,6 +4654,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) unsigned long page_idx; unsigned long address; pte_t *ptep; + bool retry_by_vma_lock =3D false; =20 if (!pte_unmap_same(vmf)) goto out; @@ -4758,8 +4759,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) =20 swapcache =3D folio; ret |=3D folio_lock_or_retry(folio, vmf); - if (ret & VM_FAULT_RETRY) + if (ret & VM_FAULT_RETRY) { + if (fault_flag_allow_retry_first(vmf->flags) && + !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT) && + (vmf->flags & FAULT_FLAG_VMA_LOCK)) + retry_by_vma_lock =3D true; goto out_release; + } =20 page =3D folio_file_page(folio, swp_offset(entry)); /* @@ -5044,7 +5050,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) } if (si) put_swap_device(si); - return ret; + return ret | (retry_by_vma_lock ? VM_FAULT_RETRY_VMA : 0); } =20 static bool pte_range_none(pte_t *pte, int nr_pages) --=20 2.39.3 (Apple Git-146)