{"id":2230790,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230790/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260430040427.4672-3-baohua@kernel.org/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.1/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<20260430040427.4672-3-baohua@kernel.org>","date":"2026-04-30T04:04:24","name":"[v2,2/5] mm/swapin: Retry swapin by VMA lock if the lock was released for I/O","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"dc2ce785fb1411ba0bed39735347bdbae5475e36","submitter":{"id":48512,"url":"http://patchwork.ozlabs.org/api/1.1/people/48512/?format=json","name":"Barry Song","email":"baohua@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260430040427.4672-3-baohua@kernel.org/mbox/","series":[{"id":502184,"url":"http://patchwork.ozlabs.org/api/1.1/series/502184/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=502184","date":"2026-04-30T04:04:27","name":"mm: reduce mmap_lock contention and improve page fault performance","version":2,"mbox":"http://patchwork.ozlabs.org/series/502184/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230790/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230790/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=mKwVglCF;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-20329-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=\"2600:3c04:e001:324:0:1991:8:25\"","lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=mKwVglCF;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org\n (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org;\n envelope-from=baohua@kernel.org; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5grG4s8Bz1yHv\n\tfor ; Thu, 30 Apr 2026 14:17:50 +1000 (AEST)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4g5grF51DZz2xlL;\n\tThu, 30 Apr 2026 14:17:49 +1000 (AEST)","from tor.source.kernel.org (tor.source.kernel.org\n [IPv6:2600:3c04:e001:324:0:1991:8:25])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4g5gYZ45cRz2xMY\n\tfor ; Thu, 30 Apr 2026 14:05:06 +1000 (AEST)","from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n\tby tor.source.kernel.org (Postfix) with ESMTP id 3A3E16132D;\n\tThu, 30 Apr 2026 04:05:04 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 0C627C2BCC4;\n\tThu, 30 Apr 2026 04:04:58 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1777521907;\n\tcv=none;\n b=cjLWi4DsTqvoPJuChHkuB6yoy72uQFs+HP9bNjm68N3fgbRUIQts4WWH0PbL6sBiBfFiBr9Vy4ehuaV2o1eq9eut3OuTfz0QOzfmpnGXJ23Nb1VKKX/C2uOo6WbQYRmI78T+hqAKC2GLLT/gTzEg7bWTCm/tHs3Bws5TFpnbfnoHHEHJwiqbUxeZ8YeoEENDt5urskzf/yNd29b4hOCxbMFyg0Vek6wTaRYOLmbvH6ZxkabBkCW00nEYxB5YkDO8RoO9Zvi+IM0d6v+2Cl0trl8kz5110X3K+tYjsfbp76fVdAnD214PtPLWlNqGvi2P33hmLR5rVROEyHE6c7e5/g==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1777521907; c=relaxed/relaxed;\n\tbh=e+UUS7GUGZaVgbrELoIxuwWRfwzqtpp9mPPWbq3QxPI=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version;\n b=NyAn4hfxaERH+roI7Y89k3m1t+yuXmfVtWitQBBQ8Us11HiazUGZFpggagYOVGuWKLrLH09p5viQt6IFvGe9ULZ5LhWDAu1eUUff4wOP1N8TtOG5lpQ9QM91gUdYoctRpBo3NXKN1AcHyrXyWg3+lDBxisV/czULW/D/PqopJXy3A3CCtu9kY72YVNuUi2DR+IcsUA9/VN5MQXW1o/417vmEquCxgtfasIyVoVEeiWImgXLCbblGODg+Kv2SjtvMdk0HbnDKXQjcPWE06LXkP+RFJGWWVV2KB9yVuGilBv2YO1l512SywUqXtcey4v3gHh1F3ZRyiuqHa7D2MdiEFg==","ARC-Authentication-Results":"i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=mKwVglCF; dkim-atps=neutral;\n spf=pass (client-ip=2600:3c04:e001:324:0:1991:8:25;\n helo=tor.source.kernel.org; envelope-from=baohua@kernel.org;\n receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1777521903;\n\tbh=3UzddeMl13pC5cJUrT4HHkjYBFF8Z0grqJoknqLkHzk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=mKwVglCF7XEsFftOn0BAtLwGM5IZ72wXKgPaG3s9rdnfQtx+pmDdlMhp0BTc5EYNf\n\t FJboHwOiMXC33Onbze1GSoNvzLlFPIK9rhRrqSsueRkYACFW51iYCE+t5LiSSUtrDZ\n\t 6Zgo/egoBF46WoaKKLJpL+hNtjheakCbbtpFjT8y7TDrK7Ows6M9EqK3rdErLUzivK\n\t 4Ay85oZFt3iFrC53ukdn7sqXcw6md9eq3jFLK0YjDszHvyQDD9gHGtkAjd47bH+XH1\n\t stGeQfEGcaAiSsSh1IY9gXD9Yt5DxgBQ/zzQ6kcBG30A7WMR3XO465Eebcb6ZNIjyv\n\t BawWjDw+St+Lw==","From":"\"Barry Song (Xiaomi)\" ","To":"akpm@linux-foundation.org,\n\tlinux-mm@kvack.org,\n\twilly@infradead.org","Cc":"david@kernel.org,\n\tljs@kernel.org,\n\tliam@infradead.org,\n\tvbabka@kernel.org,\n\trppt@kernel.org,\n\tsurenb@google.com,\n\tmhocko@suse.com,\n\tjack@suse.cz,\n\tpfalcato@suse.de,\n\twanglian@kylinos.cn,\n\tchentao@kylinos.cn,\n\tlianux.mm@gmail.com,\n\tkunwu.chan@gmail.com,\n\tliyangouwen1@oppo.com,\n\tchrisl@kernel.org,\n\tkasong@tencent.com,\n\tshikemeng@huaweicloud.com,\n\tnphamcs@gmail.com,\n\tbhe@redhat.com,\n\tyoungjun.park@lge.com,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinux-kernel@vger.kernel.org,\n\tloongarch@lists.linux.dev,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-riscv@lists.infradead.org,\n\tlinux-s390@vger.kernel.org,\n\t\"Barry Song (Xiaomi)\" ","Subject":"[PATCH v2 2/5] mm/swapin: Retry swapin by VMA lock if the lock was\n released for I/O","Date":"Thu, 30 Apr 2026 12:04:24 +0800","Message-Id":"<20260430040427.4672-3-baohua@kernel.org>","X-Mailer":"git-send-email 2.39.3 (Apple Git-146)","In-Reply-To":"<20260430040427.4672-1-baohua@kernel.org>","References":"<20260430040427.4672-1-baohua@kernel.org>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","Precedence":"list","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Spam-Status":"No, score=-0.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org"},"content":"If the current do_swap_page() took the per-VMA lock and we dropped it only\nto wait for I/O completion (e.g., use folio_wait_locked()), then when\ndo_swap_page() is retried after the I/O completes, it should still qualify\nfor the per-VMA-lock path.\n\nTested-by: Wang Lian \nTested-by: Kunwu Chan \nReviewed-by: Wang Lian \nReviewed-by: Kunwu Chan \nSigned-off-by: Barry Song (Xiaomi) \n---\n mm/memory.c | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)","diff":"diff --git a/mm/memory.c b/mm/memory.c\nindex 199214f8de08..00ee1599d637 100644\n--- a/mm/memory.c\n+++ b/mm/memory.c\n@@ -4791,6 +4791,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)\n \tunsigned long page_idx;\n \tunsigned long address;\n \tpte_t *ptep;\n+\tbool retry_by_vma_lock = false;\n \n \tif (!pte_unmap_same(vmf))\n \t\tgoto out;\n@@ -4896,8 +4897,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)\n \n \tswapcache = folio;\n \tret |= folio_lock_or_retry(folio, vmf);\n-\tif (ret & VM_FAULT_RETRY)\n+\tif (ret & VM_FAULT_RETRY) {\n+\t\tif (fault_flag_allow_retry_first(vmf->flags) &&\n+\t\t !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT) &&\n+\t\t (vmf->flags & FAULT_FLAG_VMA_LOCK))\n+\t\t\tretry_by_vma_lock = true;\n \t\tgoto out_release;\n+\t}\n \n \tpage = folio_file_page(folio, swp_offset(entry));\n \t/*\n@@ -5182,7 +5188,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)\n \t}\n \tif (si)\n \t\tput_swap_device(si);\n-\treturn ret;\n+\treturn ret | (retry_by_vma_lock ? VM_FAULT_RETRY_VMA : 0);\n }\n \n static bool pte_range_none(pte_t *pte, int nr_pages)\n","prefixes":["v2","2/5"]}