From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83EAF3ABD91 for ; Sun, 30 Aug 2026 10:33:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086012; cv=none; b=kj9FQHPCIyVKL7psclfTDUnuZT5WK+OhZOzfziJsfp60GNcMEpja3WCof+cBQIzZKq6y/posfSb/fR/1Ji4d0ROWzCKqqTPhVbwlrldcEGsjQgShHZcyP/8JVfrYQATXUN26BnGBEHXXZqd3zmylsO4G5Qi4O9tidZbXn2VEKZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086012; c=relaxed/simple; bh=il7UMsRwFpzsLvluAxhowLr70Y3ODPga+2MhlPhEB3w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N7h01Dv2HCgmfJH3Gusn/SPMJHf3GEl3sYzEcJt+Q1uhY/353UCs3Vf3GxNJYEs71pKx/JOi4KCbgN+HkyLwY6Kw9Om78mNHw2623xchMUGSHE4w+V5wJ2nfbgA4AB4wNm1x0YnMtWo366EopYGwKwhUBYKP4Q9K6Q/pom6gCOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=JfFX8hjA; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=F+kvF2y6; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="JfFX8hjA"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="F+kvF2y6" Received: from pps.filterd (m0167075.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67U9u7WM3237905 for ; Sun, 30 Aug 2026 06:33:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=DIf6 mQ5jieSfsR95OPMrcqML+UpgXiaHxu+WpaiXhhc=; b=JfFX8hjA6sQeEQXVtvti qnAfnWQsEs219hHrOd1/v7ObcfRTKu71Um7EpMgtShSNfWiTyXtudW0PGmRmAuK4 UuF22g+V0C1TnGy6dLpcIyZ5n9gsqlCagIz3B3vHfg7uq+Yz1e6d7c4kRRgR12mq Req+NB22JNLGSsTVp4+l/CeOR1InYFXxWSrcqezZrSLdK5M5dxtCgdV6q01LHIOO 7+pjZmjffLiZWwTnig2OryPwCjYCSJpPYvOyN1yySfVaZV1ScK840Ubrn1nLm7xH hEUF5kf8ls6QDE7bLcSwjVbkJHIO/N1Ykfbejnln7XfsB8dyMBu1udurkTxB8y9e 0Q== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbudj4myr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:29 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-52ff59f2c47so32498701cf.1 for ; Sun, 30 Aug 2026 03:33:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086008; x=1788690808; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DIf6mQ5jieSfsR95OPMrcqML+UpgXiaHxu+WpaiXhhc=; b=F+kvF2y6SbGHaZ3GlZekg+DWLlsmbMJK9LipML5JxiWx+FyfwjjeGgpwjNPR7X7dWC RdbqA+eI4oF4xVQDPLcVSSpN7G12MCnEyFe29XpprTrO+u8ynmuxYCOiKWZrG/Nrqcbt QbLXwzpOj2nwjoGJHGff7y/BgQunqkF6DMyDmH6EeKeXJ25P3wfmomtvV352e46U+FlL ASnD9jZ/Qeue2FycLEeow/RwX4QKlWtW2H1MNdAYJV5v0VQMMTYJkPLrV429TcoFr5bB hqqz8zJviz/ZThQ/d7826E3cGb7DxC1mxfy28Nc5oRnY4XBmsfVH33aLAno8edhkN9y9 lrUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086008; x=1788690808; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=DIf6mQ5jieSfsR95OPMrcqML+UpgXiaHxu+WpaiXhhc=; b=UJO/mekBLSl4WBjKeN7RKHuTVg/SFgCQG/5s21717fEiCswFLxqvsDUIn+G3b5zeK3 1IHna9QCnyVE7c5Oi6YLYiNSDNDj27tqzMMwyy9LJJYHzSWivozANDcWiwxhdNoIpUzB zVdhAfvwG8UsS/3tOeW0osgMOgTW0DxUAlngmAvISlDr9T/ZfnIMVHUx1n+tueF4MApu tFnh6H+7prGHDNO3WLLsNijgrnfNsfcbQ0GwzrFTkAp4mV1oAnUHqptQBZqY83mN8IbS ppS2btriggOVnBNnMc+Gg5d5xtUxoDl71BYWUOomwz0ZUQ3EzyQmwr28d7l1zAYV4xUm gD7g== X-Forwarded-Encrypted: i=1; AHgh+RqDjtGJu8l57uVwllMS6Ad8O9cqDrOLl8S3a469TYby7BlyW5/9U/riBOTC7qsVi+995d2IQQZ4x/k4Pf8=@vger.kernel.org X-Gm-Message-State: AFuF++k/zyKrCJJSZYfFZtRLA2fzl2chMLFRE8zztw6d/rC6KGh1MDDK hUAHzVWkRM5ai0EALquQegpRS89IUov5rssouuFw+OLCh4yugTaMXFZWAXU5GUe6KVVhBBRhckR lw38+C0PfNm8h1RdibMLgxgOrCxLNrbFfNJ6sLYVWO2xn0PhPxXtKSDhzBP6uTA== X-Gm-Gg: AR+sD10/lYOrEyAq329ca79d6U/XWdsn+zqG8JwSKjzzRDblW+RpBJvnCklvHP60qCt 102+w92A2SE1zrH8rEQELHFWPDFmtvKDIW/6AsonjEqaig+Jk5eT1DX+F2pNHKN1UavkGftaEeV gUW6rEestdTtTz21btOxF+cJaC4U7mGJ+rkHlQSboPM0H+m2dYz9KHGcBxXYAydgn+X/L18WW8k kgt3RcVSLkgYriQVAZT1YsMDeelMgTxzQn/fP9YSND9BxYeAn4pIJkfq7+85hcwmyNgfCXFaZeY gDINH+k4r1lkV0M1LRpkwquOCz/inIRVmieCfua6ebPSUkFR4PjSkz3lywGWJDhn01M5nioZXi0 nofldUUMEkMc3iw7ktd6nf6XfDIMLc6lM0k0OJSnfOQ== X-Received: by 2002:ac8:58ca:0:b0:517:c582:9161 with SMTP id d75a77b69052e-5300b777e98mr17169001cf.7.1788086008596; Sun, 30 Aug 2026 03:33:28 -0700 (PDT) X-Received: by 2002:ac8:58ca:0:b0:517:c582:9161 with SMTP id d75a77b69052e-5300b777e98mr17168361cf.7.1788086008153; Sun, 30 Aug 2026 03:33:28 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:27 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:23 -0400 Subject: [PATCH 1/8] mm/swap: add folio_swap_entry() and folio_page_swap_entry() 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: <20260830-folio_swap_entry-v1-1-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=2036; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=il7UMsRwFpzsLvluAxhowLr70Y3ODPga+2MhlPhEB3w=; b=740giHW+JUpfeL6BrdRfZ53BORRJ9DwBndjIt8Y9Znr21EeDOFcOZuhC9z/byBObIyBHeFQGI IjGTGV0AMNCDMktbmt2wy/syZZ5NwzV/2uTptcpt9hVzAKxCLlfl40u X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX3MTPJpxWMiOa N56FmWh9t1FgV7dOWZz4V5zl5zBbsbu7cp+yUTnhH+qA6eHl0VqWeXckyTFkiyoeMKFE3Fw+9Ho QvCPkwEJsdPlvp/Btz752+EWYBygwSnwZ/J40sWdlcsra+nzPJC0 X-Authority-Analysis: v=2.4 cv=Gr5yPE1C c=1 sm=1 tr=0 ts=6a9406f9 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=HpS3TJQ9O3Ob1ozEcmik:22 a=wCX1QjJdxvQAooojgaYA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: y7JhFPP21BjN1IOeIp2CS3cga-IO5ftE X-Proofpoint-ORIG-GUID: y7JhFPP21BjN1IOeIp2CS3cga-IO5ftE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX0AiPRh83yCOl JuoBHkT2xjYbGwuBnho2rvL8o8byCJS5mGbRbtGpZ5A1W4UMyfMPKW+N0YCjo4jfc+qtbvazC1N 6ZuAyqE75X1LlK2G0yW6NG15c4PiX2l6//dmVx3aZnVW2XX6syzgeDjO66M1jeRa69YRAC6yGyf wbo5kvURzY/FQ9CMeOn/B6VH5UxRrZ53j5ei0kQOGADPxx+9Ktto1PNLu+kwSsrHvb8yWiaFvoP SDUmlofg8djQlotyl4ad0yloUOS8RVBkri/NTLSRxA+VdtOJGLRMudVqjNz3CHlXnZsb5OuX4Kf AE+AnrjYaMcJznEgc+REZ0vqA7l2k/DBmKMjLL9aO6gkEsNaLBrZApQC9RA6+bMm06XpJj76AR3 /14ji9N0OsoyTsQ/uqQEw7GjdNjTOBP4CAddZLcZnMLAW1td3XNn9qXgl2XZMuk0R0xGaRDEATe 0qK0tVSxpyeCJPbD6oA== X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 lowpriorityscore=10 bulkscore=10 adultscore=0 impostorscore=10 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 A folio in the swap cache occupies folio_nr_pages() contiguous swap entries starting at folio->swap, so a page's swap entry is just folio->swap plus the page's index in the folio. page_swap_entry() hides this behind a compound_head() call, and callers that already have the folio sometimes open-code the arithmetic instead. Add folio_swap_entry(), which takes a folio and a page index, and folio_page_swap_entry() for callers that have the page. Signed-off-by: Tal Zussman --- include/linux/swap.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/linux/swap.h b/include/linux/swap.h index 0f953ed9c863..48632aacbc2a 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -278,6 +278,39 @@ struct swap_info_struct { const struct swap_ops *ops; }; =20 +/** + * folio_swap_entry - Return the swap entry for a page within a folio. + * @folio: The folio. + * @idx: The index of the page within the folio. + * + * A folio in the swap cache occupies folio_nr_pages() contiguous swap + * entries starting at folio->swap. The caller must ensure the folio is + * in the swap cache and that @idx is within the folio. + */ +static inline +swp_entry_t folio_swap_entry(const struct folio *folio, unsigned long idx) +{ + swp_entry_t entry =3D folio->swap; + + VM_WARN_ON_ONCE_FOLIO(idx >=3D folio_nr_pages(folio), folio); + entry.val +=3D idx; + return entry; +} + +/** + * folio_page_swap_entry - Return the swap entry of a page in a folio. + * @folio: The folio containing @page. + * @page: A page within @folio. + * + * The caller must ensure the folio is in the swap cache and that @page + * is part of @folio. + */ +static inline swp_entry_t folio_page_swap_entry(const struct folio *folio, + const struct page *page) +{ + return folio_swap_entry(folio, folio_page_idx(folio, page)); +} + static inline swp_entry_t page_swap_entry(struct page *page) { struct folio *folio =3D page_folio(page); --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACC9121CC5C for ; Sun, 30 Aug 2026 10:33:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086016; cv=none; b=dLwSKDM1LwMUuViP530ZBwUu2jw+f9z/gNdOuDTNfleV3a/E66+yYc4qYtsLMnZEhTvq8H/ooQgqt3zHjRM0PO7+c/MxC20KuXlFtbfpAImL510tHgHYVwWdJad5HkXbiz5rHX60jpTES8FVs6NqKGDL31I4ApYyG+dioM+VIX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086016; c=relaxed/simple; bh=yJpb5yXsQPyDh9y91Xv6B3Jj3WvQOE9ZIIlAoBgKruQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dyx1jcU9QqY4GE0dq91zDjCrVnw7wNFCWHqvX15gycjUtQsZRePMJrw8qHr13FnqT2Cqh5jp1Dr+8zM4EwSyVyLHgI2Oe3iiVrndvAkbIO/GNvbuQ0sSkeSYdsdocUo2/VMLGf+GzDjvWgrkXlnvsoXLCMFH7ACmqBgLb7IZruk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=od3n6sZL; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=BQ1IsALc; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="od3n6sZL"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="BQ1IsALc" Received: from pps.filterd (m0499198.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67U9tXYp3696900 for ; Sun, 30 Aug 2026 06:33:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=R68i MyJd6AJlpHo53ZebvYn2d9eNAhtoRa8wwiiATKs=; b=od3n6sZLRUPnU+YnQR7e OuLdyhPo8cy2+fXS17e1+5Blxw2+fKiZFkCarwG3rxk8l4Myi+THxnUBr2c3hrT8 6Nnuur/owIf/VBQv1PXqxEo+w2B4ivKxiAxN7/zertyChKR03we0Q9O+/FED70xp zw/iy+WrbaW3EjgWNqq0VpVjtbOQi3vMoamXq3kk+kW/B5LVz2Qj6QL1aWTigz/I A/MfPVPMghtFnsdTJbOiDVsnhDOTwFwNjEO6eW0xo7XzKivFEvMSCxJwjiCDurLx k9wQjO+FrsFhkTCNEC99EIZLapNuGfqhNvFPvm0SF6ffSLb0Un+UsfEjh7G0mKCp LA== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gcgdtg97r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:33 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52fb8f67601so31886071cf.3 for ; Sun, 30 Aug 2026 03:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086013; x=1788690813; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=R68iMyJd6AJlpHo53ZebvYn2d9eNAhtoRa8wwiiATKs=; b=BQ1IsALcsMyhNuuY1hKcngszkXILdWpgDvZhQ45Q6BU5cZNabOKbc7+dix8J3+wbfP zVI7NVnEJ1P4Y8lWXRsTOCgx9QA08FTZQh/8O0tEWlm0aAS4khYyaJX3RQlOxBAJuCXw KUdMjq+bsru6Mn0QHYEMKrjnf63GhlVEVrZv2M49RMSaK/9lxz/YAoCyKEzfv+amV3qn LiWvj5UjZiACF96n78wKFG+R72JqU8qpQcX2+w8UmERIR2bbVOsfqskkxZbt6dxXbm0i Z+gqf7BqSq+q5kwYwNIogACyXmUOEK6KI3DhMMZACKJSUuyKU6Zw4C+dS6egAtVxtnJf Tx7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086013; x=1788690813; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=R68iMyJd6AJlpHo53ZebvYn2d9eNAhtoRa8wwiiATKs=; b=GPTtpJEqlg6/T/oWnIY5NyNl5yDYCYOtlYHn0fAOd8xnGGPgU15yASGAjwW4OGq++U i4OQm/6qpWbcm59DytrDex797YG4JTEAlD5Ei2+p56qhB5mhkt8GLcHbrYbP4E0611iu lMfwgHaxiTTcMJRNNSWym5m418Rz4IPFPin591SvcQflK9cDO59XGMTja3LZ+OvdX2iK 6Izg64dkFRLUEJmKolbtiwGz0QcQiHgRSzr4upLuZlPx+D0PK7lpE1VXZY2A9geqY2zS dIX5FZn8Kct3CRl+8DM71rAted9Rcrf8M98PvRq512kPyIruHoTL5U6gl4+BZmELwY33 +lvw== X-Forwarded-Encrypted: i=1; AHgh+RqJrDwUpKS+QDbodYzo6qujFjOfp1eLKkENx1t/dkkkETdVM/ST7yOyiU/UU59lQXE3P6U5Bhji1/3U+3U=@vger.kernel.org X-Gm-Message-State: AFuF++lIhjmUGOD8FF4lDsc+cdbF2oGrweWeVHieq0MntL1XUDuEVbUQ iZ+8I0B5YTbZLV3y7s57ExHoz9mxlT7RGtTs3MJ1I1yQk0Puf7NThcKxOeqQVV2T+5QCthw6jH9 mJIVksgE6WpLuT65Y9mfwgN0aXM3cZ2XFSBcjXqQ8qKNLWUhjGQOtjTS6O5VSMg== X-Gm-Gg: AR+sD11teuLBz0G4DJzFIhOaE9VAQUsDSnQPJ2tc7/RCvS2XY+h8x8+xVEPAU+L+g0N W/Ru/tEMDdyQ1HW+7Rfy5B2tCz1h/xDuf/XDNB0HqFJKaVSzuZZr7tLMyaD6FeMNORjCzjWlRa5 c4W9fIJmfc7k3jmzc9ZyU9yNwmb4vDl9reNtTINuS+6Ga2fzxRowUqnnSlp8kJErSyxzjvEgI+h GNpHyW+muQR0LRX0eqSi/FJj0r2rMQu4HCtlEBlHS9MZYM1Sxhl3wyKmGNM4V2AV31YOr4R825E w2BZk8SqKjTl0qEGo2sRmO0ntFH9hbWgKKeifm3nt0HJ2xdN9f2q/OggDSUmp+k3TwmtKdqDH7Z Xnq3I0d8cigpEjfRWLieef0ZMCBR3dwRyURcIHZiwjw== X-Received: by 2002:a05:622a:258d:b0:52f:b495:e9a5 with SMTP id d75a77b69052e-52fb96fee36mr249069451cf.37.1788086012731; Sun, 30 Aug 2026 03:33:32 -0700 (PDT) X-Received: by 2002:a05:622a:258d:b0:52f:b495:e9a5 with SMTP id d75a77b69052e-52fb96fee36mr249069061cf.37.1788086012274; Sun, 30 Aug 2026 03:33:32 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:31 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:24 -0400 Subject: [PATCH 2/8] mm/huge_memory: use folio_swap_entry() when splitting a swapcache folio 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: <20260830-folio_swap_entry-v1-2-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=817; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=yJpb5yXsQPyDh9y91Xv6B3Jj3WvQOE9ZIIlAoBgKruQ=; b=+ysgi6e+YYzjba7Kbk8hy7m2fCoWccIAS+tbJjxQB2LPO2V7RurTdl/SokK8TRW1vJuuYPC8N qxEfHy6xQmWDblwBJG6de6eaGjYBHD+8C3L2bA+kHiwPqHj1nUSnpgI X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX4c9v8MvIT7CY Q0wKrk+kd6ZnCLA7j+uO3SNOpo5V9j0QxDrIJlzqPUoTYs+uOcOYHIVm+l9stGUhNS79PnR3QuJ Bcn3oC7tsLq1h88s0kqpEeepycLNyZ3RFcrkwp//7wUiGEReHjpmsXa5bmQUtz+aYHEeIh2uP13 sILlxBCmAYjGt5wLuPeD5hJBNovMq852LuMTPSmfG4iQxVTIIraEvaDvS2ABHhUZ3tX/NOgO2nz iJTKIz5VxMKC01sfjETJ+6H+qyizSMeuaQHG79wNF+jasuJwbNLFIShGl+tfaMYWPVChdmLD/oJ mVsrLt25c/EeyJsd58IxonMdr5anBhQwSKet2KF6mkOTC8jtU563sPlJMF1192LNMqSR4dMfFB8 7uTybdh2ixCzZ89IHdlGD/7qKr+i3uuMi/D1n8/TaGjvHWbNdez4+5gYxNA6K70s+Vr+B3j4wEf M5U2wLe7FW9aX4Gabng== X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX6rSrI0obVW3n stOwBt0HcRO57t8xJBzihmmoEgWto0Ig0oDjzbbZralC45vPhlGq40YDzJOFroyHa2dNyLdycl7 lRj4Fgl09VpqwmXQ0qIsuF6TaaYF1+5XD+/HvXaKjneCVhFWWxMf X-Proofpoint-GUID: 4osnR_tM5Xe50VSA869S3Jh9AXXMXw8F X-Authority-Analysis: v=2.4 cv=ZKXnX37b c=1 sm=1 tr=0 ts=6a9406fd cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=BpGzv1V74M3SfeTrGa8v:22 a=AaP-W-LBM3jM8pgIlokA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-ORIG-GUID: 4osnR_tM5Xe50VSA869S3Jh9AXXMXw8F X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 bulkscore=10 priorityscore=1501 malwarescore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=10 impostorscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 __split_folio_to_order() open-codes the swap entry computation for the split-out folios. Use folio_swap_entry() instead. No functional change. Signed-off-by: Tal Zussman --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 54494c3fa983..03287f995d92 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3760,7 +3760,7 @@ static void __split_folio_to_order(struct folio *foli= o, int old_order, VM_WARN_ON_ONCE_PAGE(new_folio->private, new_head); =20 if (folio_test_swapcache(folio)) - new_folio->swap.val =3D folio->swap.val + i; + new_folio->swap =3D folio_swap_entry(folio, i); =20 /* Page flags must be visible before we make the page non-compound. */ smp_wmb(); --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F9E7346A0A for ; Sun, 30 Aug 2026 10:33:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086020; cv=none; b=BFwSKekytxf6pOEstG4QortRzbA2P72cIBxXxHIM7PedLtGEvnO5fxCUVCUqfEhE1QrDG9xMcPZ32FryR8Xk4wZJLv63T3fEgAk05xe3Fnq6kd85QUyn2YoXHvyCBu0puYaiapAkaC2tySpkUZKUoAM462dbc+psnYwNKrL3N2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086020; c=relaxed/simple; bh=hjPNw4K1yXPTP98viqWADLFrOSoXMJ7N2Y21LKrNJ5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jakOlVt8oZ9bbAvoN2F+X4gYoCc1fK2U1zioJqrTFvdVnTRv3piUwNxd3bp49MMBepjrB2Hh479R9jZ6SQ6kBdFr8TXmNJBvwPBEBRLjMVhFsuXyepwU7wd35LssImgsYlyk5hCCgsu2B0C8G5U8QbOYQ7mEv2VVBnPWsqEAmRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=CGyQ1V6v; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=FjIjfHds; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="CGyQ1V6v"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="FjIjfHds" Received: from pps.filterd (m0167073.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67UAWt3f3409044 for ; Sun, 30 Aug 2026 06:33:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=iltX E0WYwKKMJapYaKnipYxUvczqFD9fAUv3vS9XHEs=; b=CGyQ1V6vUw+MCMQcXjjo 5rUZAS8akibjKgiY8wGGK9WLmQ0GU7BqMd6S9+BqN0/qHudVygkiakqm4Ov2LWJC 5RBnuR9X4qi7+vS4QpVPwUTbUU+iBrac8S0BqC59hPYZicmIwGSrHs8MrAi5cyrm 6bfhzI8wlFaGiUdJuVRH6cHRo1ogOeWj1GZYV7bSQgYXlKGk/0tdG7r59QAKSmNo Sm8PhhQpFEpEfg/7fkAyBsGDGmLJtn3snE7YARtdSqC5Fn/zz5NNhwGNMTqtdUIM q47YT7PxWyyhWsZP8fUDU8U6c5DF5aZD9aYhdIQBBTy3nAknLGuYzs8Ez7q8dXH5 Nw== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbuaa4n4u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:37 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-52e7a49452aso40183081cf.3 for ; Sun, 30 Aug 2026 03:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086017; x=1788690817; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iltXE0WYwKKMJapYaKnipYxUvczqFD9fAUv3vS9XHEs=; b=FjIjfHdsVFyzav/AD6nZhdvwYz4asKaHryiVxkFSSpzJspP5ZGf5Zpv2/3/FILcanX lB05EldIiBr4uv0KUKzn18i6xLZNRwPF4PimGtaE/9690ZdjFpU5sjbM/OmfgmPbo+MS NnVkUQHwh0oHts0bBnWt44O98l5ZIUjsquPR/RgFIijYASCJBvMyLTvsCOd99NxqTvXw CzR6mGMOKKFS/hLKq0ykEdcefBX1sAN9CnDx7qA4w8eQZTw15RCj5L40q4BMAjKUs0Xf ZuG+/OUt7zW9ELIakK3HcgFUdpMc7Uk8bL1RDSEcI7NyDIdwkGivbKDXZtQx3oMfJMyR 73iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086017; x=1788690817; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iltXE0WYwKKMJapYaKnipYxUvczqFD9fAUv3vS9XHEs=; b=RQ7e0DosxTjvJ+WQSi09socbzuPBkvpOSp1MJV/+Q/XV2UGIRXhbSU79olSV8tx+V8 HTu7hODwgxdahpEdOms0c8T4sBzXApjAdYQDFW+XLcrR6jUIwT7BffO6I2GbLRwk4hjO RvxvLcIzAdxzNl2sL5GVDqSY9YiufDV0vLaj5lYExVkiJRduyVCfVmLonKArDlcQUWeO JoMxpe14xKFVUuvzcfQlv5c0t++iGdPRGQ02UJlpOTqGXhVcJ+CCW4T/pTenOHICe5c/ zneOb7PNrG5aLLp0JlEvNGC+6wQEbscPF+O9PWryq1wQmoY3rrgsidGKxB0LAj/jrc7E U6tQ== X-Forwarded-Encrypted: i=1; AHgh+RrxuFQdlfDYRgR4ACF26t3QMoZ17SODuiyPokqoZS0PbB4yY5gyAlfFDK93ziyfOlowrbTYLcOUCaIiY+0=@vger.kernel.org X-Gm-Message-State: AFuF++mxbDgSzspudd6r/PsIVUdIiy4Et44Akb8S2PXXXWlcZde3BrZu s9BGOC0hOjIPag7zhji/RLy8Uerqu2L36Y9ixzyPX81YZTuwDz6XjwmChyG7tVV1eGu0d00KDjV AVEzpW3NBRzCT59Bxg9dwUaZUt16+gd4Xckq4ICY/qkLgEjddS9B+98m7+IrImxqzts+DQrZ4S8 E= X-Gm-Gg: AR+sD116VOU9KvJm+XFUg3CWoEAduQQbr6wkwVhFGjolTRZNRa9sG7UMkR/Zk2GFv6D fZD2tFRN1Wr6/B7/s7+QhbqlHrsbS1bsHQRL2eJiMctg3Qvz4vThMDmK/aPXhaWrsfIcc9AhGDR vPqFOQRsQTHRPJDOHgjoiC+SIxO5NqzYJ3HWdEv5faPK9cGsV0y2nE4yRDSf3rIM28ubxzqAWMH E5eTV8rZA9AOH3eMxDZA3xtt7qfD2B65dFEgwiHzwRXWsTv92JbOcb3SukmAKPfgkH5Ef6jPcvQ xmXfmpInKayS4EsdtwZDtv08r8CcHwNVVY/F1b47bSydxUSf/79vO2wr3LY8EeezriYbrJhdm4M mkn961rmtp6JeAVy/DLbTOLCQigqanjVxQ5+sf0hK+Q== X-Received: by 2002:a05:622a:3cd:b0:52f:a0b3:bcb9 with SMTP id d75a77b69052e-52fb941f705mr207116631cf.10.1788086016951; Sun, 30 Aug 2026 03:33:36 -0700 (PDT) X-Received: by 2002:a05:622a:3cd:b0:52f:a0b3:bcb9 with SMTP id d75a77b69052e-52fb941f705mr207115921cf.10.1788086016476; Sun, 30 Aug 2026 03:33:36 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:35 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:25 -0400 Subject: [PATCH 3/8] mm/rmap: use folio_page_swap_entry() in ttu_anon_swapbacked_folio() 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: <20260830-folio_swap_entry-v1-3-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=796; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=hjPNw4K1yXPTP98viqWADLFrOSoXMJ7N2Y21LKrNJ5w=; b=SqXdQ6+SfH8WrC7+aQn5jmiLp05F+QV1V+8t1xTPP9zyb0Mm5AKQJxBCFYXPXhX+yzVhjrhEQ fe4zwW7ILfhCLYAj2in2hlUqvr8G6n6pplJ43VNfpGfmiyLZR5wFFBQ X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Authority-Analysis: v=2.4 cv=EZv4hvmC c=1 sm=1 tr=0 ts=6a940701 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=jHxIr1HyPKZ_Q5_91PL3:22 a=gAJobatAmFEwf0K8sXEA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX6WVz3DBjY8f8 KhnWohqRra2HApxiecYhEwhvcYiHnIFTZzyN33G4OnfPA2fTrlwsy5GTP1UPQ9LFlfyA4485ok2 UvzV3Be0sqpDfYriN8XjYFL3wz47OdCQk8KCbBkqSTO0+NDv/WUR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX7/sxG+y57yN6 i6oryIYBaU+6LjdnIIJdtznk5lFthqi3F/o8XmadpeSGgPjNrLPt4+0eGSsHiiGAkmvPIrfqw0H P0HSfMV2xhtyERXUuRvlVMLIum18HOJyZ1YRAD3mV4s/OedtyiUJJ6cm7HveUyauHq4YgPJsGX2 6OOVD+DbKx4AaQJV3nKPm9aIj+zPcNktmieQDAg1Jc6KdEWffK+c33Ph9wsDD4p4DzpmcP+wbj1 L3x9v2Q0YLIBoxdhRs9oKK34AX+9zdqIOOLr/cywpGp/aPKXzt+Aymoe4TWKJe1DLWOVQHcFbZd YmwLpZgROe65fsXJj1xOntmoGli6ZP4ZuNfTbi0aOFZrxL9rG2aL2f9JhywcRIO/yUfFRx74doe PaocFSzD0rpnNlcz71dxTpToEpKJN7R6+AzU/T/gXoA7opDdUK0KOtUCiZD6XgpEM7dEAYr9laV UyFNi6tLYVMexj8HBXQ== X-Proofpoint-GUID: O0ygIBr5pnd7kJ4F2AYztrPtyGY8s8sV X-Proofpoint-ORIG-GUID: O0ygIBr5pnd7kJ4F2AYztrPtyGY8s8sV X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=10 clxscore=1015 phishscore=0 suspectscore=0 lowpriorityscore=10 adultscore=0 malwarescore=0 priorityscore=1501 bulkscore=10 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 We already have the folio here, so use folio_page_swap_entry() instead of going through page_swap_entry(). This saves a call to compound_head(). No functional change. Signed-off-by: Tal Zussman --- mm/rmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index fed0362e0bd0..ef34126c6ce8 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2143,7 +2143,7 @@ static bool ttu_anon_swapbacked_folio(struct vm_area_= struct *vma, { const bool anon_exclusive =3D folio_test_anon(folio) && PageAnonExclusive(page); - swp_entry_t entry =3D page_swap_entry(page); + swp_entry_t entry =3D folio_page_swap_entry(folio, page); struct mm_struct *mm =3D vma->vm_mm; =20 if (folio_dup_swap(folio, page) < 0) --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C267C2F7EE1 for ; Sun, 30 Aug 2026 10:33:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086030; cv=none; b=UhO1GGLJRT8g+rHUKlq9AjUp7WRDJWJSmtocEfmC0/PeLIFXIOoR+iAnPeCaTmcskE2uVoRAW8RagMnaeBHAoyYQWVMkw6ZrdVwiHWAnG00AN2XuHuJT9M+oOiV0e/a8EGQl3N8VB8WWaPrU+e6uuRwsgljqk7HX8697F/AX3RM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086030; c=relaxed/simple; bh=zHKyX7u/bn4nak9pCenYEmsbJoOA3IZ5m1jHPNOzKoA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RcuATRac41S9vXreb7SbweGh1nWGq0G0E4aWTN5tz98X95GJKCNTunm+hjn+xNHh9AeyPjDrd+ZNugrA/1wwgOn5txo6ezLHbC7poen2q77VQUEdXb6fRR1aA6NN8oJDCToXfsUwVua9mrhYLXv5b5H/lU4PRaeZTK1jcSrVefg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=D8u1sq1d; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=a9WthKJU; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="D8u1sq1d"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="a9WthKJU" Received: from pps.filterd (m0167077.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67UA0C7u3243259 for ; Sun, 30 Aug 2026 06:33:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=5hv7 UB85+3sed5S3Bw6RQxVg14F7gqMHHFVjFXK3+ME=; b=D8u1sq1d7VwcqZO3Q3C+ o140neDrpn6FYbpDuNcy11Mpm/cKasG/+o6veAJEI3BO/Rsc1KJWrYTwwwXAoDT3 VjZ+nncd0mFRsbL225J1tQ8H2RFTZWvaeQbPSlWP64oXd3phUUb1Q2YZtzye8gFt yoHfhJ0JvGUspsm6NJzAoyz9bVVUIXp22xCl2nNXgscFko5Ogpc8axyoRovjNCus QljAheSEYgDqkd0WqgbBAOWFo+nDTBK7qPEoPb7u315/J6hYsNPCcK1WhCEuHIo1 OAZCLkpA2gnN6UABkyZe4YXg0RsHVRxYswQPc7cxurnuh8r9XZkDB9Dhd3dIdSQZ jg== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbs0pvvre-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:47 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52fc16ac179so37853731cf.0 for ; Sun, 30 Aug 2026 03:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086027; x=1788690827; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=5hv7UB85+3sed5S3Bw6RQxVg14F7gqMHHFVjFXK3+ME=; b=a9WthKJUx7FoOPiL3YR7Bd5Q7K0rndnik6Q3oht6AwjlmVd3wXczHdd+ASGxnw6X/H h4EFBjhin2A5+n7mNHZaSLrLwHyXMn/IdBXhJsZy0TlFbLp/xdqsR+EDB9uftkz08f9o rrdPBWFoquxsT8RdLTsdfDyOMYsZiKo31gERXvbAQESIwi1OETy40XOoEuEcxpEEuBxU TrLFevljVaa4vuQNISSH+fDuU4XjUuA84KB6S5GfA8pXRk1AkgwN6TERjRKRrUO6VEJL I5F/fwuwvTZAZEE+621FM2MdeBvXKRTfXhMX7AsvzPPe08/3ZYeck9FKiu9ivLapVv72 DQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086027; x=1788690827; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=5hv7UB85+3sed5S3Bw6RQxVg14F7gqMHHFVjFXK3+ME=; b=qE0rP4hu+xBK8nfK/rr0+hyV19h0DfnUUfQPQ016fa2OE4dtA66glNUXskFWRiszmW 5BWFoNcc2iVB3Z4mCt2tgJIWKu0hJmNk8RRMDCBjoAXg9dIYWQS5h8ogiW4T3Sq6hjXs zvcn5+Bg9X/MkNB3bnKceMvk1um6x8UP2cl7FEkjwFcvzXShQ3gkcipWqS//eZHtMEcr q4tpx9MH/iZS4TlPEQX5zMMCdBRlVCUAhPHhJ+OTIUuaYOhLZ+m5B+YcNiBRfwvlBYeJ g0fKK1W5+1S1Kj2tLz+vAgqFvhBAE//rogbBtz8ndqzU52/u8nxrbVmBCiz5ZqFxU8kb rybg== X-Forwarded-Encrypted: i=1; AHgh+RrZNsuCLrCQ1nJiglD2MUPcr9VQK0JlNU84dnlBocSEbqN8/s2q/TbBaXhc+h5xyQYRRa1SsmPNmPcRtto=@vger.kernel.org X-Gm-Message-State: AFuF++kXDtY8fZWtLBruTPv2UrgEvsqkjn0s12rrO8RsibiBEl2YeclX haBFl8h/M0HLXV3ybkNLwkNnI/zwZAo0+zz0ZTcUQ4D3OdRIt078r42eXT97GPuOVUKx5PlyiNo IvcC7iQdFjBfIJfv8jjHAbK9MI3BPDFePzaAfqfnxQnnYM/2e9JcQnAkPWp4xzw== X-Gm-Gg: AR+sD12uyBieE4G4mH2MnKq4ci3dnocMD5Tgu+PYXCpJsLStLs0yCoxj9uELjuEEqcK y0Qh9GSXhhKUJL8cJWCqzqC4a6Wt9ZsVJV/c9zb2onIRYybwLRxGU8wSg2eyXEznY0Ej0FNurp3 aXQz/LqgaRGFJHCa5MpBgaeROPoVBzv9IIYUpd8t0Vr1E97aubPzM5KtxFeakUhnvHb+w7TMWLa aXqMRypjqI5xDYiIS0dFN+0x5yJDGPL5RWf4Bab34/xHOwjTOcSqEhM82J9WvpKs50oJvMstsGZ cbalOZtduQX1GrHydo6uLf5cwfXiF/oarJ8OyMPhMQFL3AUT93pCSpm8x6rQRqrco6bFa7JYHt0 KxgJ34TnkIormhQSD+FdnQod3fG68hC5zDSqjt5fllQ== X-Received: by 2002:a05:622a:1dcf:b0:50e:474a:47e1 with SMTP id d75a77b69052e-5300b8aea8amr14547311cf.10.1788086021894; Sun, 30 Aug 2026 03:33:41 -0700 (PDT) X-Received: by 2002:a05:622a:1dcf:b0:50e:474a:47e1 with SMTP id d75a77b69052e-5300b8aea8amr14546791cf.10.1788086021397; Sun, 30 Aug 2026 03:33:41 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:40 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:26 -0400 Subject: [PATCH 4/8] mm/zswap: convert the store path to take a folio and index 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: <20260830-folio_swap_entry-v1-4-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=3733; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=zHKyX7u/bn4nak9pCenYEmsbJoOA3IZ5m1jHPNOzKoA=; b=4eGm5s3wMRhMtyl2KDA7tHu6Ni8dzHC/clJdeLywA4tmCGasoudESZYVbGlzGooeyJ5yCSNiB DqkznY1tScvD7VGLmhid2OffaI9AHRU0q7WT5HvTmnC+5CEXfKFG3Cp X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX+YatHyzayIb8 5SKDHKstsCsKD+IxmC9oRq/kfAk9jmiIegv4Gp4Zl32kg2//BrpjC2Gy45djDExLi7rXd9oX2zn egU1vdwxyZrvDsyKnwT4M0B5ozKb+gdHyibuc2Xo+XDEVy+S00ylwaqy0kwJ51Cvra+PvlkR40N fJbS760ZJgvCk9JJejJh3v1e+3AJAlJI/MmZV4IkYg2tkigGG64l5gwiZpnzzA2yf5g0Fvyw1qB UTLmXb7ELJAKYUwupitzW+eyb7461EeTXTwK94R9hdvT3hZamaT0EDuLSpfnb56dummzX7DIRpl Y5BVWafy+ufM2s/BCnETSUOvDRGa29XxN6aKLbF1a3mIULDa8qWMVvzR+ZP9nlWrizy+ZWZKGUP 0kayg8aD+pllDo5YzSQrjMYcH8VeNRvrkdX3kqeL6pKoF6eL0LaPRveLuuGgn7KmOdQTC6c5Sox B88sLzVg79+pgnvdQIQ== X-Authority-Analysis: v=2.4 cv=EtbiaycA c=1 sm=1 tr=0 ts=6a94070b cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=Zkbyt3CucH-xCIxE:21 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=QOCMdifcju39GKoXhKua:22 a=ASlJD9JRYGfELUMjv9QA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX1fNWRQrs3HUV RpJ+R02TXJERzolXQsVP5cyqRpdVQtWQIHAsqKNcmmTuZhGxFQvznOZ2H3s55nd8SAylpdHqPG0 O1jv0/l2TDnkOYe+RmxBvbGWefwGilsqhof3DfiIQuEbaTykjeiE X-Proofpoint-ORIG-GUID: 5-2IOwnE9nieJRF7Tz5_I3w6oYfTxfuY X-Proofpoint-GUID: 5-2IOwnE9nieJRF7Tz5_I3w6oYfTxfuY X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 adultscore=0 lowpriorityscore=10 spamscore=0 clxscore=1015 impostorscore=10 phishscore=0 bulkscore=10 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 zswap_store_page() and zswap_compress() take a page that zswap_store() just derived from a folio, then convert back to a folio for the swap entry, memcg, and node. Pass the folio and page index down instead, and use sg_set_folio() and kmap_local_folio(). zswap_decompress() already takes a folio, so this also makes the two paths match. This removes the last struct page usage from the zswap store path and saves two calls to compound_head(). No functional change. Signed-off-by: Tal Zussman --- mm/zswap.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index f3ae3c81e48e..3a6f89017646 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -824,8 +824,8 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, str= uct hlist_node *node) return ret; } =20 -static bool zswap_compress(struct page *page, struct zswap_entry *entry, - struct zswap_pool *pool) +static bool zswap_compress(struct folio *folio, long index, + struct zswap_entry *entry, struct zswap_pool *pool) { struct crypto_acomp_ctx *acomp_ctx; struct scatterlist input, output; @@ -841,7 +841,7 @@ static bool zswap_compress(struct page *page, struct zs= wap_entry *entry, =20 dst =3D acomp_ctx->buffer; sg_init_table(&input, 1); - sg_set_page(&input, page, PAGE_SIZE, 0); + sg_set_folio(&input, folio, PAGE_SIZE, index * PAGE_SIZE); =20 sg_init_one(&output, dst, PAGE_SIZE); acomp_request_set_params(acomp_ctx->req, &input, &output, PAGE_SIZE, dlen= ); @@ -870,8 +870,7 @@ static bool zswap_compress(struct page *page, struct zs= wap_entry *entry, */ if (comp_ret || !dlen || dlen >=3D PAGE_SIZE) { rcu_read_lock(); - if (!mem_cgroup_zswap_writeback_enabled( - folio_memcg(page_folio(page)))) { + if (!mem_cgroup_zswap_writeback_enabled(folio_memcg(folio))) { rcu_read_unlock(); comp_ret =3D comp_ret ? comp_ret : -EINVAL; goto unlock; @@ -879,12 +878,12 @@ static bool zswap_compress(struct page *page, struct = zswap_entry *entry, rcu_read_unlock(); comp_ret =3D 0; dlen =3D PAGE_SIZE; - dst =3D kmap_local_page(page); + dst =3D kmap_local_folio(folio, index * PAGE_SIZE); mapped =3D true; } =20 gfp =3D GFP_NOWAIT | __GFP_NORETRY | __GFP_HIGHMEM | __GFP_MOVABLE; - handle =3D zs_malloc(pool->zs_pool, dlen, gfp, page_to_nid(page)); + handle =3D zs_malloc(pool->zs_pool, dlen, gfp, folio_nid(folio)); if (IS_ERR_VALUE(handle)) { alloc_ret =3D PTR_ERR((void *)handle); goto unlock; @@ -1392,21 +1391,21 @@ static void shrink_worker(struct work_struct *w) * main API **********************************/ =20 -static bool zswap_store_page(struct page *page, +static bool zswap_store_page(struct folio *folio, long index, struct obj_cgroup *objcg, struct zswap_pool *pool) { - swp_entry_t page_swpentry =3D page_swap_entry(page); + swp_entry_t page_swpentry =3D folio_swap_entry(folio, index); struct zswap_entry *entry, *old; =20 /* allocate entry */ - entry =3D zswap_entry_cache_alloc(GFP_KERNEL, page_to_nid(page)); + entry =3D zswap_entry_cache_alloc(GFP_KERNEL, folio_nid(folio)); if (!entry) { zswap_reject_kmemcache_fail++; return false; } =20 - if (!zswap_compress(page, entry, pool)) + if (!zswap_compress(folio, index, entry, pool)) goto compress_failed; =20 old =3D xa_store(swap_zswap_tree(page_swpentry), @@ -1515,9 +1514,7 @@ bool zswap_store(struct folio *folio) } =20 for (index =3D 0; index < nr_pages; ++index) { - struct page *page =3D folio_page(folio, index); - - if (!zswap_store_page(page, objcg, pool)) + if (!zswap_store_page(folio, index, objcg, pool)) goto put_pool; } =20 --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 426743AC0DE for ; Sun, 30 Aug 2026 10:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086034; cv=none; b=j50eoXqCP8fNkFQ8/4zVdYmzUGsaZ5qefGEjJtfPZXCqWBOSep2n1Q2sLsyyAd/uWcg1cWJR38Fi3N9BeuRCdo7O+NRqhgGRfTIfXbLbyU2/Iuw8thJ5bh9kffcg8FB+TTFKMLdTjBqcAjtwxnGrEdcH7qNl+Ab1F+hIVg7qE+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086034; c=relaxed/simple; bh=QUnk24a5m8yz5ZbJrqhe5QuRGQ1y8Pb73+CWqNpDSpw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=shkwCTeAwrcetYoid69LddhoyvbGkPL7A9EsNZBB2XrpXwtVU8tqfeM30eh1YaAqwPmkOpL5gfLUbX0dVOxB93RAF2TKp5gdZazrIrBKFh9fbgFCoch+IIR/f+nAvAJNCvSfaynxKPMS+x8cZKqJkt4Vk5DJR3KzwLyPnTk735c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=WEtkyWrQ; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=kFuQcW3T; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="WEtkyWrQ"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="kFuQcW3T" Received: from pps.filterd (m0167075.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67UAS8Ue3299277 for ; Sun, 30 Aug 2026 06:33:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=JCz6 TGTeY9Fm3CRXI9ycezdJoLH0CKAS6XvyEH2jrh4=; b=WEtkyWrQuMLAyQJfquvx k7UMw94sA32wFOf9YloYUNSyS4hQzHHb0ELsJQ5GIvapw8mZKuXQbGZz9Kx8q2Ia 65hqikIprptymJ5GEDlBevRjNslGhFLtjnKmDlcEhSRwHx05Huct96UUzYanxApR +dMeH/qpAF8Z0bZc3t9xpB0jn7eeXT1P60fiFRnluk2e3IEq+N0Qp2LtgtSyJxd8 TGWhy64E9dXzIudpWbcPrtssFIaxH5Abcxpis+8U3KcEe7V+rA7nVNboa70yUW0I dGNfLwGfbkzbsN2Z6ZjrbD+BJ5poFIcCbk/Hz2tDROeIfsNwpFM0giMzlDO6rXYR dw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbudj4n1k-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:51 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52fbe82671dso36141301cf.2 for ; Sun, 30 Aug 2026 03:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086030; x=1788690830; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=JCz6TGTeY9Fm3CRXI9ycezdJoLH0CKAS6XvyEH2jrh4=; b=kFuQcW3TM1mr11KDvF2GqBncZCC211rulcTDkvPHk1Wzbba/nBelcsUUtBo3GImu8n Yem29xtg6LtH9sttP1p8FSmFtxk+LYxXCDXsjAwa5fAYtQ1UD3vpUqK6x5ktL48NeY8M XEyLM/iNgaJM4KDitiXEa0vWUXILHTPrcV7DC3eEoCU2QPcFS5b6GihpO3HKCDsAwiqW Dou3wHJyQ4tfzXy0fG8qia2fwpz02n3czeQfLqdVgIf4w0hzMBz1RAi7BptOo6cdcXBs UqCTYYKhqlRWAaBV5g9uPPySed1PHCTEET95nSTcJydM/AhlVUBj4EUy/YIemULY4E8v GMrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086030; x=1788690830; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=JCz6TGTeY9Fm3CRXI9ycezdJoLH0CKAS6XvyEH2jrh4=; b=rJDc6CMYNzvRix8XlKqThKRuH2fd5UBZ7Hm4zhuItdWWkVMQMnUN6yQG9qKn1T6Bx7 03JoQP8avlshpkR8PYTLNcaulaXMlyASWyP9l0Pxetqlp5fHmWImEmcgbmT7/bk0XnxJ F0Y8I81h70NVx2oZulqbVnkiaOG/bnEOc7yv/GpGWGbOS8NX7Xw+vOln/B/qF/5/RnWJ cI4/PjuQu89/Z+9EJcqhTa2wVIyJr8V7/2j8XQ14EjpP7ChwLqEUK36+wpuPFMhCykfX a2JwgATtRvlhnvhFumf+hGffbl1EtQDdQ8OL6hW9kw8UiQV/qwS3N4CEMTJOve3YAK02 bRXw== X-Forwarded-Encrypted: i=1; AHgh+Rrjpv01l3pW0vMhO2/7eIHrshtrjHhUWotFuFuXIL9Y2y2o+IGkZA+nxL7z7moGUVkoVu7C8XfMP9gWkaE=@vger.kernel.org X-Gm-Message-State: AFuF++lHvsd21PVcqYghCudw1AIBMHh036sVeYkb8ddaBIiuHHZ5rnrZ qBaIcuhKbaM9CRy2Kn7oxSC25pHcrzBLrNyvYJg+Dzy16sftEisYZIvRuwOCz19H5aLJ6gsfwr9 u6dgr2zsu1AhTMD4JGeYkKzMP++hSeuHteS+2MiFtrwcZQIGHdEAzmPWb1DMgUw== X-Gm-Gg: AR+sD13y3PW2PthqS4JA4KKSwNkZ/K8ePujgx0UHiVXqQe3uluzUVkY28LxVmFVNKaF XTp+FjtFJb6Sz81vY/U7UVmNYPQYPsCMdJaYc/Nktgxnr/chRd6C2YtB3wlyrfEbIhGrpnwfgBi L7jPS+W5RAwAkuF8v8fiBWnSIfPqurfb4+3JZBNvccu8ft1UlqlW45S5rkh24kRGqEzRiNB0ad5 dILAfem+2UQcT40faSlApHzSz0OIzZUpDicY5UHyUll15mtvY2HHO8HAdQ+gTJJIifafBKrh07v wSOdtW9T0SPA3G4Sd9z7yqlJ4x+4ocZH7hSut+49ZBiESENoz/hXb7gWQl7rDv63oWTpBCWNyvs cBA+JleVf2/wEAOiVEQcKWteB/qhQ4i/Hp9SOZKBleQ== X-Received: by 2002:a05:622a:5592:b0:52e:12e8:54f3 with SMTP id d75a77b69052e-52fb93b34a9mr275725371cf.8.1788086030630; Sun, 30 Aug 2026 03:33:50 -0700 (PDT) X-Received: by 2002:a05:622a:5592:b0:52e:12e8:54f3 with SMTP id d75a77b69052e-52fb93b34a9mr275721061cf.8.1788086025492; Sun, 30 Aug 2026 03:33:45 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:44 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:27 -0400 Subject: [PATCH 5/8] mm/swapfile: use folio_page_swap_entry() 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: <20260830-folio_swap_entry-v1-5-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=1012; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=QUnk24a5m8yz5ZbJrqhe5QuRGQ1y8Pb73+CWqNpDSpw=; b=rD3bjW5VlbToPZmsPYLIPdScpwZ9iyNjv5RFx5o7TeUw25j31bQHhyFDgRRA45Wy3q+XZswAN z+0pSelEWUqAt2c+uOLcWNt4kpdF525CGBahVVb1EDd4i59VGMgTxN/ X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX3xg5LCrbhmS/ Ux2VVCLU4dzola9uzda+ecSmkmZ34Vq/SNyA+byj7mmXpsWJ0LttVb3Y1uaCzqiw5EIkCxZHPzN +Yd7PzntpQCzzXo6pRqRl5tU5EhFPpcD5shP0WuyxcvF9Fi7N4LD X-Authority-Analysis: v=2.4 cv=Gr5yPE1C c=1 sm=1 tr=0 ts=6a94070f cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=HpS3TJQ9O3Ob1ozEcmik:22 a=xqDBoplpeononJk8d44A:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: hUi4rZuYpsPLZ2zXIuMX63atpubNpfwS X-Proofpoint-ORIG-GUID: hUi4rZuYpsPLZ2zXIuMX63atpubNpfwS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX122Fs5Yot+UP Q6QeMnTUz85eaBx1OSk02WLhEYtRElew8lG9d2BW4aZkBeSFhnGgi5NCa/zhaigWDkdyTYThc5e btZs5XLyZlUR8DZQNMx6hdSWg8KF6ESXH2lGM5pzEE+knbOJYOZoVXttKSH1Ow1WVWRiJ5TmNug emW7X/SCtVZoN5Pa8Ixe8hVdI7Xz9NSQsNQ/j//Am3QWkNo6u6+PGyt4rNsy8xU0zSOmbJchW/r bGwDH1lXaoj6/Zzm6FyHy/7acSnm/VCFK3UBVb7pHJIvJROcItIn9ba2ykYRCfput1jsb1A5wpd N40HiJbNvlu941+W6Y7yQl+G4wIWwKSbaY9ONVUwAmu4TZS/Gdxcs+Gr6ylJJ8Nv1xbiY0DR44i ocnzEzmOsapdZqpeEsfJZn9L3WH0JYhectdiDDtHYsamiw0OM5HnEa2FlfospTkK8HrckFZeaCl xCMC3lvPbMNjyJR++nA== X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 lowpriorityscore=10 bulkscore=10 adultscore=0 impostorscore=10 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 folio_dup_swap() and folio_put_swap() open-code the swap entry computation from folio->swap and folio_page_idx(). Use folio_page_swap_entry() instead. No functional change. Signed-off-by: Tal Zussman --- mm/swapfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 58db70424253..c7b8e69a1227 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1810,7 +1810,7 @@ int folio_dup_swap(struct folio *folio, struct page *= page) VM_WARN_ON_FOLIO(!folio_test_swapcache(folio), folio); =20 if (page) { - entry.val +=3D folio_page_idx(folio, page); + entry =3D folio_page_swap_entry(folio, page); nr_pages =3D 1; } =20 @@ -1837,7 +1837,7 @@ void folio_put_swap(struct folio *folio, struct page = *page) VM_WARN_ON_FOLIO(!folio_test_swapcache(folio), folio); =20 if (page) { - entry.val +=3D folio_page_idx(folio, page); + entry =3D folio_page_swap_entry(folio, page); nr_pages =3D 1; } =20 --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D7223A5E64 for ; Sun, 30 Aug 2026 10:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086033; cv=none; b=VbP7tvpajyYDy74K9Ms5g+x24UQc5Vzyio5iu7DJy1rT0yWWpJ8Tuktweu+YIuBL/MWiNXOCCR3yHieARWXR/Fdt5kaccw0saEKqQaRwT5FEx1AO6SorGYS0Vr59kl581bJzyKWE6bCX+Jsf/Cc8NAJl4+S/bNkChyU6PD7INTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086033; c=relaxed/simple; bh=JMnLiPjPeuQ8XHbUf4RdPN6u8wF8V4jepqQl+nANMew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S/MJghw+5k4fnAwML+yTqtJhAfZnqHc9Fz3csdSlkfHwmRUdJG3wP1zoAj+g2NdWSIb6GVvxYjbRvPgodxgSbaJwyo4PYea8pjsMvN3cFy5bwQCdZEcgBShXj5wFJaePNwnXjcD7lzGOIT4kSRKyzGK2Rnge2WC53Vqz7h1NLFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=cKmK2c99; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=5sickKXz; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="cKmK2c99"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="5sickKXz" Received: from pps.filterd (m0167075.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67U9XMhv3195417 for ; Sun, 30 Aug 2026 06:33:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=d/ju GQBpeXjCCGF/Jvctg7hi+/3D3O4YYez7MG8kxSg=; b=cKmK2c99kpyD+CJhbslW GMsg+zFJGL562rbCixAhuoRwdYIq03wDGvBbBM9J1p0jYDWKQ1g0PrjMtqhBjkFR 33TsmiHjgLnr6pTYATMl/D7HZaJmezrPekZBWtvI59TQ2KlALpsBGmWzhfKUvCBS dMsyt6+FSNlsYqRCbKwHckJ2LcX1voJO6gtqeBmlP7InxyM02490+dqbsbAcg2zi jGVHdtSdlizrUDhXZ4A7FzNK7/3eCq8Trv+7ZSm5awSjCCjLMeAlPr3hhy+wi/+B 8cbshrKJKSvDm8F9vlABeI9FbQZ9n/beZzBoiegg7MNaG/+ykkk0orXyyVpkfMXX 5g== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbudj4n1h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:50 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-52fb6c7b680so32032671cf.1 for ; Sun, 30 Aug 2026 03:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086030; x=1788690830; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=d/juGQBpeXjCCGF/Jvctg7hi+/3D3O4YYez7MG8kxSg=; b=5sickKXz32Ywm7oNVWz5Hj3AVbC6jy15RPzK7Q46Y+jwLRRACLlIOvzrg9NwOhLQax CaMEqBgIKAd/rF0pL96Ew/tOTz54Xpv6fZQJamYcfOh2EipvEOpyyc4po01H8vPMYl0o vaDywpAZtLn85Wbq6BWkRjHfmQstCKgDrOEJBF411GF6Qw+a0Xe+kPhRy8zu0o5K2BuU QPIpeNh4CpoahwHH5ggeRphPhRPm8p+VFvpleq6iQLNWgD9q+G7RQH+VjTDx3G/oByP/ XJJbbPu859pZeZ5MW7AjrjkeIAbaEH7u2dWPsvsLBjHXMESmBUXSdrmPkGa6MccrAPv4 OPYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086030; x=1788690830; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=d/juGQBpeXjCCGF/Jvctg7hi+/3D3O4YYez7MG8kxSg=; b=hYHwSYHKq2bTNIgbdT10ppgzmPjngri5wlkOYyAp5uqIQWGi39YHmwOE5FkLa0W8Zp ek4LwnHaQ8lcBAB/Kh/RwC0h3E2tezvglgS7TMWFbj9dNTf/uCCHVX+r+6ebYn9xzzWO FlTXSzjaQ9hCCSW82+FTwpTd6VTiKklVaYmjc7p3YVevNM7yCJ3puXEY+TnbI1w3gT6i /GBfKJdawB8umgjhFGY30+AomRQnYIxD0loRqvqZSwJCyfj3E9tEftj6AJa6WikWDEQa owssF7HARk6ZGfIGrLhg6V5FKxz3ouB4ixey/RRHgyaSoZvJ/0hrmtwBHeJpPi1QFIcV an5A== X-Forwarded-Encrypted: i=1; AHgh+Rr3jPbCeXymHj5/vkynnID0QbL18PN7l7Fzxl2yxvXaX8hGylDwpzrdBSTv/yW3FUP9xoYPO1+8Fl06uFw=@vger.kernel.org X-Gm-Message-State: AFuF++k/T3w+cLlvU/85aBZcOyZkg+dYnmew7wrtSwzfpCT58x0qBdw/ s6vxCBEd73lNrnL0DVpd/f9JP6ElImU9kPIvzrPbycPmW8WZQ9jANN+N+e+i/tmjJ9T24dwSwO2 wrhDVXgF/4CvufR0WpNQJ8cTFXusKvzNS1pkHpjixsBAPnDPGcQ5SzYw37Bzqsg== X-Gm-Gg: AR+sD10dAsPVqIjrOSS+kk1rETXpcUzC+N1iYffzbJkfHtFfjz2xRW7pUN0NoopGaTv 1QR+lt0cWRWN5t9n4q57TuaMsQOQVIiFevpJgDcLYs4COTlv9C0ao1uxe/HnT7kuOrCEB1Pv8Ch 0wATAOCx3MPOU0QDZZdSHHdT2T/1cnPhDLknAoLuefPL6/QsPrJ2Qxa3mPEVrYWMGrDlwLxuE4j 4WdLq69pDkzqlATWC0BBCPiIuRvJxI/JDrnEnoIruLN702nqf3V1m+phYJ+Fub2UkQRgSy6h7JC +Bxvbi564VSapsqMPZE7GdBNlp4aMerSjsiNOmCJeZmdNAabbp4Bs1jjOJFCsbgMp8G1bVQiC5j IPg6lGMDfxqzFP97RlvBgCoFSiIQHqPCFHGfUaepKjw== X-Received: by 2002:ac8:59c1:0:b0:52f:ab8f:43d9 with SMTP id d75a77b69052e-52fb95e7d48mr208988311cf.22.1788086029998; Sun, 30 Aug 2026 03:33:49 -0700 (PDT) X-Received: by 2002:ac8:59c1:0:b0:52f:ab8f:43d9 with SMTP id d75a77b69052e-52fb95e7d48mr208987841cf.22.1788086029567; Sun, 30 Aug 2026 03:33:49 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:48 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:28 -0400 Subject: [PATCH 6/8] arm64: mte: make mte_save_tags() and mte_restore_tags() static 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: <20260830-folio_swap_entry-v1-6-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=1787; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=JMnLiPjPeuQ8XHbUf4RdPN6u8wF8V4jepqQl+nANMew=; b=684WpVyyjKGNjL08aBqlBsLxRU6keghtlyIRd3w2GLSP2VrXOpyQi8zFCsDv7pRQmdsJ7w7hX cAobQWSyjSRD38U65oQjH5X6lhPqAu4kzOdCs2baVilseYiezKm4jlG X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX+g6y0EC8L/AF vqWa8wWPl0U6Jl5cOC4xDeiCk9vPCq2HxlM95f6aFgUFqVud1U8e5MqalQhTfdnH9u280vRPMRG Oirg+ekeDemUmIJLIVC5QObfi6o3cgB5jn3Ae/D393fE119Z3cGS X-Authority-Analysis: v=2.4 cv=Gr5yPE1C c=1 sm=1 tr=0 ts=6a94070e cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=HpS3TJQ9O3Ob1ozEcmik:22 a=f-bboeSTcrnmky8UUdsA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: xxmJNvRukoBbaQ_zOYciql2K5-WJso0n X-Proofpoint-ORIG-GUID: xxmJNvRukoBbaQ_zOYciql2K5-WJso0n X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX2Xp6m7uZzhjH XGLlVr9Jr8fXRVP+vfC8jthqHomDtKtjfYp/iigjF+L3BPcBo17nFDF5gL/iEgdrs1Bn/Sox8Qp kkfoGcXhuXQfLJfVBMr+9VHWp425DeeNxAodhJXYkKUVaQtAKpVnIRSi0V0iHAygNGLfnXJehHS tm3cNFpoSey225mz/HUmCgyqPwAmdVq/IikloCINmZidV0cPY/LX3lfVt051iuho/Secx6Ikn16 XGm6sBw10g3ACq/gabXj/dzeYad3/Zu3vpehUeRRVxL40r4YyY2pWdKikI8kG/kwmh4uUC8E5qJ yc49KNVYTTqnE7dBcxaNg+78jtakrk6z1+3TP5rbuH7EIlJYmTZERuBkPpk06FOpHtcBHyJJkXD A8r1NNvtMuXGi2RT1emyCNfnZQ3CU7zFLzGuLZbvzU1VeNW8GCTXvPHAeLMc7cbAxyXttOl5nzS vAW6qd101hW2CsKhaOQ== X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 lowpriorityscore=10 bulkscore=10 adultscore=0 impostorscore=10 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 mte_save_tags() and mte_restore_tags() are only used by arch_prepare_to_swap() and arch_swap_restore() in mteswap.c. Make them static and remove their declarations from mte.h. No functional change. Signed-off-by: Tal Zussman --- arch/arm64/include/asm/mte.h | 2 -- arch/arm64/mm/mteswap.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h index 7f7b97e09996..83f3b05fc784 100644 --- a/arch/arm64/include/asm/mte.h +++ b/arch/arm64/include/asm/mte.h @@ -23,9 +23,7 @@ unsigned long mte_copy_tags_from_user(void *to, const voi= d __user *from, unsigned long n); unsigned long mte_copy_tags_to_user(void __user *to, void *from, unsigned long n); -int mte_save_tags(struct page *page); void mte_save_page_tags(const void *page_addr, void *tag_storage); -void mte_restore_tags(swp_entry_t entry, struct page *page); void mte_restore_page_tags(void *page_addr, const void *tag_storage); void mte_invalidate_tags(int type, pgoff_t offset); void mte_invalidate_tags_area(int type); diff --git a/arch/arm64/mm/mteswap.c b/arch/arm64/mm/mteswap.c index 63e8d72f202a..3c54afc8b758 100644 --- a/arch/arm64/mm/mteswap.c +++ b/arch/arm64/mm/mteswap.c @@ -20,7 +20,7 @@ void mte_free_tag_storage(char *storage) kfree(storage); } =20 -int mte_save_tags(struct page *page) +static int mte_save_tags(struct page *page) { void *tag_storage, *ret; =20 @@ -47,7 +47,7 @@ int mte_save_tags(struct page *page) return 0; } =20 -void mte_restore_tags(swp_entry_t entry, struct page *page) +static void mte_restore_tags(swp_entry_t entry, struct page *page) { void *tags =3D xa_load(&mte_pages, entry.val); =20 --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43C622E888A for ; Sun, 30 Aug 2026 10:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086038; cv=none; b=L9D8rD2itJFfly2vxlWOifqMkrSBuFTFSN0HuhKhNC14rZWNjA9zRM3MFpaJpzs8TU/xiC8qno+BOuTrBcT1Alh7/tpMmk0PEU7YQtJpa/tg4yimXVS232sCnfPdFp/HE1MCf9swuGw8bt8OuYfsdaEQcL8pZunaWgkX1wpNmJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086038; c=relaxed/simple; bh=8STOz0RYKi+7v+knfY76tg8bbf4f7uqOVYm5Jf2KOls=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HoS4BSs85HKfJJR3BpGQ8zDFue2qlVrbyjrYC9Hrzlk1q36z+rUzVxUWDHrwo07Kca51uTkt6SmGZjiIWhlcYgl2f1uIOJvRRaOtpqDjarmTtEwvWAa0XEXy2NGjSipaO2aqBQL7EQdeajUxgUSduJvgrraxvx5bBqBQ/tHzAYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=hVKwFx0h; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=XfFqcqXR; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="hVKwFx0h"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="XfFqcqXR" Received: from pps.filterd (m0167077.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67UA0C7v3243259 for ; Sun, 30 Aug 2026 06:33:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=TUGg y+CgNjku4PJ/FQqlsQRbEqOOlPzZGqKdff23MIY=; b=hVKwFx0hCSsZz5LmdePQ m0MIIXxBNMqk2TTE1r4loNFqwx04Lk+KyP0ANLw8p2b3pFEWesqV/I4u6L8EkBHc Ki+S48u1n8GvEGat8Rtjc3TUUqIdJhvCqYNrD9R/rIqqks3p3mk5CBvMuIVs8Oz7 B//B9LqyRpbCSDnmdkjITeC47HXFSy+g/O5Z3/6qXde+vRLmNkS+cXQS3ZHR11ge pDD3LBJu+sx4wHBK7dQD+kY1QY1FQQgf+h+y0Woje8ozX0gMNvzrXuXCewHk+KO5 0vROpyniv4JLtNCGRncW9+rPI79l/FNM6rRKlvDVfa7axqIxq4ZKLGZ0FZb3mDDH QA== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gbs0pvvrq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:54 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52fc3bff8bdso36262601cf.3 for ; Sun, 30 Aug 2026 03:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086034; x=1788690834; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TUGgy+CgNjku4PJ/FQqlsQRbEqOOlPzZGqKdff23MIY=; b=XfFqcqXRa+Z1gKAqU2rB1dCSX+nQJT/PurPluKzvaZRi2TyUU6vJYtLrIHPiycXwYv tGBjMT5aJKxovyTUm/3SAhM7WjSS9DUI4eituaXDrONBrGZ3nnYtCXOC/zb2e1u9Yjqg MIq/IrBSoUJyFFrXzA4zQ4N7IFG+JxDAkJKX8t/FHLlhbMlzw0z8WNwhyzdyego4PzsP njbTjFKV+eOB3+B27sxAgVPEDpJ1Vh6zhaPM3YtwzLZQL8rU8KSZmf1Zur2VTdoyN2uk mpsUs2oOqflVH0hMmH6PkDidoS10KSx+UI1/2BVwdYbXmkv5PHfeq2UuEtbv7syMZxHC +NiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086034; x=1788690834; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TUGgy+CgNjku4PJ/FQqlsQRbEqOOlPzZGqKdff23MIY=; b=lMEKLbW/QrfOqONLn0HzPaw1nnOgr8Qc+seiV7qkMkAeOVOyfGVf6rQRmYtot73D3n NpUiA9wmysbMVo0vcBd0L9vRN3VsB+5YpTel2IWr9rCFusNzUZfG8EWZF4se3ABndbi4 4g9fU9AQau+Oux/PMSl7JG5sE49jwxUpKQb2jBaUbXJ8/e5Xlhhgy2Pd6GC+FJzgJlj0 R+RLRO1NxLppVcFOeGeu3aIMd8rNqwT7pHRo9kRniyRadv0L54XcR6SxUAbyUh2KpiAs DU/TmZEEbDhtKu64nJukA8qzYPRDqvnBPg2H9+fXXYdAwKjV6xxvum7/BRvKTj3qrqLn qrPw== X-Forwarded-Encrypted: i=1; AHgh+Rrl8xTsTdxPJ8TVVdEVykRXcMKvYSOlJpaKk1OSd9uHvq1QnTKz7tsCsC5uPlcfYx5bmThDM+VBdnxTxm4=@vger.kernel.org X-Gm-Message-State: AFuF++nOfKPmkSzM2pFiqIkEIfkHbR3FPXkK6ALXvxFdPSENrJdUkqND +ZbMR+l3ckdIokEOol3EjP/ut01TlBRExe08iCti8MxuSigh2nAqPakIui8P0FRRKesiKvzkOQ0 6hq12C2TtgnE9AOJOhzBO0GFND8fVuNj/2k6fbSgl7JNHAZcbt4ZKQkoN286sKw== X-Gm-Gg: AR+sD13wHtrcLm/ec7RmKcuR/Nx3JW1FPPL4NG+j3cl6G/VWVkoX0lQdZylEJCMCocI bWa4atIqMihjJ32FrjXWNnNGdEYK3sY2cdguctfnawquccPB8tpnWR0wAOdneeMr4KVhLdSzNTp AidL5EOgXq6gPET7SwvQlm5C3T8FsIr3ZmhB4XmJkT19mUHzCnaofBar70LYZEGReHxBVGRxqD6 E/ExtbddvmfcZ5vYDw8u+TxGsRYNNEAQD1AcwW2dmMY1OFk0L+/bkX6RzNLthwbJsnPaBW1N7NW 1+vXqQUFVgiuHVFxlCQiyNeNZiR/5ta5xo4jYS97Wi1Df70IRa4tYjqidU90lECjfvZz20+ybNi cf5Ny6ZB9u3ZhTvKKRMB7T/wiRqxtxKmr7Ai3Ab9dAw== X-Received: by 2002:a05:622a:48a:b0:530:4ed:c251 with SMTP id d75a77b69052e-53004edc327mr39475631cf.12.1788086034222; Sun, 30 Aug 2026 03:33:54 -0700 (PDT) X-Received: by 2002:a05:622a:48a:b0:530:4ed:c251 with SMTP id d75a77b69052e-53004edc327mr39475241cf.12.1788086033785; Sun, 30 Aug 2026 03:33:53 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:53 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:29 -0400 Subject: [PATCH 7/8] arm64: mte: pass the swap entry to mte_save_tags() 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: <20260830-folio_swap_entry-v1-7-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=2617; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=8STOz0RYKi+7v+knfY76tg8bbf4f7uqOVYm5Jf2KOls=; b=DZ1RAcNFd2t3tiLlyqIoCis24ccxkX5i8IRMFWWWvBGYd/Bq0q/3TDIYxtAmdd4DXmVWWJweQ rUY0XsF3guHDHQMeLSpYerreROURlWUbDCXQd6WCqK9O6SjIYu4z8Jv X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfXz1oKYof4XNNB TJcGsXpX7zFEUCvNSPb7+TvypxOg5e4JlhBORppod3MAGXOoFhcG3/gFZkS0/l0cTdbDXVBDQSg Mf6H9kI1jyGHNbswnX61IPCy67mKwDohFs/bYiPCqO9MK76JvoD8b24SZdNNAbPzp8QyvHf0Yt0 IeAqjVJc8+gqdJlTgZm/WgjDp0kXoyR5YlNOiID0CyzefahU31vedxiiudotudicpiVlXh77YgQ U0TlKH/RlVB35wKeHIUBusgURZXXhJhIYcs51K+sDHtn5VodbYaA+NYISEJRjlORXQYO+nCH8E3 pxP5yViVOECLP+S9OqVCClSbz6PgrD+QciSpp8PgJ5ynhwWT1u4sprSEjIOcSOSeTab56Jcye1v cInjqU0lpi6FoniYZHSwp2ufRtulFr6IIRqFneBVrjcIOpj1rqrn9YMKNFKprMDyCppnkkC2SL/ bGsB/8ncaeXh2fwOtfg== X-Authority-Analysis: v=2.4 cv=EtbiaycA c=1 sm=1 tr=0 ts=6a940712 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=QOCMdifcju39GKoXhKua:22 a=p1CcqGZxNqfKctaSDs4A:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX/Tha3y3AqBRZ NZjITlzZ5e2hlPJj6r4SrYGPMzIWj5uzdVzqELAyT94olFnNqNWjWmRbH/xygW/g7YVY//LNxHb ho74sSfq/eXS9ffHkzCUoJcAZAtYNGDgmpNUH8iLOEe5PVg6hNeu X-Proofpoint-ORIG-GUID: 60Gyz8AJnsKi_faEuW7ZWpsqeRTFRjJ0 X-Proofpoint-GUID: 60Gyz8AJnsKi_faEuW7ZWpsqeRTFRjJ0 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 adultscore=0 lowpriorityscore=10 spamscore=0 clxscore=1015 impostorscore=10 phishscore=0 bulkscore=10 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 arch_prepare_to_swap() derives a page from the folio only for mte_save_tags() to recompute the folio's swap entry from that page. Pass the entry in directly with folio_swap_entry(), matching mte_restore_tags(), and move the page_mte_tagged() check into the caller so we only compute the entry for tagged pages. __mte_invalidate_tags() loses its only user, so remove it and call mte_invalidate_tags() directly in the error path. This removes two calls to compound_head(). No functional change. Signed-off-by: Tal Zussman --- arch/arm64/mm/mteswap.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/arch/arm64/mm/mteswap.c b/arch/arm64/mm/mteswap.c index 3c54afc8b758..f64202b69309 100644 --- a/arch/arm64/mm/mteswap.c +++ b/arch/arm64/mm/mteswap.c @@ -20,22 +20,17 @@ void mte_free_tag_storage(char *storage) kfree(storage); } =20 -static int mte_save_tags(struct page *page) +static int mte_save_tags(swp_entry_t entry, struct page *page) { void *tag_storage, *ret; =20 - if (!page_mte_tagged(page)) - return 0; - tag_storage =3D mte_allocate_tag_storage(); if (!tag_storage) return -ENOMEM; =20 mte_save_page_tags(page_address(page), tag_storage); =20 - /* lookup the swap entry.val from the page */ - ret =3D xa_store(&mte_pages, page_swap_entry(page).val, tag_storage, - GFP_KERNEL); + ret =3D xa_store(&mte_pages, entry.val, tag_storage, GFP_KERNEL); if (WARN(xa_is_err(ret), "Failed to store MTE tags")) { mte_free_tag_storage(tag_storage); return xa_err(ret); @@ -68,13 +63,6 @@ void mte_invalidate_tags(int type, pgoff_t offset) mte_free_tag_storage(tags); } =20 -static inline void __mte_invalidate_tags(struct page *page) -{ - swp_entry_t entry =3D page_swap_entry(page); - - mte_invalidate_tags(swp_type(entry), swp_offset(entry)); -} - void mte_invalidate_tags_area(int type) { swp_entry_t entry =3D swp_entry(type, 0); @@ -102,15 +90,23 @@ int arch_prepare_to_swap(struct folio *folio) nr =3D folio_nr_pages(folio); =20 for (i =3D 0; i < nr; i++) { - err =3D mte_save_tags(folio_page(folio, i)); + struct page *page =3D folio_page(folio, i); + + if (!page_mte_tagged(page)) + continue; + + err =3D mte_save_tags(folio_swap_entry(folio, i), page); if (err) goto out; } return 0; =20 out: - while (i--) - __mte_invalidate_tags(folio_page(folio, i)); + while (i--) { + swp_entry_t swap =3D folio_swap_entry(folio, i); + + mte_invalidate_tags(swp_type(swap), swp_offset(swap)); + } return err; } =20 --=20 2.39.5 From nobody Sat Sep 26 21:15:00 2026 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11B992F7EE1 for ; Sun, 30 Aug 2026 10:34:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086042; cv=none; b=OJntqtJa6DdTeulLRnw5wDujWrQy6HLlL+kefvRG94Pqu9Dildu8bNvgFfPvuxPQ/Do7/dQV/8XQAPJHj8R3AkKqsFeRBV0y6phHuWYFxP4sUL+o5LO14B2RkYrDam3d323JHilwdcSOVWbLtS4WkXnt0hXV9EosYXixk4awH0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788086042; c=relaxed/simple; bh=I6pqPB1rjj1dnKeDegsZzTB+MKdm/VicYFt2MhO9II4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mpLOoah9ZEsRhbBD3QJbxMERjx1/1VNaIzSCMVQxESvXm9NPSNXEKD9UEZMHwBgd3kqI6MKgEUPCfUf24tRR5oOvpueu+OSYp6IPPsncTd2qWVrbHZcZaSSi3wXhXQjwkIiGuUOHKMVLUwgOOHxJ/oRAHtjE15H0YwqJghJVBIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=IXoUJkw9; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=ZlHTNcX+; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="IXoUJkw9"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="ZlHTNcX+" Received: from pps.filterd (m0499198.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67U9X3Hg3653484 for ; Sun, 30 Aug 2026 06:34:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=4LuS 1cAhpHN/002NExYW8l/WUkJ7AVF4N4va/1EdeIs=; b=IXoUJkw96fCN/XyjcqpD 491pbwuYBSKoPTLPSK88jTx3wDc5f/avjj6UkJfc2RY+eAXpwwyQuVm/CNMHtJdt I3SGbEttZPJWlVAnQWpY8RBO1G/772+Ed/ktdidamMf2U2YuNV3v0kbAutlecFIu yV8AtPLAInDKxKKEMzKIOOeDNBNK7ebrtoPtSTWSYh4POq4ZQLtWI41ynENlkyQ7 dMv3OQiPLdifw0uCkTh3pu3fjZHNkKI0nHzp+Nola8S3JI3V6OUphApb6lrpoNyu o6WA83hKxfObfo6DkAA0GfmTq6W87hHfksB9szLRudRNySij2TovNephxdQ9gyAc fQ== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gcgdtg994-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 30 Aug 2026 06:33:59 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52fb8f67601so31888351cf.3 for ; Sun, 30 Aug 2026 03:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788086039; x=1788690839; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4LuS1cAhpHN/002NExYW8l/WUkJ7AVF4N4va/1EdeIs=; b=ZlHTNcX+pc9HaSD5mKOJpBap0KQ+Y2zcb5fNTe1yoWsQjF3LX6JTU94RMRMZZzvRen TNEaCJOoMQqgAl2UNGTOuehxuDVpar7vve1yuA7IfRtCyTgCP3pVHlmjT4d0o5CYhQWz dDumBN/zXUisn9qXmrYJ8v0+rlxW9anaATCtyphVBv8NJXXaI/6+xt3uaJ9QbK0qSGWr pvZKSlia4eeJ5gNClDPdJWAjlUWs4VRc6Vy7tfUoBTOAzo1K7+xiY91AMVw8A7RXfivu 8Ih0AClPs733zoAZVWhWmCuok3v1E3edwSUplYYu4ZM5sU4xsLGyaQPddjJB4R8VG58k Lczg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788086039; x=1788690839; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4LuS1cAhpHN/002NExYW8l/WUkJ7AVF4N4va/1EdeIs=; b=lHz67jQTeAPwXQXb/7BLkipExa81HabaT/8zzBqblrn771ltrL4/4U6kj1x4jB7e8I YaEJcivLA9Ji0o6tKnvBLn4bufCn7WiQ+JsiJbXkBZbqhGwQ+BEjEluMZf3Auun8DqY4 COdkzX+o00rUMpvsc6COBC3euYlEio1yAsB7BHLFc4keHJ667U9HbXkrBYpb6NzAw5kJ gunPz7lzNO/rKtpTQa9w++bUu/1JowFvzqgR754vVZOOtVav0+LQ0LYi+2K8Iz1Grjqq 0r3VSBoTqVTOsIr1ym4iYjl8U9OuGnN5jersSvXFvKfMme8KJtKA+BFmB5qt4k2QTzve puqQ== X-Forwarded-Encrypted: i=1; AHgh+RpCdbZahD6aZKITkEFhkyopAdQBG2D4OU+lOFRVH6FijM+3MZdAnEvypnMzeYG330ylJu7LmqTAjE3mvYk=@vger.kernel.org X-Gm-Message-State: AFuF++mZCT5DuJJ2LVlPnuZwo3k6f0ENko4JDKrWb9dIoP4+8oT7lae3 DObFRz7TQy2hkXKk25KqJ2QyATRP2Sf+A5c+X/GIrmuwKmNYIC1ttiOF0sstcn5S3CvEJEWE5fi PEgmpS3mHJW+79BYUxCHGVHXP3GC6p23BYuQvCGmq9WVocvZ2LORujr1GDRiBWg== X-Gm-Gg: AR+sD13GaxpYhwZvIhiBIIxwLvGOPnjaCMSRRXRNVL7uLMp6wNftDa+4Kv0ewfUNfTz mzLsQVcAT7uDy5FC4BMaSQqENwyuokWa3/yivu/QSJp9E+ZTl4PE2k1jUx2xRt/67dB9BtGRkeM hoAWdpV/YVsE/6Ei6fEcQ0lyUsK3+Nul2e6vzb3kNijdGv849OOJnPkFZvHdsUhClHYFpuclpRu 7nYjDvvvNXvCJmvGLgFrqpWZPsav7Jh8K+YWZjvkrgpJXGMyvG85NhDdyFcUoSCnzXLbInG2N31 TnlNPd5f99Hx2SVhEz6gv8gI2vTU0XCItV6bxMzPJ0XXBGWTDXZsd2kgeD6LMtPYAYNMmv8hqQm lU8/X+Z6z+Vr9vhekWSvekKpVBKCrk10DkW8vgvCEzQ== X-Received: by 2002:a05:622a:1f95:b0:52d:ea18:a9c with SMTP id d75a77b69052e-52fb96ae584mr248428311cf.34.1788086039174; Sun, 30 Aug 2026 03:33:59 -0700 (PDT) X-Received: by 2002:a05:622a:1f95:b0:52d:ea18:a9c with SMTP id d75a77b69052e-52fb96ae584mr248427871cf.34.1788086038722; Sun, 30 Aug 2026 03:33:58 -0700 (PDT) Received: from [127.0.1.1] (bzq-79-179-7-133.red.bezeqint.net. [79.179.7.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ccf5a580esm69304005e9.3.2026.08.30.03.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2026 03:33:57 -0700 (PDT) From: Tal Zussman Date: Sun, 30 Aug 2026 06:32:30 -0400 Subject: [PATCH 8/8] mm/swap: remove page_swap_entry() 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: <20260830-folio_swap_entry-v1-8-7786b52acbc8@columbia.edu> References: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> In-Reply-To: <20260830-folio_swap_entry-v1-0-7786b52acbc8@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Lance Yang , Usama Arif , Kiryl Shutsemau , Lorenzo Stoakes , Rik van Riel , Vlastimil Babka , Harry Yoo , Jann Horn , Johannes Weiner , Yosry Ahmed , Chengming Zhou , Catalin Marinas , Will Deacon , Mark Rutland Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788085997; l=860; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=I6pqPB1rjj1dnKeDegsZzTB+MKdm/VicYFt2MhO9II4=; b=c1jy1sFkrBpeZiQjHJklG3Cc9bw220ASIOw8htXuLhr6GFpKtinuTg02ps2C0CsMWWqMiNTgv qRxm8iGyx/jCCuJf20TtrXph9N7ANFUH4+EmKzwECevAXN+hQ/31BDF X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX6EZnl0UGlduK jqjNRjiKxFQhWOoFuFmgVv7ryMfOvTNFG6k83Z9txqyBgCjYfBL2y7gX+s/z29gfc9fTii8C9tp qvwQJj0Vh4I3jTcdLFC++/syQAF6Pn7k0oposbkG4YG0AAcdyOxVJdrEgaEIlDnu4Js6MA5a5G7 YXxDGB8qmtWUoM+djH6lXKlfKecfVwqyjIMT0AlFGkZsmmTWFSOlm/29DFLDXaHLPrL8Ul26LED 1RlY+OkGgmVV2kJQyj80Uc0ZYFDuXJUv0lcNEnFxmGKHn9jId87Kn31C/TZZhoocEr9K/gZ96yG wp/28g2T7TJ4DeD+lx6sJXb44+HCspJcaBWp0xN4T8UCWzXGU+0eSqdErowawYWX8R4Yj7eaFWr I/O8dxNc7oouHsHIMSW+WnYYzqZ4y0VIETnkoB2IZcRqh0YllrfBILR+OJhi10y1WntSmoM07f5 DXoDCbxRQRbOwK7uhcA== X-Proofpoint-Spam-Info: AW1haW4tMjYwODMwMDA4OCBTYWx0ZWRfX9x++68l+48ll B2qohpBp8afRNVYSHUPRPGzabpd52ZzT1fU5PpkFZVCfi/5PJN/wPRJbigPxZ8f9sOdeHK7nCw+ 8npdipd8gAe0H4jitztqGthsQylOxST4X5fEqX23yjjWZQV2AOdJ X-Proofpoint-GUID: TdS--UoIZScUpLPcQHqS6lr4FXIuk8DR X-Authority-Analysis: v=2.4 cv=ZKXnX37b c=1 sm=1 tr=0 ts=6a940717 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=BpGzv1V74M3SfeTrGa8v:22 a=t2YXVXqu3yB8mPBWm3YA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-ORIG-GUID: TdS--UoIZScUpLPcQHqS6lr4FXIuk8DR X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 bulkscore=10 priorityscore=1501 malwarescore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=10 impostorscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608300088 All callers have been converted to folio_swap_entry() and folio_page_swap_entry(), so remove it. Signed-off-by: Tal Zussman --- include/linux/swap.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 48632aacbc2a..2fa436958fdb 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -311,15 +311,6 @@ static inline swp_entry_t folio_page_swap_entry(const = struct folio *folio, return folio_swap_entry(folio, folio_page_idx(folio, page)); } =20 -static inline swp_entry_t page_swap_entry(struct page *page) -{ - struct folio *folio =3D page_folio(page); - swp_entry_t entry =3D folio->swap; - - entry.val +=3D folio_page_idx(folio, page); - return entry; -} - /* linux/mm/page_alloc.c */ extern unsigned long totalreserve_pages; =20 --=20 2.39.5