From nobody Tue Dec 2 00:45:59 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 A96542DA749 for ; Mon, 24 Nov 2025 19:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764011764; cv=none; b=bphNJ2IRsRAxWEiZKO53v7tF7kRebQMFk+KrkXtmxGwhGIQ04JvV6/2gMcLUFbGDMYDFE/T862Ma2LEMy9txgi8gRN2XXCOFSHMEEtIS1LxUAt0pCLC3qDnpYx+tkvShR+fkT0u+ldVmWZl2AwNHKebW6U/20FFhHRnHXMsoOOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764011764; c=relaxed/simple; bh=KMzyXdRK1sUzmmUco0/Q9JRq8HWOzI6kvSLBoif3w94=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RUgSADtjB2BVqJH/SdZjIJn4Oy7xA++aOpWmziDQ8azX8rgFlpZWR/iG2A/leJOY13i6yW6jlzksuLEFNo1bI2UO8tJTTEwg0BoMrkNZCyIZ1EJqR0SSpGcLMBjc15rd+N6Y6fJrcSEsBabblKvWE3I+yPx6WsEp3aRuFJWUnSg= 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=ZCUCVDx0; arc=none smtp.client-ip=209.85.214.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="ZCUCVDx0" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-29853ec5b8cso56914885ad.3 for ; Mon, 24 Nov 2025 11:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764011762; x=1764616562; 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=ZCUCVDx0gIZVu6TcSiYJBufGDJsWfIzLT6ceM7Yb7JZf0htE1QEgPrFLld7NtqovlT fGAmlWIPIQLFaJrcL1VoCapXekrj8XraOdhzNxlvqJx3uE+0w0AIfZjys/ia+YRU5aI4 h/JtXmpTPPbFiEodgBjHk0vRytHpvdsT2rsP7AjFUIo/2DjS7VgQIwsXNRO3MRZu+Hh7 qTDRHGrKUQJcK4eatH4A3C3ZbDoUqL4BP8m3mOI3M2oD3GxRWjECAW/iNVnh76pg5h6V SHUIWFXPXq2hGUqm4vV0U2nq/vSazjMb4EVGQ+55lGTmy/FH4bUwnfTc1ikSGlX7ytwd tr9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764011762; x=1764616562; 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=tbwNuKcYIibewDFZKKKB4I2Qwdpt2/+sxCodLCC6wiuAMIuTPbG5oVLM6S0uchlrIZ Qystr16/kCBpyE+GhxmlPFay/OwoLKAoWY1oEXRkGmRTDwCjYWWm29ikHx+4r11fx4fw O1zFCGQb0ynghrGsRYR/lZBKyZ+7v/PgsRqBatzrF1HEFuhlwjiUY7QbdzFvRvOWGfWS zDzBRSf2M/zCvGzsiBOtlsZn3VGq6bo0GTwmkzJu92tv8f9FQ05d3VIUT7RwCGXEBwP6 uWTdNtG5bML0h5NedHCCnVohHIpKxbWKM0Ul8swrZJG9BdWXHaEVYRPw/AfoZ/+UbYKh o/+Q== X-Forwarded-Encrypted: i=1; AJvYcCUaN6BfHUh/wcjIHcGyV84Y+g+342eZuofaxjP9VVFNBeTrfBsq/j/sL5cyTHif1kkKKJwDrwgJEVES9Is=@vger.kernel.org X-Gm-Message-State: AOJu0YzpIjsu+lwoL6e7BY/NT2rAUH4xG0inx60X9mj7g6aypZaX/MCr pRFNiP4/BrcYFxwFtIvWI3hl8u9MpJj9DWVh5SYBspJ0T1OZrFf42UI/ X-Gm-Gg: ASbGnctLoUHr2UpzOzJEIiK0Y1knkIv02iLHMYlwC0KJ71GQJZ7awUKGaGjfix4FUWX oWog/4uS0W2aAyAHmNxjixNY1T+52+MxbcNHCoSEFdpDzqZZTguKnUpmJDcKfSaPYODlxFjxUfm xQGAqFjxvDH4tAc34BFAi1C7XJQnWldzcvjpCDjpSARH8PcoH6tsTtDWik3zuCib8op0Bz+Ikkk zeXVUDJhwkvJsGai8wp/gxmOSKZ1E/+z0l3qr9ATW6xuXc/NNWGnDrziPuvR7zM+zvIZSqWSrxs B34bLxcUwOxCc2hF6X535Y6V5juRUgWJbX+9NePMc+hRNzhaVl7ng2jP1PQ2XduLZ/1gIOHjnEl 8Xrb4R1FLd2u5vxsg1fD6OE4jep+KIZKOm/uDcjUC0PPvlccPSo9tgp+5RbjzCZ+u+/ZnSh5NnD 3TayASNR1gATeZOcz5xxjWpf6yWEN3h8ZjyVLON/vln7IFGz7n X-Google-Smtp-Source: AGHT+IGXvjF9/EgUklxEzQMKZ0EM1T6fsSlpBa15IzV2WahRfwiKSOTO8fwKtjP/5+JY2RbSjWFmqQ== X-Received: by 2002:a17:902:ccc4:b0:295:54cd:d2dc with SMTP id d9443c01a7336-29b6c4047efmr127444105ad.16.1764011761818; Mon, 24 Nov 2025 11:16:01 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bd75def75ffsm14327479a12.3.2025.11.24.11.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 11:16:01 -0800 (PST) From: Kairui Song Date: Tue, 25 Nov 2025 03:13:48 +0800 Subject: [PATCH v3 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: <20251125-swap-table-p2-v3-5-33f54f707a5c@tencent.com> References: <20251125-swap-table-p2-v3-0-33f54f707a5c@tencent.com> In-Reply-To: <20251125-swap-table-p2-v3-0-33f54f707a5c@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=1764011730; l=4358; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=7VD9T4L1mbbNr1WJIIQ0GVUukfOHNZ1e5OxrzJG+X+g=; b=3D4v+AHG9s/wpBznpCDKMKaj1xP0A5A9yd1yAPXPCdUuinASQIZYf+USPDHHk9oX1eM8vgTDp oKHMS9i28MkCiqWOdiw0b9Zlmvf5RPt/9oH8ixBpJyKiqLhNlQxOXEh 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