From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 76AE61A0B15 for ; Thu, 27 Nov 2025 01:15:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206151; cv=none; b=fYO9eEl7sMirlahmF0+aN86QM9zHFX6+P/rECIhovl5+bpG+KzFsb5LidOAbOGJmuX+G462ShrrInQ/nKkQtOTFbo5hhBN7Fxz9/PauFPRUUIpLdIAtWrTQ2M4W/QMeqqb/CLfXfx6X1LfT9skdZoaFnkFr2hDPhmSdi2+85rfo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764206151; c=relaxed/simple; bh=j3aN58VJ49CNxC1tU6w+qQp3Kagn9SOUYyn6llCeIRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Dz7kDBwaC6Pgjk9LHxCQ/RaKMe7EA/VuMz0qwcelhOtP13Kad5IE3yiKs9qtS3taHEpbXfjdNwdcEZ590LVas0lk3JTN3S6h6QEEs3XT694sPYycCYhwl+Ej65oqnMTAW4prZx9l/1sqWq0JNmrapIJwbWBXDsDy7exQhLtcTLg= 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.179 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-f179.google.com with SMTP id d2e1a72fcca58-7b22ffa2a88so286334b3a.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=TN8rwaDDEM/tKW3qXHGf44wOti6WxmPOpaVNGBocFM9QNT5TtAjOdYeTx5TqEt6RtW MdjmMqt2Df7gCYctLldfUx0Yxbx5GlWdHYIIIowDOtl03IvZK+rv4w/ggaOpEanbIvI2 27Lhd+WuwlK2G4j+5qCUWMdHyaO94Exmyzyz14YXCVAr6BwXxX74MQpL9uKlG6R3OW68 NITBV0rUpU9xB9oqh287o7ngvtxgi6D46eCkznHgYGlUbMGamOHasTtbjvtrxIWxExnn CbicBdyQfXABy1J8LOKwLHLr8utL6BQPUyKWBB9GR4KSHumLBN6Db7vEY4oR8eS766XY 6vAw== X-Forwarded-Encrypted: i=1; AJvYcCWyPbYVkiw1OcettEWS+L9AxH4tetW0TWCMVdL465V+QSzbrjA/gMbSwJWmz2GeERC220ufdR/++kVhL4Pt@vger.kernel.org X-Gm-Message-State: AOJu0Yx57iPT776CE2lObgdNTvbGvMeOIDRVTxTGkFTrBahy4EwlFSEh Zn7sm3UbB53tL7L9XfQHv+LsohYRswme6+4Ud6j1jaUYpUXVnlk2Zhu0 X-Gm-Gg: ASbGncsYiVNlB2oBecYrlJNwjyTjOmhDbCMZ0Hltt0UTOc6AQUMfa0olGOGd5WoWZk8 /ZL5YNN6FXWS3K0BKvF8ORd2HLQpwtM8If7dqF9mw/9557UhnuIrfWP/NZQvNMAXRxiKXCNNYqL /rmiGVc9yjqMlqxEZ2EbjFrVT57eIv4t6GChzcEQ8iJJgp7ciCQMAQYr8bDB7DUGHev3WbpNJ5g GLMv90H7AxxBXnptzvGvcOKZ6BlWrNSMlvoQDWblXXeBnlRxt/IGCW7ZcqX9nfXphh+VHz/1lbt EG4OSCAF4uM+LQ8n11Yv9TbFYC8Q+KbCO7CURNzEjOt4LLPIuRu1Aw4rIYSfXlrJdk/Q0zi909l TZS9bt6m0n1TXrZcnypTbJClFrctNYxzOyPBkQsvDV+NwTkmgIP+NXrzZ3bHoYrowL5+nDnpG/P 3YJEJantkD+Z09OFuImrW7EVJHZt9al1MYen0= 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-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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šenko 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 = false; if (!pte_unmap_same(vmf)) goto out; @@ -4758,8 +4759,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) swapcache = folio; ret |= 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 = true; goto out_release; + } page = 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); } static bool pte_range_none(pte_t *pte, int nr_pages) -- 2.39.3 (Apple Git-146)