From nobody Tue Dec 16 13:09:49 2025 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 DE34434B197 for ; Thu, 4 Dec 2025 19:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764876604; cv=none; b=VezSeX9aCvqLzRnhEqfJHGgS3eJ3Es3j5CikDWjbtrYG/FwHfL1V8DR7VLD1BYYkFKiItf8zQJMvySzbGDh3tA5eeH124+5vKiledTt2UHvubiXCVf9kM6p5u9u+o4Puk+EYVmj57efmxNsPFB+ghvTgjuaMqb1EgRrTJ1+beNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764876604; c=relaxed/simple; bh=KMzyXdRK1sUzmmUco0/Q9JRq8HWOzI6kvSLBoif3w94=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rB68HyjuiWkCiJ4ctY679fXikX0Xsy4YTOdHnaVyhg3u8Rgy/40TF/xv7zWxdsaz6NgefWlutRpZufT0GGsnAT37q2Ujbs8rqVwR1Th5fTCwwvtzYGvQctQi/ScyYolKvzOvmdTPqp0n7xIYm+n/ShQ56T2D5UqB0LGOLdLuLp4= 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=hIZRn+y4; arc=none smtp.client-ip=209.85.216.49 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="hIZRn+y4" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-3436a97f092so1633037a91.3 for ; Thu, 04 Dec 2025 11:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764876602; x=1765481402; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uX9WKXwPMUhDf2nsEW9hz+YtSdKaTQoicE44/0zqUlg=; b=hIZRn+y4rd84Pw43FqmN8AzYT1tiTpSuOqml/kFPXqZK6BZGWVyC/Z0lXMqYijWhlK vZVosS9YufigyQq1JzAu7ConckTNsZX98rrga+DUvkYjHK01ueh+3Hx6Rs3Oraa26EE2 54uZ0gjcJ3/Z8WiFh47Ies7nUimSSyz6DkQ6saOisF7EVFn5bD7BrZOjUVdxq/S01dCv l8HxKaw1X8IyJOmibfP80mj3Qx4VXvRvmZhqazZPardMgT3PsyeU3ojDxdtifmVL/r+x a/edmqRqthq06b4OA8izOdw6E+QhTFNPLWAnVicl5uwM/JQxrXgxvE93WaVlWX76BwIe dfhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764876602; x=1765481402; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uX9WKXwPMUhDf2nsEW9hz+YtSdKaTQoicE44/0zqUlg=; b=KT79s6vzsjbPvjKszjZ7X1Vwv/CFv4lvdB+XsAFjd7V4WHCMODK265rUagZMWsQKVe zHuJQlLuGllrYNLKz0VJb2TIAkIKsMrByd82vAnigMxLi8wUvpcbpWdx9Q5VxWcDuAhe OuCZGoOf2SGXEFX+azagWtA68gH94I+KEBz4rZNPEpg20YGgv9qTLa+M9htqkIHxhztT TC4YAu0FL4o6WO0mJJU5HDdDMkLt35QzX0XKu8OEmsjD0Su07nCS7lZpi8dihy7YiCuz j+o8LLIGPxvW3HCHiTitIfcUmn8+4p5py9wOWoaiAvkptLo9+r8WSCCA5Oxe9AxFR3Xv E2kA== X-Forwarded-Encrypted: i=1; AJvYcCWVIdKLnl6ZXuptVYDhdzPwgTYac3vNOKcipdNCBIgRM5xOdI2G/Yp0LYL5Te97jStNIt1p3/D6YNssWpE=@vger.kernel.org X-Gm-Message-State: AOJu0YxGwHwdZQr7/9J9Ha/TCCD7xljWqrs67VsjyL2FcocqN3cetkpz dUABYxrOLdfV3U++4httvJo8eTije90jBCNBem1ywWIgCM28cemwJTsK X-Gm-Gg: ASbGncuhXA9Absuw4vxcjYxJUhPEXHissc0BFZeIzR3opJnKbB5/OMv+Q+rN+Mlcw11 yqla43oZSowzDBTnFyANlagQ/LoDK1jt2jR2S5dHMyZJPmlbXw/zJ1i3isLxMgUy5CFTWm2+0sO xiTXY/7cMKC9rHpzmZzmDA48rLYHhIvTfqrRI/cOfVn59QaDVH+CnHdtXZU11wDBY39JyTqgJrs qitF60lhnXYP0v0MMwKVNYntZYXvqLO8iqSOvR5F6MVHk6S44P2zhdbzf7FczmkxWbIXxucDJqj 6SyBWyjhO7YVlqlSPbujvhocDYgD9IIfTY1a4hwOJrD/y0z44+zaLk+A7241wHC0U5++1ALm7xy jdB3g7ftajuXIH5Uz3yfM6eOePp0Bwn4rfEGGtC3pxBsBkvXZ0dZcqSmmTDNC+KSBoHCZT8uWo7 FJ+BukIiodRCRn2Oprg0vwUTBmp2BJMia1SeU+rCe5v3Po+CxR X-Google-Smtp-Source: AGHT+IFnL9Mghpe839LUCxEVjILNs9G2bsHK3lBcPCEC+WiYnmxsRBn7wCZoMetOLy4kczsXt1oQHA== X-Received: by 2002:a17:90b:558c:b0:340:ff89:8b62 with SMTP id 98e67ed59e1d1-34947efa534mr3503288a91.21.1764876602174; Thu, 04 Dec 2025 11:30:02 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf686b3b5a9sm2552926a12.9.2025.12.04.11.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Dec 2025 11:30:01 -0800 (PST) From: Kairui Song Date: Fri, 05 Dec 2025 03:29:13 +0800 Subject: [PATCH v4 05/19] mm, swap: simplify the code and reduce indention 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 Message-Id: <20251205-swap-table-p2-v4-5-cb7e28a26a40@tencent.com> References: <20251205-swap-table-p2-v4-0-cb7e28a26a40@tencent.com> In-Reply-To: <20251205-swap-table-p2-v4-0-cb7e28a26a40@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Baoquan He , Barry Song , Chris Li , Nhat Pham , Yosry Ahmed , David Hildenbrand , Johannes Weiner , Youngjun Park , Hugh Dickins , Baolin Wang , Ying Huang , Kemeng Shi , Lorenzo Stoakes , "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Kairui Song X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764876574; l=4358; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=7VD9T4L1mbbNr1WJIIQ0GVUukfOHNZ1e5OxrzJG+X+g=; b=NCunfunLugw6YZ2wKhxtkhq7zcfMUiTcTJ1rfwXb5r7PDZpp2ieRFjcRZRJQ/jqRG7Wa5WzzJ WH6TTur95UGDtpuC+5TT7oGvNlBctI8wQp+WkMBLzjLPBgYHKzFyn6O X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= From: Kairui Song Now swap cache is always used, multiple swap cache checks are no longer useful, remove them and reduce the code indention. No behavior change. Signed-off-by: Kairui Song --- mm/memory.c | 89 +++++++++++++++++++++++++++++----------------------------= ---- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 9fb2032772f2..3f707275d540 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4764,55 +4764,52 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) goto out_release; =20 page =3D folio_file_page(folio, swp_offset(entry)); - if (swapcache) { - /* - * Make sure folio_free_swap() or swapoff did not release the - * swapcache from under us. The page pin, and pte_same test - * below, are not enough to exclude that. Even if it is still - * swapcache, we need to check that the page's swap has not - * changed. - */ - if (unlikely(!folio_matches_swap_entry(folio, entry))) - goto out_page; - - if (unlikely(PageHWPoison(page))) { - /* - * hwpoisoned dirty swapcache pages are kept for killing - * owner processes (which may be unknown at hwpoison time) - */ - ret =3D VM_FAULT_HWPOISON; - goto out_page; - } - - /* - * KSM sometimes has to copy on read faults, for example, if - * folio->index of non-ksm folios would be nonlinear inside the - * anon VMA -- the ksm flag is lost on actual swapout. - */ - folio =3D ksm_might_need_to_copy(folio, vma, vmf->address); - if (unlikely(!folio)) { - ret =3D VM_FAULT_OOM; - folio =3D swapcache; - goto out_page; - } else if (unlikely(folio =3D=3D ERR_PTR(-EHWPOISON))) { - ret =3D VM_FAULT_HWPOISON; - folio =3D swapcache; - goto out_page; - } - if (folio !=3D swapcache) - page =3D folio_page(folio, 0); + /* + * Make sure folio_free_swap() or swapoff did not release the + * swapcache from under us. The page pin, and pte_same test + * below, are not enough to exclude that. Even if it is still + * swapcache, we need to check that the page's swap has not + * changed. + */ + if (unlikely(!folio_matches_swap_entry(folio, entry))) + goto out_page; =20 + if (unlikely(PageHWPoison(page))) { /* - * If we want to map a page that's in the swapcache writable, we - * have to detect via the refcount if we're really the exclusive - * owner. Try removing the extra reference from the local LRU - * caches if required. + * hwpoisoned dirty swapcache pages are kept for killing + * owner processes (which may be unknown at hwpoison time) */ - if ((vmf->flags & FAULT_FLAG_WRITE) && folio =3D=3D swapcache && - !folio_test_ksm(folio) && !folio_test_lru(folio)) - lru_add_drain(); + ret =3D VM_FAULT_HWPOISON; + goto out_page; } =20 + /* + * KSM sometimes has to copy on read faults, for example, if + * folio->index of non-ksm folios would be nonlinear inside the + * anon VMA -- the ksm flag is lost on actual swapout. + */ + folio =3D ksm_might_need_to_copy(folio, vma, vmf->address); + if (unlikely(!folio)) { + ret =3D VM_FAULT_OOM; + folio =3D swapcache; + goto out_page; + } else if (unlikely(folio =3D=3D ERR_PTR(-EHWPOISON))) { + ret =3D VM_FAULT_HWPOISON; + folio =3D swapcache; + goto out_page; + } else if (folio !=3D swapcache) + page =3D folio_page(folio, 0); + + /* + * If we want to map a page that's in the swapcache writable, we + * have to detect via the refcount if we're really the exclusive + * owner. Try removing the extra reference from the local LRU + * caches if required. + */ + if ((vmf->flags & FAULT_FLAG_WRITE) && + !folio_test_ksm(folio) && !folio_test_lru(folio)) + lru_add_drain(); + folio_throttle_swaprate(folio, GFP_KERNEL); =20 /* @@ -5002,7 +4999,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) pte, pte, nr_pages); =20 folio_unlock(folio); - if (folio !=3D swapcache && swapcache) { + if (unlikely(folio !=3D swapcache)) { /* * Hold the lock to avoid the swap entry to be reused * until we take the PT lock for the pte_same() check @@ -5040,7 +5037,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_unlock(folio); out_release: folio_put(folio); - if (folio !=3D swapcache && swapcache) { + if (folio !=3D swapcache) { folio_unlock(swapcache); folio_put(swapcache); } --=20 2.52.0