From nobody Tue Feb 10 04:03:29 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 9F1D433CE82 for ; Fri, 19 Dec 2025 19:44:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766173483; cv=none; b=tsGfY+MaivlBtUikkdfcP4LueCuo4BocxERuXdaC8aiFugXKw2ll6+QlZDLEKuVZcShRUyK4hzlyOgvC3qnojZCPMRQ1qLyMULzC0i4drz1x7WB3GB2+mkxIdKHcxQ0Log0pXZWah7MpInKytfzqLqLrnmB8v1K8mcvqmmU884Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766173483; c=relaxed/simple; bh=y8RcVDesF+GSFwbceSak9pSlOcYOrzdJuUEoUCM+o8w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dgIAPLmE/QXqn2oqPo7DtI66+YuVTcJEsVcgCh5Na7yEL/9fyXIbLk2jPtbQOytS+PrKvEYptKPKkJPL8cFFazAvrUyfNRaDnpLnMtjMcr8HUhrBRE0Gam/Nrd5u0BUFBswmJPTpccQ/k1vsEwAd0UkggNSH+dLtcKQDuIY+eIQ= 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=NWejrcfu; arc=none smtp.client-ip=209.85.214.169 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="NWejrcfu" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-29f0f875bc5so28750615ad.3 for ; Fri, 19 Dec 2025 11:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766173481; x=1766778281; 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=n1CugCRqzSGuErEPW0UlHPweW7wIaQYDCBPjqUNKIRw=; b=NWejrcfut0Gs7yKUbJpwusfOx06Mfcw11v91qtKB5WgSb+91oTlImV8rcrF/oMke+9 2NtiLQ/EPJE42L0fNhXS3q+KL2ZfBPHqYY5d3n22ddrTGHdaaloEZMrenfO4aHB/7626 2ULXIRKHkRdUAIrXrSSMLnCx3+Iu8tdZy/nCbgPsCG5/IYSvf5OJguyrAi6CzHbP3Vuq 9C9NrxJLvW1Slskq2C94HG8oXkTM7SGK0t/W8CuN/DWkbWPdS2ywePYWSAEgaRJTqCeJ LdHVyxr1MtFSPXfa5cTAIxcEN18TAypCr649uGYfvMTIxqO6z3sUL1rdW/a+06gXuewA NsJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766173481; x=1766778281; 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=n1CugCRqzSGuErEPW0UlHPweW7wIaQYDCBPjqUNKIRw=; b=e88o5oSa8J11Th1Pr9ftRg8RbKZcV84hHj/qt2xfWONtJMLlXcLEvTytTU18js3bm6 ef/6z7mUVEDpAzMMIriy586CT74kO01XJnOLnsivmBalQTgixEpTBwB5Ik0REnVI3wFh J1u4sshhSQTu3vX90UUPvFQq742aP4P+k3bmmwJa0Urc/ZNg4Scg1o85sJP4JqBVRpA6 8MqtMTa8WcrFqEgZ7HstClE4fcQkERih8F3WH3uKyfEYobV6/h6M8zuBHE3rUoqstSIw hI8DMWt+F83W83VN7w+jdaavytvy4ZH4wMVRZ8CHvhQvSIgH7FJtQ73Xg/sTUnax09ll IUTg== X-Forwarded-Encrypted: i=1; AJvYcCXA3K24PZ34NVfAcYcbRsSo+jjqkIXgSZ5EtvK2w0cxeGESSxC/obeIS68MSVwWcA2H/0e8NBW9j9JTHyc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9qCvRayjHzCBJuQXsuYkladyq+wSbrWoZotHyJmRx/Wv+p2u9 0nzlKHxoxuBlYWW+SPFo7win7bR/OgOV7H9tYecAFChWWM9hfI995LBm X-Gm-Gg: AY/fxX5sktQX6JcbOw2MtxSywONAU5P6cHSl7r2NXRsTe+IG7Djk7IQYfmSCn/bvXIQ M/scR4G7SHGL4zPy8oxvgJqZsEHP3cMF6kCOnM0ExB8/ua+zWCpyD3mmWEqxv1YBlB9ypgVIz9x eD1C6sHdw8284ScNSKfUw74nCZxTKErFmsCxc0C3ilq787j6XKpKa1KzEo9iQbwq58MsrT0m0c/ q5VIRrFKk+PJzpaXLiAL2DQsjRhkq5/X5QHE2naCM8wD+nlYWjbXI1vNoF9h8+rmcEPiCeXM0Rv E6keaVyYcc8m3s4gTCjJzix1N5yXedq9JlE6JM35cjtFavURJ8DZAMpdh8UFQMLBc5kmEadIEGZ OZK1R3nVx3FmKZwpftrguE1roD2jjgIoU3W+OGefKx3lOr9vgOQGOlyYht1s0S7N9m5sFhaj4jT FUVWzSEPhm3hAvSNMDegev55rDRfzH9e5gAl2SYczcwWRWlxd9Z1o5 X-Google-Smtp-Source: AGHT+IHoRYPhD5abNYveYyW3YLlwDZTNlDKwRuJoVUUtpviXATS/D+Nb8OzDpMf9zHneBu9tdTADAw== X-Received: by 2002:a17:902:c40b:b0:2a0:9d01:c3c1 with SMTP id d9443c01a7336-2a2f220310amr39365415ad.1.1766173480705; Fri, 19 Dec 2025 11:44:40 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d76ceesm30170985ad.91.2025.12.19.11.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 11:44:40 -0800 (PST) From: Kairui Song Date: Sat, 20 Dec 2025 03:43:34 +0800 Subject: [PATCH v5 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: <20251220-swap-table-p2-v5-5-8862a265a033@tencent.com> References: <20251220-swap-table-p2-v5-0-8862a265a033@tencent.com> In-Reply-To: <20251220-swap-table-p2-v5-0-8862a265a033@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=1766173451; l=4358; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=WUlfqihUv3ek+SR5ujgLz5PJkzf/2opJSuBs8ZAe3co=; b=5zhzoyx9NhY5k8vy0xE845tIjN0SJyVbaayX0A9+sCQM/9BpbC2Wev4bEf8+OrAh1BYgpzVEQ x+ACNzZBtbLDjPpCsNLDna8i2F8PX7MlhrwS7H0O5mv4yfWltV71Xmw 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 9e391a283946..ca54009cd586 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