From nobody Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 0071655D866 for ; Tue, 8 Sep 2026 15:16:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880620; cv=none; b=jxNWOY/Yxy7Hyqq/aqmckthQpE8giSxu2OklDwxFQL60kfORNbVyoEBIdK0+CsBA1DV/DMoaovuVPsqcub3ajsOuSMkV+cZJ0c/gEFJ5cQBOdUzKaG4/vV4c7GhbFq40uur21vhwgIc1YaNbaSJMVqDyQGpSBo7ZLSTpJN5ZRUg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880620; c=relaxed/simple; bh=1JS3V+JXyWaTrz9bNNi6UKDOHKnZIpXXTUnttstZ0Is=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KnHiAcsFKO5mWZ4tjv3NPPsepbBVSKPAzupg/WC2YYNdlg3WxmLnFP2wg5Li5Ifqgdlwv7I1iAwgHxEBTxSYPWq+bNFcGtv43sxw9eiA2rzmc7b8KuHOjlsMWYIcUyiP8GaBaINgZwfSaQFyVtc9erm/BKAeU5fK2slbEloK0Jg= 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=pi2SEGTT; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=n/2W8q9L; arc=none smtp.client-ip=148.163.135.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="pi2SEGTT"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="n/2W8q9L" Received: from pps.filterd (m0167071.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYoTd2420732 for ; Tue, 8 Sep 2026 11:16:45 -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=jZDB ZEDHHg8SYIZt8YZAuqtQEWKDYqBFdIUGpOfM1ng=; b=pi2SEGTTQ3BGzxs7ah1L v2Q4FGn8fd1y6BTX/hVySPBNMfu34Pyg5I6AczMna0PydZJ4KnwOJSdvqZFzekd6 LR1vfVFEhSaCiJc6KFf59RB8DZnxJnp2yE8cxGnja/jLGmZGR82PEtLSZyvTL0og 5lFxuBd1ByPKYHK6FuUe393kiyB7OUywBvAWrXvCdA4BVroFPPdubZLE0iaSr0cX dlw6PArfthab3j8BNdMqq5hChipn6lO821E5zA1Zs3h9gTXGv+hrurQtCoTRmtFa FGLYkf7t9pGA0/C4o/xGnblYVaoStnvEy3iQ3LpScPxzsOzwtbeeiLQzcFejHqx+ Cw== Received: from mail-yx1-f69.google.com (mail-yx1-f69.google.com [74.125.224.69]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj4d5d7r7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:44 -0400 (EDT) Received: by mail-yx1-f69.google.com with SMTP id 956f58d0204a3-670ff598ac6so1050126d50.1 for ; Tue, 08 Sep 2026 08:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880604; x=1789485404; 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=jZDBZEDHHg8SYIZt8YZAuqtQEWKDYqBFdIUGpOfM1ng=; b=n/2W8q9LgoQLAtB0Wj3P8iToel6qaCZ15fzCqC5VSeSm7EmFX7q5ZoziigRLZqcl2Q xgsqOEe81MlZ+L163OnXUFq8ANa/sI+k+RfYRLwjFZtglA+A1eO0o2zIwMmeyhz5b0hh fdv/GSKP+sAggbbH5WpOU8LPpL7yspfCRGdicUeJUsn0JEeQvNJYaHyADzbDrpFdemDb 1MzjsKlUOYjtZIj2G7/pHMC27lXQUh3PqFMprxFEaIOcxF0OC3MY3IJoAjkfwM4mEJnS c7FPwkOs6pEgj3x+JoMkfmVQHxlUJRFd4IPYAwkuTvAWQ7X1zN5JYV9ZmQodBLqntwBt cHpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880604; x=1789485404; 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=jZDBZEDHHg8SYIZt8YZAuqtQEWKDYqBFdIUGpOfM1ng=; b=R9BxzpnbIcvwBN2up/p3dMwcyl4UWrL07f9VZ2iQzMDnzBMZnwC+o6NgnSuEozptQU OG++Ffd59u62uyTxtGC4H6KVYueOmVhWLt50DA6/Ruqu4r7ZBcZY7TOMcL+F3dsayGcl J6h042GyQ+Ob/TaVSrphTS/WmuCMG5h3K3LZmCGJJrH1iZfLWD85yJFELK2IKXG0tJwo mB5GrQWo9knZz9j16WHGLFpn3DgJ4ju8HeKoH75pC6BGwzMDU7SUomnqkbAI/9ZDiiYH J/heiTen45vNtmZpnPzletebYkNTrEp0xs+XjVywEluKRwy3GlG5U1k5pAGZae6MOIlm DytA== X-Forwarded-Encrypted: i=1; AKwUvBzic8MiFLvosWDv4+9C3PYklB9mNK1cBXxGHNQRBNEtZeHiZ1xGjOlOHVJf9BIKDh041aju/hyuKWG8CNI=@vger.kernel.org X-Gm-Message-State: AFuF++n73aOzXCZbeZcuTQDbNcSekWDflZ13nEF+zdeOVyDhtTkxsM6R NhTrQmnJxCSr0aFB7Gmv+Uh/a5wZCh9DAM3cpJ3nArAcB/ONImXcgCX187SrryH8M+W6sbQMu6/ 1ev4yuGrEjXlo1cB8lqpikXaXAhrH4T4bFC53ZgbQxKmfRDM//6ScfxlP8fGhdw== X-Gm-Gg: AYBFou0WXJZezZnbCWPtt6IdcnN7bjf4IDuVgI/2F6u7CvQ5qnE398WyVNr4pY5yv++ jiWXBhKu2UDehBj9Gf1A9+Nc/GIycGEWXYAQV6TcohZoGUSR1LyzzGi4GdhfqgNh9WT8AWu9c8h O26uRK1kGg3eCOCiqbvXLdQpjNIjof8P9U+2/OlzCp0/7ReZ4jDtHlMjprLsLrMhxR8JMvzxdQd Y+4JOidiNNG7Zov6/xn5UYZ019JW1zAxN05emBT+FWGQgNv0fYtgHNOwThzIsrC5YpUZZupyo9h sHx56GLVg+8bXm7ezubOP01m5Vem/ZXyzPWqbnBxoUA43R3TqXZd7u740FSTipk5tMX8lmvgwc1 VlNEwPDqpxp8MVoiQ1VKoS5TCToOnojDg8HJx46M/4MybUrDwrLDQvw== X-Received: by 2002:a53:a0c7:0:b0:66f:c1bc:87ed with SMTP id 956f58d0204a3-66fc1bc8c18mr5315781d50.70.1788880603807; Tue, 08 Sep 2026 08:16:43 -0700 (PDT) X-Received: by 2002:a53:a0c7:0:b0:66f:c1bc:87ed with SMTP id 956f58d0204a3-66fc1bc8c18mr5315741d50.70.1788880603125; Tue, 08 Sep 2026 08:16:43 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:42 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:31 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-1-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=2036; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=1JS3V+JXyWaTrz9bNNi6UKDOHKnZIpXXTUnttstZ0Is=; b=w9CAxnD5RZ/nskXa7WUspsk5TqZ4u0clJSlm+62svGyMiXevHQW2C9NobE10fXR3pxRsqiJna uE3QKWw5vWDAR4klvdmTEM6ALzGzAN5N5NtTGukn08tXaIj2hcLErkj X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXzWFcAfXlIyRu 9ehCR24t1FcWvNCON9iXoICL62r+PHyGEzFWhMymfLuyfDBLOEckp74/lhEk5i34iDx/0P8S7C1 trFfbaz+w7m0WaI/OrT2O88OoxxeJkfen/CL54Fx6+rG2aL5OsV5K76mS9qFnf3HvfM5O0tJG4A Q2a9kd0hQRCId1WtWiw1Du7GtstsgAwD0erqQyQo0mmq8l9SJZz6hhlD3Q88O7e1pqPr1R6uw3g s0OGgyjV7kVOWowDP7skZu6D4SWVTH8jH4lROdpQp3uuKoZ1GVzBU4VZoFBL9Jxd0aA0xb59sdj woClT8Mh/NhNq8tnys1u8AlaPE/8Zf4oVzSzXP2tvqgobvGS6Bkihbcz37rnHVLAZR+6SJRb/33 tkY5QJ5j76/2qrBaefmrVfA1IOT2uTsmRi6pujenMXQiXsz/HyzvPxiG9/GEcZb4rp0hwWrq+f2 O8vEf+gT1MP9thCDZGw== X-Proofpoint-ORIG-GUID: yjjlI7xAq8nNMkZfgd41wQgxV8n_sd0G X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX9VOHatqTCeno BxrzzSSul5pmRdmkWTkaMnhK4vAg2j/+lQRYtvzHDhQy8e38y3lkoDLQItU2QOUJa8dB1wgm9At gygkITFcbSt+DIQdXePWOOkmTF6OApXAHlYEFNXAR4Xm4zZ0O8Zr X-Proofpoint-GUID: yjjlI7xAq8nNMkZfgd41wQgxV8n_sd0G X-Authority-Analysis: v=2.4 cv=BqCtB4X5 c=1 sm=1 tr=0 ts=6aa026dc cx=c_pps a=J+5FMm3BkXb42VdG8aMU9w==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=79PYxaXUQd1wl-QFWJnA:22 a=wCX1QjJdxvQAooojgaYA:9 a=QEXdDO2ut3YA:10 a=Epx66wHExT0cjJnnR-oj:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0 impostorscore=10 lowpriorityscore=10 priorityscore=1501 clxscore=1015 bulkscore=10 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 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 Acked-by: David Hildenbrand (Arm) --- include/linux/swap.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/linux/swap.h b/include/linux/swap.h index fc290e29e4a9..1d979e76e78a 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -272,6 +272,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 Fri Sep 25 20:54:19 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 164BE54A7D2 for ; Tue, 8 Sep 2026 15:16: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=1788880620; cv=none; b=P3zdhv10Dty6Nk/zB9mVW2A9fQYDLQiSpiOm5iM7o++JlGhyJGxuWM3aE2UKCcPKCU86SX42L95i1P/S6w5bcVF3ysM6asAFmlPXDMDL0Z3jlfZwdjnqSnOdvGWRzI8C1giwFCZhsGRzT4jZ0S0pVkoPSKs0oq0TGwnSHPIz7Qo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880620; c=relaxed/simple; bh=X5qbXzCaQfbIvXd5MmRhi5GzAdDclgePXL2NiDB48ac=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pbhLJ+ugzANFX8IjjCV9Xnzpg1FugjmH5LLTgYA3HF5USVgaA2ycv92JGDovg/kvpkCXprynVV/IWMSWRwr2WzCogQVvP0bAn+GU0NloEcrn4zL0wkmTSbgcjV3aEMcH5b+yKXUcYGpSoejqJ46hzfBgPinfgqD4seuhHyIL/Zk= 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=hR3yQeBX; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=K9UHFZ0Q; 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="hR3yQeBX"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="K9UHFZ0Q" 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 688EYsnr1784898 for ; Tue, 8 Sep 2026 11:16:45 -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=Gj5Z p+Hf7hb0eLuXb3JsQ3zN3lqZPzkqR65AkPfI+wc=; b=hR3yQeBXVrib9uXqGBgE H+c2oLr8jUTZ9b2pEsceow1ABxwqElSCI04sTB8TlbgrM+7UC86an1Gd7k8dRpF1 3kydobGuJMXRBbQE0W088avJtKol4lLVulTgqIU0KELr/9m9qVAoOjhqgEJ1CkXE I25YQfg5JAiAOiUBcHZVaYj8qfB2NSRdMTe/nogjtExXhsEwqRErhS9UpGEXiDBT /uB664pRcO2HyoPP3nHpuuuOwwtbSk+vKCT02aD+pNvl/1oOtGaCTws+XEk8bDng NCg8Y+fp9biK5pMXEtZ/iUvLFQvJia1jTJzmwPPEeweN7bpZM5F+9hznMepTvTyV Aw== Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4gjjjdswf3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:45 -0400 (EDT) Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-8563c2a53dbso87336787b3.2 for ; Tue, 08 Sep 2026 08:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880605; x=1789485405; 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=Gj5Zp+Hf7hb0eLuXb3JsQ3zN3lqZPzkqR65AkPfI+wc=; b=K9UHFZ0QsGcPQn/42ucRnmRFCx6yiralpYx1EqLTqIgg0tNNkPC3m+Y13jBjUiI1K5 RnKX394xDr1ioArjjivlUvkGggzQ7Ol082KS4saEW3K3P5/OjJAhNuAj05JhqJ235PpY igVpHkxNqbjo+A//4H1VngWD3Et/h+J6Jk33qq5E/zhOYMo2sTCOzDfhcwduQY5ZLafl zys8ZLOLU+i95DaPSk88HkFtlZcQYJV9gsfHIEeNola1nNPAIXfHE7/BfCu2heKynCrR ibO6kIdj44+hoyvdeAayHcm/b9CJa1w+unBGEzHhs/zJbZ54Qh5iE3gPiw0oBSvJ6sjp hdcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880605; x=1789485405; 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=Gj5Zp+Hf7hb0eLuXb3JsQ3zN3lqZPzkqR65AkPfI+wc=; b=gEfWuHjO5D4eXwtgImFA9wGqnQZcYgumTyXmgV6RQ6c/UK6/Cnc5xiMyPLPzZmDICS ROeZr82z9aifexIkFitFBnSkTvcTB9kKzEiNL1EEAtkgbIbHNQmf/pV1fKvzq/LdI6jn TVf7vzBMdcw9FFW+OkQZIOUboNDSjv+04kgMl5tUlja+YFM77EarwaGPZLf9MhidfJD5 iNVC9dBnc6RI6dDEJC0cwF8vBprLmkEaKQ+O3JN5Vsm+hEi7r1c/UdtYjAUkzia3Fo0Y ODOzaB5MY0FUAnHQCamZHS38H7N0/t5566dDSrfe4p3NRJ7tdILbfzktRtcckDR0v15n tQZA== X-Forwarded-Encrypted: i=1; AKwUvBzloqniAQquiogobMd8x4OOyjWrq/dyVqPLSZw/tpk8dOqcOmbh/LHggbpUA7yP7+b7Jo/4ulIwGxUPe9U=@vger.kernel.org X-Gm-Message-State: AFuF++lwJfryVGNFr4hjzIdX2iRbX91LKR73kbOw+8hEq5Tji811sAh7 1ljcP3cajFgwSSXSfVJXcPVMcoan4QxabpPDS/Fj1P/16ZWtD861CYk8VMIoRq+5kn9cXIVxQyK PHZGf4qpztF8sQqkvQtVp4kjOhcJqU9NH3Jf94TdhgPqlhyZG1JaX+4WV27toUA== X-Gm-Gg: AYBFou12eUG/PuAXKyaTQBSX/JWgmSmWFxqH/Hd4K0qvSPKaErBQjALnBYs6KqQORGO IsP9lAxGch0fZyEVvqVQZ920IDYlvb1bwRZ9QS6IOWX8cTnytaniDs1ydov84CJ3Eq+pDrfc+cf mqPT+8fc2UbgvBNCmq9rnQkxDUyOujz6yqU5kUFgM+xzgfHDJYFituyeu8Eapy2o5BXnlU0GSlV FDzcuoVQ5TSnBCiCy6EjGsZIBAOud2Miqy0qDETVlblGdDtzY+rPn2q8Mge55d+BKfmuVFS5ltN ATKJweXGb7Y/9wkAGJduYiV76H6kkgdOpSjDD2uym8VkSZpVCxvUBv44ZGXrpbNyNQ2QXG7tjPx s5io36uQqqMjotGpnT72SVOKXZ7Eqcjdql4d4viZFWR8JSfkwYJi2JQ== X-Received: by 2002:a05:690c:7:b0:861:a2ae:8c31 with SMTP id 00721157ae682-87127848ae6mr116780417b3.29.1788880605020; Tue, 08 Sep 2026 08:16:45 -0700 (PDT) X-Received: by 2002:a05:690c:7:b0:861:a2ae:8c31 with SMTP id 00721157ae682-87127848ae6mr116779827b3.29.1788880604485; Tue, 08 Sep 2026 08:16:44 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:43 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:32 -0400 Subject: [PATCH v2 2/8] mm/huge_memory: add a comment to the open-coded 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: <20260908-folio_swap_entry-v2-2-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=906; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=X5qbXzCaQfbIvXd5MmRhi5GzAdDclgePXL2NiDB48ac=; b=uK0LERQcpXKQIHl4Fe0BtkcAaSCmFGqTL2NMvbL1j3TixZ7N83u2P8Bs4llT2jpLvN+8PYknZ j48zbH4MSCgB0VdKnnVQAwjEV5D1CfGWlm+Wjq24m4M0lO/kE4WpYYk X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-ORIG-GUID: SmBOgTfBHj3sESCLDOVZnU6MmdyjSWBl X-Authority-Analysis: v=2.4 cv=eszvCIpX c=1 sm=1 tr=0 ts=6aa026dd cx=c_pps a=NMvoxGxYzVyQPkMeJjVPKg==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=BpGzv1V74M3SfeTrGa8v:22 a=uQMuDZbhYfZjsEHDzQ4A:9 a=QEXdDO2ut3YA:10 a=kLokIza1BN8a-hAJ3hfR:22 X-Proofpoint-GUID: SmBOgTfBHj3sESCLDOVZnU6MmdyjSWBl X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX+xi7s+W+T1EF 3jEZ1MNkNAa01Glb/TiWq9rwgoowabap3ZiitXTI3/HEKIVsr4fYAzSdDILxfo6DA3JXkwNnUS6 wG52ojOZLmZ8JGWDmM8EMcWE0QcLQu4zm5vRPbjKRsn0sdN8muid X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX8BKWK/EKcgJI T164xqHacbHIGMmWKSKamd/ydqbGV6s0dWYhCEMuGjW9a8pKj5Ph+zv4EB2J708CEmW20/yS53K KXmISItkOjRkKKcUVPwcdjCgyIiRd5fAyOEX5tlQfqSWDgbZH3DuZrwE2ro1Ni/Tm9DCm/qHxu1 Wm+JNJwPfwA1HMVT9NiqnEuoIfUUmM1zm+XcRG15tLm0GG+Drf7uP1jdACCgbxg6zKhW5oKTDb9 nKBa+tC3+LuliT0KpCxo41eSST3PR/EwNzOw+TMVyDl74ItSrfeaULIF5Hzu8kOrOK+TPXDhAR0 Squ/6hJ4tr0ENTJ6XSbBe10WSyB1sy/NE/o4biHt3L9cIZFEyUZo1G1ZOoKWKV6jWcYCyqH8+A6 UVPQPRQWrCXhKlSMZbgEZDRYt0z8b1fCoGfO/H1fIb7Z+XXvUNklmbnsqosqMdPmIoo0d25r0xt 3mBytH3U7qANCsFZ99w== X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=10 spamscore=0 adultscore=0 phishscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 bulkscore=10 impostorscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 The swap entry of each new folio in __split_folio_to_order() is computed by hand from folio->swap rather than with folio_swap_entry(), because the folio's page count is not valid while it is being split. Add a comment explaining this. Signed-off-by: Tal Zussman Acked-by: David Hildenbrand (Arm) Reviewed-by: Zi Yan --- mm/huge_memory.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d1ce061601bc..1fabdcbd8c8f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3763,6 +3763,10 @@ static void __split_folio_to_order(struct folio *fol= io, int old_order, */ VM_WARN_ON_ONCE_PAGE(new_folio->private, new_head); =20 + /* + * Not all folio fields are valid during a split, so open-code + * the swap entry rather than using folio_swap_entry(). + */ if (folio_test_swapcache(folio)) new_folio->swap.val =3D folio->swap.val + i; =20 --=20 2.39.5 From nobody Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 8F98D2D9ECB for ; Tue, 8 Sep 2026 15:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880629; cv=none; b=VTlG7njLxbOUReG3gIZuRt911x71Mkoe6sh/eWWFlodlGZwPN0rWtj7VhYjgT6xMYpVMATY7wfWU3tDpzukC1Z8OMTI9SN3CMg3yjilMuOjxHufTRLHwRG6AxbMPDTPKxwgAB2N3kYg373W0JM4Ho/fiRAOhT9bRbTOZwf0j8wY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880629; c=relaxed/simple; bh=yvkP2mDf2z80hosg9Pmvfjl+tEpO2wMDimHyUBJdJvM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MRYUhTAkV/xHN6jzo8QwZTGd1wxYgc1XbjYPDXdu+RWrMAkNhfRCw5i0Hk/vTUtr5AANMzOl+GGtxJkTJIZS0oUEMr316DabiyrZY5xtk31nmowM7LeksSSjSxiBQeiJc8m1x+d822dol//F6rItgLiw4QpgqGQaMAaAX0mjEJc= 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=EhIGSTan; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=TvuYdDQv; arc=none smtp.client-ip=148.163.135.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="EhIGSTan"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="TvuYdDQv" Received: from pps.filterd (m0167070.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYoF8900158 for ; Tue, 8 Sep 2026 11:16: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=0W1L z/54tGMWp2hamaCENav3d3oGjbDnHiZEdOsJjcE=; b=EhIGSTan304r/fde464/ /uPwl9N/ujQitXaTUybYajUJSVwBUeh7Dvfl3s/Lxxsyz79+AqWxNHzOtJEJozOZ DzcidU8D3aVkVnIEDxjSOIlv/W2MLB5yAvskFAbvqNaBQq7ytqx+vcBpIMQH1kRs i9UpcJfeqTwWEeUHaceEw5SG2C8v8c4JpdpKY+xg6v9lEHoQpZvJnz3y+JZw+Y04 do1YsxzqLKRoGEUy4Tqtm1JkiuzlAZNIjSuVANTpTqy9+4yJc9jSyAU0u1cbj4SC tG0VxCY7W8CsO7SvuekZNMj+DA/qjm7X+gIT8i5/ajNDVe3GMzVecaso317KvYMo 7Q== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj4ykw1hs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:47 -0400 (EDT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-9104215fbdbso113144946d6.0 for ; Tue, 08 Sep 2026 08:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880606; x=1789485406; 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=0W1Lz/54tGMWp2hamaCENav3d3oGjbDnHiZEdOsJjcE=; b=TvuYdDQv7Y8TQJ3rXu06uO8orhusFAd5ldyiOH9qbx0jy0HkcDJmhPWLcvJ1iJMy5J WsYGypPrX++EzVaZ3IQwHRPpdgmo29PVdI9MxSDh0oneaKz/XPvNWCc7w320PXDZBLmj 8ghxZtwT80mA4W9/k6+TrBUno678HPdmswX/oXd0Mmi0cwRWJssaFO2/f1Uld4eX7QWf s9dQVtQovX5y/tjYQM0WYuXfYptyPonnHKcvl9lSMjVTBTdfVRV7ZOE1BL+b1xHPzoC0 aA+QdhXo1shJWw4x8+jljJMMQWYjkznVTUV/uKk7VWTSV6sX0iNOXA2WeS2V2zeQmsJf xA+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880606; x=1789485406; 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=0W1Lz/54tGMWp2hamaCENav3d3oGjbDnHiZEdOsJjcE=; b=W25MNduPzTqCFQpJ5kOPtUnClxe+i7LrJq+Q6HlnxvEjGPOEGY1AjTjm2NIy5Afb4X 5dwHGU9y7/dlmJuEwhDE0G0TaY2klWQrFFQm0EUhCz1DzArw37336wqDwUPH4MDYv+dZ U39k6VeCk99nVQKjxrjg9E67hZavuVyu0pOjwH4EV/oKb3db9gWbcRmCOOIJ+mrU/v1a ORKvwLmOPSMoFfRuV1RCZNsDNtmkQw3XS378yJagYJMZPaq+a7aRKOk92drDdOv6rM0h EgddnKmnSK8Q2aWhbP21Ke9AL5hnrGfwB1SCr2LJKExHsesv9nsyUxW1G2EPWPtrx+wP QW9w== X-Forwarded-Encrypted: i=1; AKwUvBzVOVHO7LBq7JNA8bMT2Pk2qHjYXANZR5XCvAZ1f+FNbdck5Tyz6moqYTc9E0z132vXWd9ywGvhQOnEmeg=@vger.kernel.org X-Gm-Message-State: AFuF++mvUbg4fcuv7Z1umYH7M+CwevkhSNt/eE0HgmE7t9AlX8MUk5H5 2Nf8vJ3IAyP7smgjVNiZRT5aQROBfLGfUvA45urjXMUY0xZVaHU7RmMFVP7XhRpZLSkx91Z9r2P 9i2vlBNobbOebDFnuaThx4iOr3DHdrSqysECYJbETlA3rJaHwAFL1sH/sIzrNOA== X-Gm-Gg: AYBFou23/FL1XMIwd3aXLHc0vszq0Ayy9tPjeoDcF3MZ/Ma1FUW+qj6BNsaVMs8BFM7 9pdUn8uV+oCs5UDMTjQ/eTw/jvkCPPrLtk23K8xZ/GlrL7r2h9N8GX7Jp1qaVBPQdpQBwB2/urA 1xZpGD1PeCZQhwjAocv9P1XTF6XmgtkBBmz60sf1c03iNydSOx0aR7ZM10qAZjh4oTCD7q0AfYD bV+jX5lBf8uLwRBevald3leZblFB70uYco5zo97NXVOZOyONyuWHbBNX8Aa/rD/qm38/lcmUyTR gJjxzD3BPUXt1IksyVNa2u1fRn6ZerU53+3Fylei12aAwq7G1wgT0IfQVWctrSmlC2pL0rLpa1y B4e5mXLorwArrHHrw8VLn9GeLHPQZc2g04b5FkJBE9oMEtiCRg8KlCQ== X-Received: by 2002:a05:6214:398c:b0:910:3453:5060 with SMTP id 6a1803df08f44-9103f06ffb0mr368498686d6.34.1788880606289; Tue, 08 Sep 2026 08:16:46 -0700 (PDT) X-Received: by 2002:a05:6214:398c:b0:910:3453:5060 with SMTP id 6a1803df08f44-9103f06ffb0mr368498146d6.34.1788880605812; Tue, 08 Sep 2026 08:16:45 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:45 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:33 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-3-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=796; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=yvkP2mDf2z80hosg9Pmvfjl+tEpO2wMDimHyUBJdJvM=; b=9NTCtRV8ef8tsMDWIW6LGrns0RiqDw6081+w5XUEOPyzRj7uB4Tjy2rWtBHQT/fE7wnw8kXJf Ba8d8kUblc6D13/0BuFkZZ/M0zXTyH+jrCL1a8+dKG8i3uQOKN4EQVo X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Authority-Analysis: v=2.4 cv=bJQm5v+Z c=1 sm=1 tr=0 ts=6aa026df cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=svvvyxlR1OQQkelhaPoB:22 a=gAJobatAmFEwf0K8sXEA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXy8xWDaJzXVI5 LitdUKfMbdtvgcOI5EgqKg/AT35XQ6Hfbl4znYFwqtzAY7Kc4y3Q+/eIb7xPUjxNbEmPF/5qk9e WCyMpHxZ4WEjZBDU8KBxVn/E/VxQIj/z5qM4XSxHuGtPi1HENMdQ X-Proofpoint-ORIG-GUID: yo23EiYzRgr94dIoAb7EVwJw81iUOWlZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXwD3clzeU3jVq hV5g8eyGFEIoo0IJMnVC2NcCX+G/+pQgIIaU2jB6lXJmLb1G7LGCk1PWzUZZKAhpjNvEJC09Tyb ho1I9dkqt4XOIQ/d6AaA6SoUMVpQCCn9CSYYCkqSbdzqn66LYM/Gxn/4sg0IMDmlExwcaj7qk1/ 5DcDxhFZ3tW0iS4JZUS7MNKbS/YtBHIwpO++3isOfeTRFeiICc4EhRomoWjSwVOFEmaw/5CdCk6 MVf2H0kP4xMT5cqEaPolEGx3aPIdsdLLjdDriOjGyE4nVpgdpMmGwwcHrsp/fpCZ4LZ0wvIpzcV VWikQojPUsCebIlZk8/8pFirrRFgy+8cVjf/5l4x03cFbGQWNUE1U3xc95ytMnEqJlvsM7jmu30 RK7+vBWYghP5wIrPZEXDbBR5v49fNeccMDjVWfEdHAsWDe4OvVYl+pRf8k/RtRhMcjxQYdszh7t uB7pqngJ/5mdSkgCwKg== X-Proofpoint-GUID: yo23EiYzRgr94dIoAb7EVwJw81iUOWlZ X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=10 impostorscore=10 bulkscore=10 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 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 Acked-by: David Hildenbrand (Arm) --- mm/rmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index 5fefe5b060b1..193e1264b631 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2147,7 +2147,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 Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 2876E49EC5D for ; Tue, 8 Sep 2026 15:16:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880625; cv=none; b=Q257XJ6Bl/jObB+ZB5a1XlQrXnpcmnpIq8x3gPLU4mQ2WIqfKv8mMx1K9OBW1pdsIijmMksSK2fnEC+eyg2rZEJ8pML7PfXKUskrbL+3lIPGLgaRHTa0/WyBHetdUVSQluHCI6Ar53rz+zKD7VC1E/RhNt06rF1N48Rrs5g66kE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880625; c=relaxed/simple; bh=8AYImtP77V28QZu+QpRL/jO+FL03+XtzE9Z7zsh/mng=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eShTsNJwb78mxGmHa3nmrf4QP5sUCF+kOVBwZriM0nat/mlja/uNekv2SP2I6DgE3qIFfWjzqnctGynsQbWB5maDUo08u3YAnm6BfKUSo1WosziHuZSrNm6pz4rDVCUUcBSYqGrXetIwtrrnslhoR+zXs6uvh3rMZCL28S7b0CA= 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=F8qfU00k; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=bWd8nsk2; arc=none smtp.client-ip=148.163.135.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="F8qfU00k"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="bWd8nsk2" Received: from pps.filterd (m0167072.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYrEu981989 for ; Tue, 8 Sep 2026 11:16:48 -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=KEW5 6JejWUnkPaYS3ZKh84eLtVvqFm414kT9yUb9ry4=; b=F8qfU00kTiWnanrMZoAc tW1rVxmHitpXEcM2pkmXaG5hQprmnRz8Ac5IJORFDzuSnPavZH2qXEH52m7PTJHU P8X9fx+lxEm3WTd2RdpHFoyTxloqoYOG1G/p4IO64Wfv5PK1WO9hGt0yQH3OpYda wu+pY0o3l6ePb378loqGUu+h79QeS47gefSsfnwi90uK1O2GAztZ5N/KsBqz89JR 04OhuRwYtDCceQHgwbSkbZ8kkJedXjmzxXL1PephgK5BUMJcn9GdijLCDgofz7St uSrgfIg3K2wmszc8wA/AblhEVBqSoWwSyjO82SMYIfVoJNqzZbjjn3GNWodmDps9 PQ== Received: from mail-yx1-f71.google.com (mail-yx1-f71.google.com [74.125.224.71]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj50j5326-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:48 -0400 (EDT) Received: by mail-yx1-f71.google.com with SMTP id 956f58d0204a3-66fa3714f3eso8257361d50.0 for ; Tue, 08 Sep 2026 08:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880607; x=1789485407; 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=KEW56JejWUnkPaYS3ZKh84eLtVvqFm414kT9yUb9ry4=; b=bWd8nsk2ZZ7EabcR4ipiFhV9LvlmY5AUzuP18J9Ig0V4De45DkfEVgBPEcdLCBRsiH kG4MiMS3bLIQC49BP7cZkUFDT4Vie8My9yskwdiHfToHXNPK3f3e5y7dwGHWW321KYMU EgSp6x7eia9GZXQBArKRZbH82nN4YGEg2pg+WRpkpgbzEmTWBBiOtcE6I53YJunD08fQ AlHTNgpRBhRCSjKLDbeRipspnfwyrK5naQXmLTKLtWVKQr5fObiZSDLo0ZlH5Alabnl/ U5j2T4tHk/BTm83wC03Iz13mOq0t/cRJd/5Wgdn4QTud3JGs7d4N8A8OE5iOtPuG1s1F DXiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880607; x=1789485407; 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=KEW56JejWUnkPaYS3ZKh84eLtVvqFm414kT9yUb9ry4=; b=rRqdDvCjRcPrAt6QlEdsAYkh2FanJeeSqrayloN0qI7BO+279exX7nyjp4zCmPXMZg xLDkNJ8vCWmJh7hrp7t8VVqteLP/k03cW09x8IZys4lecqXlJAdXJQUYcrphGHc+Wl82 0l/QWmTvCMxDAUbDxeRYTmwABA3CQMMUP7WwB109BACYr1dtPBTufgteUw2QJd1f/plA rbfCh4SgUjf3T2AJ5gwHHeQmC434WxqWNtvso5CaH5hGPNMzbyprAie75ffzysWEPQEV OME1tz/GV5F7Yp8qADY1PWl4HpP87Ove6ZyC+wKApnYNLuoC9kDhBC/KH6AElLhJloOu 4dIw== X-Forwarded-Encrypted: i=1; AKwUvBx0VGNV4LwYfw8FFsKyJkIvsjnMOAvd+RcYQKSEM/ZsQ6a28Yoe0n++tz7oBb22o/UXJky29kVQJe6zD94=@vger.kernel.org X-Gm-Message-State: AFuF++kknABtI2YfjorRqAEhf9k0HEk/lDKoFZm9DSXKfpSJ6WX7b3Jo zfFsm0x5fqDPZe0BCp8puJwM+iadbkrM7+DNs7HLaRP31VT3GG9TE7MM6E077VOSo2YkAkKpS16 ZyLmXWTv08FcXH5cUlc6gIaV8SvREQPxq8Oz9XYX+Hedh7CtNH+YfhfU45MPxvQ== X-Gm-Gg: AYBFou3BpIe2KZY0kf6WAUqZAKcoSfCMUKqK7abm1laUbCIZ16ZY/+C5GEtTMfRGUuA cMQRPEYklXAMpD1Kj27W8VUiW1xfdoIjezxMb9mSdgVpPsYaq8dGMIFzBkEIeQgstanWs/hdndb rjzyGeqZibZ654xjYO1Jo801RiEiIk43vKJsaag6Z07RsXY3Rs6zHekcB44pvvj/ezzh/Ra+p7D nMtw7Y5Nb1/wPzcPfIVFvtTs0kxypGLB442scP49pgsjkoqazksMPzB2lQ8tQyK4mt/zEFDOOyx 3rpYVo2ndVLa00HTO9YK02L+j7Ew8uyJyp+gsZE+j9qGoKyi2SL0wtPT9zuU8fma17YXN1MxPUK kEiZ5y3IEond9mBv14fMY4s2y+YZTfXDZP2T1gmnMcK5vBfBDvPm2kw== X-Received: by 2002:a53:ac8b:0:b0:66d:ca8:bed2 with SMTP id 956f58d0204a3-66fb5a6d869mr8592461d50.40.1788880607515; Tue, 08 Sep 2026 08:16:47 -0700 (PDT) X-Received: by 2002:a53:ac8b:0:b0:66d:ca8:bed2 with SMTP id 956f58d0204a3-66fb5a6d869mr8592383d50.40.1788880607058; Tue, 08 Sep 2026 08:16:47 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:46 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:34 -0400 Subject: [PATCH v2 4/8] mm/zswap: use folio_swap_entry() in zswap_store_page() 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: <20260908-folio_swap_entry-v2-4-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=809; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=8AYImtP77V28QZu+QpRL/jO+FL03+XtzE9Z7zsh/mng=; b=uZ2zEOx+HX0JY5Ju3hCDh0SXAKTVBbrmKJa0Tzb/jbmsxqOFRFGF7tBeIaRnkWDnl5W+MmFsd OWzWdJ95vWBCHcciSRV07CPafJrAmEMk5d6veCOX6VowyFC+1bVmoTb X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX+ZHihq5GnhK3 euKllqC7pMfyH774XmX5gf4uyozDsy4mdO5SfUx4W+mtWY9l9My5HPwkIdF+lqzpjddl6IcCQCf me+cC83gbKfJAi4xRicKQ9Sr2kD9637xGkbSaY2RqiIrJGX1AawhDf7qPZNMxZ2tgihsHVeipzI mhCXXg85FE500VnVcUiCAnktzx4Q62QnMhbNVdgb4uroo9DQlW7NOvgderQyLwtsUQabNIoS9la UQGhgOdgUScVGD9cDBfxOr6swgqlmuolX91Rdtsly9PP8iHY1sc2cfGafabHoyek/0rev/TCSSM CME2tJp8cy262Glr/Mf6tnmMIjBbb69NhNpnDepbm2RpgfLQuNofwkJKOIymiQnI1NQA6mxEp4o Wd4eZctem9W5qlbn2DmOV2yEkl2YipPeCmdtwWZ8nSwtAJJnt1resdxLvz72dh2Q+sqZrS/hp0x ePST0ZJ5AwUCHCCaRXQ== X-Proofpoint-ORIG-GUID: SQqmadtAL57XMYlPyvBSc8dARixBZ3DQ X-Proofpoint-GUID: SQqmadtAL57XMYlPyvBSc8dARixBZ3DQ X-Authority-Analysis: v=2.4 cv=O7gJeh9W c=1 sm=1 tr=0 ts=6aa026e0 cx=c_pps a=ngMg22mHWrP7m7pwYf9JkA==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=SsB-OO3BMngHh3ZO9fOt:22 a=Y3A6ZkbiG78JemsH3QIA:9 a=QEXdDO2ut3YA:10 a=yHXA93iunegOHmWoMUFd:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX5rrSEhelCBLg 2745J6R4lN8LhNhJ4bfTWc7czU8bbWj1lw4CMtCx78Cn3RHgQfL/bJC7FdC/TC3RShD8YtDg+3Z FJ5OwvyNwsemmbhk/uXofv+s6aC4hiQtiz6dZEZ/gtfQiCCH9bO7 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 clxscore=1015 malwarescore=0 bulkscore=10 adultscore=0 priorityscore=1501 spamscore=0 impostorscore=10 lowpriorityscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 zswap_store_page() open-codes the swap entry computation from folio->swap and the page index. Use folio_swap_entry() instead. No functional change. Signed-off-by: Tal Zussman Acked-by: David Hildenbrand (Arm) --- mm/zswap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 5d0d8bd72193..c27e22d067e3 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1398,8 +1398,7 @@ static bool zswap_store_page(struct folio *folio, lon= g index, struct obj_cgroup *objcg, struct zswap_pool *pool) { - swp_entry_t page_swpentry =3D swp_entry(swp_type(folio->swap), - swp_offset(folio->swap) + index); + swp_entry_t page_swpentry =3D folio_swap_entry(folio, index); struct zswap_entry *entry, *old; =20 /* allocate entry */ --=20 2.39.5 From nobody Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 10E4755C32C for ; Tue, 8 Sep 2026 15:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880621; cv=none; b=jyP6vl6D/N1jKJViCPtrhSA+TAA+AzRJfOTuNHHDarbS1HHTQqfEPgZP6vD1Lj11AqBbVef9It/XkTwYMDG7FUYk5grdatxYNAjClLBEUxkwtbqqn/mgp7m23MJcjecEBkigRUWSK0Q3/fuN5RGSZS/2K0AGeM7TjLjDNd0eBlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880621; c=relaxed/simple; bh=LABp5i3bhJrVd0Am+oCrRIeAA5xV3hfOSmtufFDiLIY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N1FWIms2oY39AhOjBZBncFhcS+mPJ5ScYtfIZVSP2XZYzX2PgI0coS7NGpQzdUBULbOc3vP1MqT9ACC5wlJhzLYENqb46IDerlZkd+qEEEweqjhyAtc5AHQHm8bjCJ10ps2Do3TtPSMq9zx36LcgGYVJJPMB31mhlyefwWnppJ8= 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=lLElZI4W; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=dj+Cb9Mj; arc=none smtp.client-ip=148.163.135.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="lLElZI4W"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="dj+Cb9Mj" Received: from pps.filterd (m0167071.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYpVu2420866 for ; Tue, 8 Sep 2026 11:16: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=3JCg FZ/UvwntchAgFQ3Xf4ZwQOPcJC/BRoTP7E39rY0=; b=lLElZI4WDBND/j21exF5 0Oo0dMdO9bK6mmbakjQG25BaF/L7tpeXTa4lsAbU7J6DLIODHXbFkgUc9Qy4VWNZ miOS3hktYN8nFsIztOvv6fGpQQzbmdwdNukcw4N+lvUoFni+Azb+HOgUKlu62og/ kdkOhzVz9gsY5SNf4nJs7wS/lUGsLtw+tnCSrSp12tZlGKEmuObDblJd83vCj7+i BsDGyaQDazVWO5dGobi6JIHwuLEjeSep3sgqQzPpHDu18ysVvCoaZLp55N4PSfIn ac52oMyDBnOLyIb5Az9YtV+NV97ocITLWBqkMqR4xmloXiNhGmx5GR2lW6pao+so CQ== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj4d5d7sh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:50 -0400 (EDT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-9102f07f2fdso96611326d6.0 for ; Tue, 08 Sep 2026 08:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880609; x=1789485409; 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=3JCgFZ/UvwntchAgFQ3Xf4ZwQOPcJC/BRoTP7E39rY0=; b=dj+Cb9Mjq96lLVpVzwVABNM1n6z4zYp/W1pNx7avDHoXqd29hMA+gooHMcnacEteUo gHy73cXrFcAEyukMMfI5kxXJLjLomRDsGs9kzlFuqbXxQPl1HLOlKgupX80NNjsue5el l1TJOZBEjVuVE/tiAViviy9KgwbFs27JXMMROiif/f87w0PYi9F3sJ+87qS9MrS+EtGm j8rIas+ldMYC51nCLfiPgrZEE5DVNvNuXYSnPZIWSO4FFtjrmRbID8a5nhnffnSZ/oqZ hGARdfdOjQTp97g+Q1kR1zgMRYmZq0f+CXPIBjrXzxo+GjkTie78rw7OjmPhGv3uhiKk Iteg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880609; x=1789485409; 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=3JCgFZ/UvwntchAgFQ3Xf4ZwQOPcJC/BRoTP7E39rY0=; b=gomjdFXax1236Yvsl2HIx5zYDDKYlTJ5iCLW3/uB5Ra18HmlIYYkVpOV5nQ45UwCZG pMjwW/HJjrY0/8CvNmN0aZ8WOpct7MuSMuVIIvjgdsZL4VkCWUdvQpCbdlDjCiV6ugT7 UUnWwE5mNGHL3Yv5eYyWL1g3IqPuEiU2AWnV/zLNiuDujz/Tzv9oFY0lKRp0C8wrZUSO 9W+s3CKQhW6jUE0oBRDI/zZIXuLqTUUX979cmpY8nqONcs38JzRd/iibodyh2QpqhXsN 3tnNfaAsdyLS2m8KCVxplhztTYclLb/pc2emotfulOFvEMtIs7QS3EYYe4byihdbR+KV roHA== X-Forwarded-Encrypted: i=1; AKwUvBzt/a7qELidqYQCboMm7BnrL9H7zfi2gRU9ZpX0JhoaSrpzMjl4dFTL9vQhfdYP/OQCJL/1c8Bpp4JljSA=@vger.kernel.org X-Gm-Message-State: AFuF++m03/iC9Gr4qcpD+tI43gZbDqWCGLpi40jMdpOUEcPsOJjojajI sKdko+46emu7yakIKaYgVpp4FC+C7jbvVaq6c8tUCZHJCYLk5aXAuzb7dc6rc8kaqE9og/Ag5vb 83DDe9uXLlMS8BzLyuyEH3mRb8dctaVfHKYTuJ0zyN5XYXsZF7f/iAdFILocjSA== X-Gm-Gg: AYBFou3E+JM0ma11EbF3Mc/yaRo1LC2JFpCx7LCWAv6VxOSLAnU5JMKRI3gMS1diZbw li5bnoR5fLoFuS/Mzy/TdbtstqNPoJhI8dO4mhlAIUMLIDqtcm2FYg8vH1ilP2Q8k4Zn7yJFRbW yyeOxRg1xO0vIAYpMWzS1FGVRxDQkuYmWmGuLYxuD3/CgEqizwY2XRnWFKYTY/bs7+SZ+VrRqkw 1X5yev9DVSxCZDVUfQpnNmJ3gsISnfHrBQ/iy93TJcfKcWeNbx+BDL+YCITVYS51OxvKIGDDKxY fdq10JH8JcwZKYs/zRqlleJSt2Lbd1U+cTScXtnJgviIjmYQ4c6bjA77yLX5B+NyrbkfD09UTKd 406g/TZcQD/Jhu4h/7VubRdMz44nalTqMuRqzxHfIA74/+Nh5rMS1rA== X-Received: by 2002:ad4:5f8c:0:b0:910:3923:cc74 with SMTP id 6a1803df08f44-9103923d1b8mr310712196d6.29.1788880609122; Tue, 08 Sep 2026 08:16:49 -0700 (PDT) X-Received: by 2002:ad4:5f8c:0:b0:910:3923:cc74 with SMTP id 6a1803df08f44-9103923d1b8mr310711206d6.29.1788880608454; Tue, 08 Sep 2026 08:16:48 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:47 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:35 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-5-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=1012; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=LABp5i3bhJrVd0Am+oCrRIeAA5xV3hfOSmtufFDiLIY=; b=6+jR6HpZ06c4dXTH61RnGlMCd2W093XLytaX4GORE5cv8EMZGRyemEpyApxc9zi+TVZItLfVO XlmbNtQmc6vBOGaiS1COlSt98pZlWdcycp/k1+8VHxNkEwfvnIXk1gR X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX24jhZAa7GZN3 aMWgogBva6POFpA6eMjIueaHnczeiafFb813u8pCR+XMitMRXI2GthvjiS5D3ResMlcbTdKu0YM p+WJ8+tSAs5ZTzxFsmBi6NZppw41iWT6i35j7Xl2wX3fQ6XKVSYploDYrfBqR2902iX2VGS86rg 6kKK2/Tq3cq3SWrteSONhTaqdrXP3CGPtgN5OCEeh+zG3JA1kKkn/PDc8WO3rYuobF7fROJfNBC 0zjJ3ACu+TPeNgUPyBippUMFZIg0ZKrYO+PbYqjzqs9AgnBmtSxPnMjf/R/Nf4Lbt2b1ofXxCPf hB6U5a1HwlaxZmTv3T5hQkwbPEvzxyAJkUp3zIxQZn8DxORz6GfEBiI6qDhJ+Izwx3Eps/MyetN TYwfQBVOs5UtCkna8petSo4LWeRLVZBeKo70E661C9/MWErf7xgl4wtTWaQuOCBRQBVj0hI+zsN XRaegXDrJRZNM9IwNuQ== X-Proofpoint-ORIG-GUID: 137mpE4ec-iLp7Ce2DyujKHZX-e4giGY X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXzZFQ92veFX4p BmGnSw3kyZaFAk7D/lWWMlkzxsS+SqLgpgmCMZBzRpuHaaBVdHcNbEUr9Gva5GwIQq+Am+a3S72 M/KUxhL8kPxbuSpscMOtJ3ryw4CCC6ALu1jUrYqrbMwYvoz/4qqU X-Proofpoint-GUID: 137mpE4ec-iLp7Ce2DyujKHZX-e4giGY X-Authority-Analysis: v=2.4 cv=BqCtB4X5 c=1 sm=1 tr=0 ts=6aa026e2 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=79PYxaXUQd1wl-QFWJnA:22 a=xqDBoplpeononJk8d44A:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0 impostorscore=10 lowpriorityscore=10 priorityscore=1501 clxscore=1015 bulkscore=10 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 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 Acked-by: David Hildenbrand (Arm) --- mm/swapfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 869a918b18e8..0a3a3b2218c7 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1822,7 +1822,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 @@ -1849,7 +1849,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 Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 14C8E3C3787 for ; Tue, 8 Sep 2026 15:16:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880623; cv=none; b=RI8Sy/KD5yqWrrHusqwyuy5h/jfDDkbEQ12u4ZiDgDaR+4X/hoKoydvL1x5+CagBkBrht7d7FP/taimpQbeAsHeRQlAnWAdKkNkSDDJ6X4ZOYhwINfIdw6FfpMSVxAxf8yVC6LsZYO4Hsl/GsZ2wToL9OqpX56/Yj3FjGsZMfgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880623; c=relaxed/simple; bh=JMnLiPjPeuQ8XHbUf4RdPN6u8wF8V4jepqQl+nANMew=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=upgJf3n5PmcNudviCCrLB/PioaGjLf3CXS+BR0Gu88eojUuxIoBdGY8Pkt6ct9x+s0Kpg1mgaQdZlCEd+Q0whckPhebTBiTjLqCmrMgFUtpqMyQwOSvENDEgJrEZuzWbbkg4wjcY85j2bwtbI1ePdfch0n+8y3Z8CQ+Z31wykf4= 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=PB+XrZxP; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=5eqr/QFB; arc=none smtp.client-ip=148.163.135.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="PB+XrZxP"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="5eqr/QFB" Received: from pps.filterd (m0167071.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYpBO2420788 for ; Tue, 8 Sep 2026 11:16: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=d/ju GQBpeXjCCGF/Jvctg7hi+/3D3O4YYez7MG8kxSg=; b=PB+XrZxPTwrkXbTyYVYd lumHQ20EoJN0qSaX0iS4gdwRdgCm0ih1QdVMcHCfxMyxoeBesUAwedtVTF0Jn1Rf jwD8hGuisXzAiFVARxfvQKG+jr5u2hvkKdechYgQE4CBe6hCBfDkYf9Kq/g4WGEh sDjVp39yDqviUY9iyHs7d3HzHYME+KHUbElN87zOQwdhnAIgZmMCl0BLYovoJxrB AeZzl68wQ34cCgR+BxZdmJ3uIpXtogr9+A0ljJmO5mMqi0L4Qk4UxZnkD+0e4BsY 3DS9Kc9SEDVtaj8C0R6dUKbMLGvVED40s4NWh91cEozh2jxEAyIZMffO1UBdh/x7 yw== Received: from mail-yx1-f72.google.com (mail-yx1-f72.google.com [74.125.224.72]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj4d5d7sv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:51 -0400 (EDT) Received: by mail-yx1-f72.google.com with SMTP id 956f58d0204a3-66cbb3dcea7so6112553d50.3 for ; Tue, 08 Sep 2026 08:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880610; x=1789485410; 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=5eqr/QFBLWCoWrHqAyzcx7ZtA6n64Bca7n9yM3MbIfUAxpTZU5IZq6prbWkGEz/XrE +Rzt6nGlAmwJB8RpOnWE3Yu/QU6lYMWVK2t48yIN8uIx8YxySpuWol962fSKJACOfyEV OZnXTvfjx9z8UzYMUH0eZvCpqSHEmWfo1fI9QffmH9WBDTpcqvZGJoT57JHhd5DX3FZp PRQ/33V0Lu7GvW4jjYFMlEURFSMcL9DzKjwVG+ADa0m493LATniMBUTzq5Y0b0OxIfDi iPv8PSibUgiD7fpVXI4PuYVpIYqu8ecMV92TbeX6HZLpUYYkXgryoalS4t/NUMwoCkNm g4Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880610; x=1789485410; 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=hwLv+m++fa5kL9GIDFXGLhZwGLWDCVEqfkSdKOzafvvKjWh4ZnKm9zrKWexC8YFooP tJScHD61kHHl8TUpwJjO8yBGFQUTgOvzAwiz+fXzgMaBRgib70H5+3HSS2ha0/b7q3Kk JeXSngZ+KmuOqvh6P7SmdjJmP1anq+QM6yFMQm9xU7NVZce9FXJWBhZ+p917kx7eGxhv maqD2J70wgbfTs00KIg1cbfk/EbXQJmtZ4yCFekByHz+vRW/eptmy/+kxLJhMerc3h59 xoLWqHV2/ttzZMiUldP6xfHcxKHZNI/nAAKbxXqUTZ3g4WZ4SCktFtLrieWwNiH7xCtN ASnQ== X-Forwarded-Encrypted: i=1; AKwUvByVdd22l5ZvUDu+npI0jFeETK1edKiV3aWCL4OZlBMpocyrKHJv1O2a7rX7Scp8iRfYiid/OHZ6iw2kQt8=@vger.kernel.org X-Gm-Message-State: AFuF++ll7452HApEyJWffWqIt9k6s0Rda8DSvC3YPPpF88o/qErBm6pk RGX78ElIlmg4Yzrm/VxCrM1IK5pp/Kiza+LPQo0TjIw7yAcXSw1qPnnJiYrbRjbT9lWkNS0IGJm /qkA5IbFKMSuhH38J6qzfwQ2r4dl9mlaIqK6BIzpOlWtlyu3bkPRh625ApuFZOg== X-Gm-Gg: AYBFou3ys98FJUsFcuNYB/PEPZGWbCdgqIC+9rvP0SsCuPOJvGMtAIXwQPXzp5WRRl/ 0BFJ0N8QNRFHeqEwtyTNpVySyckIbkbkrK+U01Ub0ahVX7PV7r9STMGVqYFQBnWE5e6h4yrNpCA 4zyXs60xTpOzKBR0OJzp+YLlMsaEuU+KiR874mb4lG9zcTnB+boT8zi4U9LqG5vWZdjjrlEei4H suAinhoWG+HO7LYayySICnyf++qnmZBe/CjN8yJmYlnA16/iYcfbzylXKb65p5V8To+E36MYN6Z sQfJRwaCv68ImOk7EN1ez+nliDikZtdpIMy5ITNFMJsvFKqhyPF4sKk9VTHqk4GS22OH5OTPH0D BWiQ4cFiT2I+PvPr7CJkb5Q41VG4gss6b5wc1sZrFGa+4o0Wg0XGUCg== X-Received: by 2002:a05:690e:4513:20b0:66f:c8e4:f013 with SMTP id 956f58d0204a3-66fc8e4f18dmr4249090d50.50.1788880610232; Tue, 08 Sep 2026 08:16:50 -0700 (PDT) X-Received: by 2002:a05:690e:4513:20b0:66f:c8e4:f013 with SMTP id 956f58d0204a3-66fc8e4f18dmr4249033d50.50.1788880609732; Tue, 08 Sep 2026 08:16:49 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:49 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:36 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-6-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=1787; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=JMnLiPjPeuQ8XHbUf4RdPN6u8wF8V4jepqQl+nANMew=; b=gGrVpzINCdcX9e9UtB7ydxsckIe/46z/TwXW94oeS12x2L3iuyn2uigTEvuOZbHdpQe5OV2Um +P1oxTLmtU0CwWIE5zTT16WQtchDHj8G1SYst8releCqJFl2APeIPvs X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXxnM5BRmxtGbC UVJ6cicyeDMVsqmX6wX1FqP+qCSRf/ykklF+QJEEyqao+58M4FmcWEhmiOdOWN6lnKmNxy6SfI8 Utfi3K1J3SG70hcgXEZ7vCsZpmngBjJIECznHXYCYUI4VSb1+kz35nGVnO0ks6PVrmGJGOjd5ey UkD95OEMN0pbQIpeAI3WX6uBUu6s5reAv/Y+GSX+HxSBY6Co9ZsGY8vAdQCHj4FqNbRxzOhLhPY wtnnX6fvjHJpZ/kUPt1WY6pXVLpRnz3b0zmTNmg06oC10fzr1UvmRsW4RR/GFjaErD2Bkdi763h KXzBH744Lb50ZoiCSt0vtPNLRdcM2C85Yj0wqq2H/Egv9+FwMT6Esd3zBxaUvMBwtlOQ9VV9kQJ 6QjkwfhDnM4PUSM+TAcAhE+dwAaDBpI4fepQLQXT0gP6/645pZxQvr9QG03eRZoBKUozrwR62HA LmSuBDZtIXiv/anR1Rg== X-Proofpoint-ORIG-GUID: LAbXbh8Ek9XWvrHjgc4SBkfZRfkBkoCP X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX0c1jjlXTmPWy j6XKHQI64JusIGrb5qIesSBkP/APj4l/AHkAvFJHMIh+S989jDGJlIMWRszOETpIKSXPJwT1Dso oYxLK/EJU9CtMGXaNglZayTdsqGbN4GHZbRQvKsljx86JH39oH2/ X-Proofpoint-GUID: LAbXbh8Ek9XWvrHjgc4SBkfZRfkBkoCP X-Authority-Analysis: v=2.4 cv=BqCtB4X5 c=1 sm=1 tr=0 ts=6aa026e3 cx=c_pps a=VEzVgl358Dq0xwHDEbsOzA==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=79PYxaXUQd1wl-QFWJnA:22 a=f-bboeSTcrnmky8UUdsA:9 a=QEXdDO2ut3YA:10 a=uujmmnXaIg8lM0-o0HFK:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0 impostorscore=10 lowpriorityscore=10 priorityscore=1501 clxscore=1015 bulkscore=10 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 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 Acked-by: David Hildenbrand (Arm) --- 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 Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 8F86A559C83 for ; Tue, 8 Sep 2026 15:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880625; cv=none; b=ddx3xu91RMjE/hgCzbwJuUd1RlP2cgT3i2I375bCTj2uOF54QdBns5zowZDG3AN79nc+W21SUN7fhHu0K9UZEP3z0tWaF6CJlKM10s1WbQyjItIa8sJsoOvRxc05z7a3gsz8/T2wzhfMPn/xbe9wN0kll1EH/r+4tWMFs9l6lxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880625; c=relaxed/simple; bh=8STOz0RYKi+7v+knfY76tg8bbf4f7uqOVYm5Jf2KOls=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZU8Di0iHZtaUhtBFNVteABbGzMm3rkkrPEgutP7LnbDct3yORQi7yB6TEk8MKhttL39ENu6qg31udALYOY8ZI/Q1wzura3QiCH9YG6MM2lMFmJnGeASSGNkGMN8ykv33fLqsT+lE1MbTXaBp6huXjGL3dlfgC1nQw7CeBXSccVM= 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=VPfBwFhT; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=1AvnpUXa; arc=none smtp.client-ip=148.163.135.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="VPfBwFhT"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="1AvnpUXa" Received: from pps.filterd (m0167071.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688EYpVw2420866 for ; Tue, 8 Sep 2026 11:16:53 -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=VPfBwFhTXlKFwWloCWqY doiDToCv+ItHMrqPO8i1W6Tgwgz/M5rRQJYpKEfNUMWz5BJ2yLG+uh5r0CX3wyyq TKmf1kQmAGXXF3BJiEXFXxeso1ZOcG2jGlJZLCjrKINYDYBLatBvLKfKfPfcWcvO m0ayVUqVqT1dVAi7f6Qsa0hLZhPTzL1rNniu2/8pm2cMKQP+Sgeb0CvIqJl2TFbA vSLEIvvAgpI3kJk5ot7pZHladU6eFzG7h4Ajx6Xp1X0gl390LLJ48qW4au+CZrVI h4yF2ZuGZGkAOgNtYYq65A/PBG/UWV0El1iRS9lZegUCHrlUD+ytH0gxUUSpGfRw mw== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gj4d5d7t9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:52 -0400 (EDT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-91054f537f9so42300346d6.0 for ; Tue, 08 Sep 2026 08:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880611; x=1789485411; 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=1AvnpUXaGJ5/MB18RUWA+Ww7zXZ5k2ZS9NUjeMiWaebqmpFsWZAwUtDeszcP5XyDrT qfB6natl5RGeG1w8CTDs49MHaZqpYCSYZG3swhSsSySSGxcwQDg/PKBrEurSUij7i4rC hn4NvBkGM1xhrm4vcERW6+746Eh6uNjTBU8AIEPmgFKwv47a1nC4TLu34wpk3ueRlX+l bYIfzTvkufNcCcM3ktUv1kn+NiOgraAP4euysB76/0kEXzct98z26v5OoLLbZ7RUdWza duG4ARiuWCAiinVeImBVsoh03cC47Kq3tM8FNhqDAoxO93P2FapEm79U0II7FAQmE3Re JOyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880611; x=1789485411; 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=eavBItIbIOdazrB79IU5Bh0Mwjg/UJOAmtjJlbDL7+qNQcGM75bktBPZ972N2cZjP3 lhVX/gIdTkEtAaK+5nel615dmutHn2tUVgrJhtRn+IAfiwCv1YDfpvLy5gmiCEC1RLr0 QH1M2NjWYvxCSR0IJYKQEHpnrIC8oDcJjTKEDm7RzKXjBgtfLvwlHBJXkQOFfqT6lSgI Q09uSOKmlmqc8jceAKc8kjBdf8zt0kQydjUNXqyE/wbPTmNJoMdvSDdQLpT9G7tVHSuP n5NjbGjB4LhZnPaM3zsr8UXrDp1V3Br56+kMbBn8KohFSejyajMXtTSJnx3Xt25xdtJI fyng== X-Forwarded-Encrypted: i=1; AKwUvBwrGLzpDhK62borxHQZ0EPUfw3yyWZvcozKOxaa465mD6xCCewT7bKEX/lz0n66dnSMyslJDW0DdlMqy9Y=@vger.kernel.org X-Gm-Message-State: AFuF++ny4GGJaKQ0RFK1d41pZsyY8IUYywx28MjzZ91PESQfCKhUZos6 wsppfjrkTF40wb4W9O1jqq0GtbVXZAkWRlxC0c/cvcH75u4mpABBWpuRoOOTM7TMZpLazwmtFYd eDmdfv9RjjX4rN/vkaGroLwnNcaCBhdwKjjcsUg0KGusTEvhITfMeIj0mUFTRvA== X-Gm-Gg: AYBFou0r2iN+DVLbf8rn9YK2WWzLjOvER2ZW+wQ9l13YOFtP7z4dCY+BnOaK3GZchag BpM2JukmjSOouJ78N+PP6reQCl4WlWtoDF+3YgKjHA1H+XG8QZp4uiuK7y+x/bwO6Hyg5ZKlfC8 mp5tqP/EmqI1W4tFm9K/EepgZWCq+cXoj37915QxSEO8B7vj4K2Luf78DuEkKXfDzJviTY3Ox4v FmuXveLaqB0U1UzaMsXjVe4ur/kBkBEbl9fjGI35xa1xxCrn9uOZqGiC2uxBBM5gW/NJinbpeZv x1Dk3V4gTJfw0XC+IWk8nVEXfPT+s/pxMrKfSxczHtV1rOkEZE4cXzotbb5w2rUHDfgQ+XvaHq+ b63aqpelV1DVNTjyM/X2PsyKBgkZsR72Eq8j13S2Y+6Xe860ICeS6QA== X-Received: by 2002:a05:6214:29e7:b0:910:3b67:b793 with SMTP id 6a1803df08f44-9103b67b7f9mr305200346d6.24.1788880611482; Tue, 08 Sep 2026 08:16:51 -0700 (PDT) X-Received: by 2002:a05:6214:29e7:b0:910:3b67:b793 with SMTP id 6a1803df08f44-9103b67b7f9mr305199926d6.24.1788880610996; Tue, 08 Sep 2026 08:16:50 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:50 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:37 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-7-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=2617; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=8STOz0RYKi+7v+knfY76tg8bbf4f7uqOVYm5Jf2KOls=; b=3yiqYYUgynKMq+RRIEdaUti5K7MwMUXqY3WMxl1fsFaH046VsOb7qrugj7sTwz0D6k7kygoPl s02ruplAlBsCYZx/5WBodJl3UJIHGU4Yv+lkcZNrMnk7xeKVJglYrmg X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXzRQtrZhwGOmu /ouzSS1kSvQDfTlqhg8S1IVz0kcR6e5Xka4F+2H02RjmDcs+aNX7rOHFfS4gBG6dscbR6pdJsBc A3EEXQlgeY0tR0lByCpW8CcrWIuYOLLi9g2xb8Hn9tsrdndghwgBgoCu+m6ZroK4WkXw1VhmQdP rDc3Q8ocqucwiPBnHvodve3X8mZYQMx6zfmTeQuuhaC5YK6HSIQmgXHm8qwCPKMc1ixKq0VzeLB PgcMd5c3WovnJ/Nx5Cy3Olk76op/svBOKIjhpPpuW+XXwovLGWpiy7WWGOHPKdpH4S3v9sfiafw zQhg1xk6fJihAV1G13GV9/Xe0YTH2hZYFxE7L/dwac5ZBw7vzj5vD08oiHGHX06DHsFEk+3lFdB klnw44dd8o+6Y+RDI3FrrRH4uwAobCpOF1qTwqeu+lTI4PTStipr1OpnszbQymxrvh2x/1XvC+r teZMjsmgbPIR7itBUDw== X-Proofpoint-ORIG-GUID: gwkPy1RmwzemmGPD1PhGlCBQDFi57kHu X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX75eMq78QOgu+ mPBU+GyrAq0N/TAOa4mBpNa7nwR5JckXmPBhOMOYhtn3P01Iqds5dRm9+VbW+u6tIuI2D0nPkuH Vl/b0jSx3rzCNcOWZnMGhrzer+79dNkX6tXD1nfWUgBoUcSFuLcj X-Proofpoint-GUID: gwkPy1RmwzemmGPD1PhGlCBQDFi57kHu X-Authority-Analysis: v=2.4 cv=BqCtB4X5 c=1 sm=1 tr=0 ts=6aa026e4 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=79PYxaXUQd1wl-QFWJnA:22 a=p1CcqGZxNqfKctaSDs4A:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0 impostorscore=10 lowpriorityscore=10 priorityscore=1501 clxscore=1015 bulkscore=10 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 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 Acked-by: David Hildenbrand (Arm) --- 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 Fri Sep 25 20:54:19 2026 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.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 0C1D855C33F for ; Tue, 8 Sep 2026 15:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880627; cv=none; b=UBxSCzaakchT6cITdYAEoxDveIYFx7fUw8mabmpsF8U+XtsaXoTUvG45/HjZygp9PMCi5fcUCvRHslTWsH+cN/BGNWx26/umxsQqK9T+sXhX1rMPLhPErNRHUvmTuv+Wil7RAlTIGxoJLzqtQQ/fOk42RHQkjfrBmkKpx11ka0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788880627; c=relaxed/simple; bh=CwVUhQtJV5BBiMFIF7YsJllNsqsS2ZgEmWIprGlfLYs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZdlLWAprDv4GjB8Jt+S12OJsNBQnnRtv7mHXFyxdIaAm3aX4pOxy5TqZQuDrU3/unsXrPqeClCZnb2tDm43sbZ5RwS9QveEaXrSKgbR/8W/WNDqFSYjEeWe/PZgai93La1uJO0HVJn4BpCDB1gvNQx+H7I5WYdMkklBdk4HhkBE= 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=URL8qlju; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=QPAuoRNT; arc=none smtp.client-ip=148.163.135.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="URL8qlju"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="QPAuoRNT" Received: from pps.filterd (m0167069.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 688FGqTs383538 for ; Tue, 8 Sep 2026 11:16:54 -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=fX9N ElGdJ1vvg7lNn1ooXtrYJaw0f4RzbfQAdaHbR/Q=; b=URL8qljur+o26RNDCwhc 3otxNMr2qFFL7YmqHUgEk4Ox/BW7+OhP1HTONIGtt/wEcTTAEhw4CQav4KHY3grd ycpKIXbs9EvBw3TELRqqCd4D19Yv1uRnkoe94QRpy4O+KSa0cTHtWocpZTOzfMUh ByysD6ZPx4pnuvP/y+Z5zt1XCO0iHb2IJuuCTtN5L3vkKydqmhlPUGYpu3CPkd8m d8QgsZS7oDb2/z0OieyYkUORtzY2eCGqAUfpDe1GSNgcd0EGpcmInARCvRzL2H4f 2cFO7Jv7ZAVanKzGoy7vuxFsw+KqKY0Cx7Y20Yh2Y7rm+yM5ukMDuOmSAkJ/Z4z4 AQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gjmv7g03h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 08 Sep 2026 11:16:53 -0400 (EDT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-90e8dd8be81so56252846d6.0 for ; Tue, 08 Sep 2026 08:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788880613; x=1789485413; 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=fX9NElGdJ1vvg7lNn1ooXtrYJaw0f4RzbfQAdaHbR/Q=; b=QPAuoRNT7vXeBkcu1vUn4M77+YwQYD/yixV41lUhUy23xbp1JTgni3VmHheFxS8aw2 UEeCYoAzKa3bSrai6k6w16fZwl+efFKnZ+Ngi1YUy+3eQhejamuTOYNMIdncfVOi2bRl YYrzxLgtL7vLfhjLUhgRsQMhRRwzhmPZq+Z0qBoq6dG0UAc4KYSzV7y5L7vzMuql5shx prOguZE5ZIPUPr6rXH/nuOuPRtVbMXMIGVKUthmYru38NCrnlYoINR1xAj+Le5QqBZN2 WiaVm/Of0us1PJl4N05+nzOg5G7cfCpzgQeBLEnqQO0RHfP95UJSVhb4I1DMs9AM9RNQ 4+kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788880613; x=1789485413; 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=fX9NElGdJ1vvg7lNn1ooXtrYJaw0f4RzbfQAdaHbR/Q=; b=Cs+A5sLNHK6PmAO7GR9La1iJ+flYtH9BKHG7WrhQy4p5vY2O/GPYnKqM+cfXr1pynb mx2ZJAofv8XiT4cAA0mdGuI2yhPilmald6SC9XL2F+00Ge42UAc6Bwlu9txAnFl8e0p3 B0TsN19SRaf/DntCzeHTc3N7WXJ5cYxjHSSPEI3jg22kIpM34K43S4GDnK8kmk4jVgch VHRi7k+T5d0JSsub0i67Vo4cVSzwOFFBDwaw2vOEJR21MAatBXSKTl/jmWQCZXkG5m0N B015qpf7QlnKw6u+nadxNJrdJMzghvl9RQxhS2a1iq3/Iq/5RogzEYfQmG9SRPwBOw8q 4ZGA== X-Forwarded-Encrypted: i=1; AKwUvBwtwb78t/ycPs5Ui2wkKBwsjfNR8OWcTHm+cRjHDyHiMrUYojNsa3bDdhPhXLhAzijCDUey1QXwkG20meA=@vger.kernel.org X-Gm-Message-State: AFuF++ldx1BM3c3CU/XHDHPO5Z/7LhGdbvvzU9/ou5x2DEWZel9zsClM fjsuPVY3NyjfmJwQ8hvTuBp7aK0L7YzaK8S5wbaViSmW5ntK9vsfz0vzg9gd4l7qh5Nh3Kw0raU 8wOgy1FuNIf5zWXzVFv1tYJMdjjZmcLHXx0SyZdIz5m/AzQkhYuN2bFyo8cFlBQ== X-Gm-Gg: AYBFou32T3RuPBNHgpWY4CSHsfkT+QsOFxJXOGqO5t7HBnhHoJdypw71veCl3yWj2hd Teo+QOpNv6gVEuPDiMbDGMB30xvkqTJu71Q97Bx0K0XGUabgVwgGWgEPxzHf512midiwh5TKEq1 UAXtELJvTVV1bX1kLN1/+YiTAmPZPPhZlb6H+a2LBdONZWTUr55nl5G+cCiZOAltkdfDlxT6/Wu l6asmndpc9RxmeAedZAuHD0KXL+YWOUsWqgiuc0s24dcHo1bB73vDdxncqsaRUkLMWDObX9pGpG xevymTQR84cBl+wvLj7VS7ytA6OqwybxmLtSccuss2yTusa/VHsWOEowsNWdZO/t+WDJlZ2uJqs 02n941TMP5s7OPEGE9vcuSkrayO56xddJI7GbCxrT8Jl6d27VcZifeQ== X-Received: by 2002:ad4:5aa5:0:b0:90e:838f:d282 with SMTP id 6a1803df08f44-9103ef96606mr374577836d6.18.1788880612900; Tue, 08 Sep 2026 08:16:52 -0700 (PDT) X-Received: by 2002:ad4:5aa5:0:b0:90e:838f:d282 with SMTP id 6a1803df08f44-9103ef96606mr374577136d6.18.1788880612245; Tue, 08 Sep 2026 08:16:52 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-177-174.net.columbia.edu. [128.59.177.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91040673ce0sm122105496d6.25.2026.09.08.08.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:16:51 -0700 (PDT) From: Tal Zussman Date: Tue, 08 Sep 2026 11:16:38 -0400 Subject: [PATCH v2 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: <20260908-folio_swap_entry-v2-8-ee6d01dfa5e1@columbia.edu> References: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@columbia.edu> In-Reply-To: <20260908-folio_swap_entry-v2-0-ee6d01dfa5e1@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=1788880600; l=860; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=CwVUhQtJV5BBiMFIF7YsJllNsqsS2ZgEmWIprGlfLYs=; b=tyPDhjc61YJsztH5Euj8TQKxOFLCx/bN5LNbg4nPR3nHokHNyj+eIbeFvKstLN2ZgLUq75Jp1 TIiTx3V2yBJDm7QS92klbDglsyL+bdllOp4LdCCYZmItGrGmI/LXvyx X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfXwlQQK9CC227B 5E2dULQ62O4JWV0AdXKcZxrvb13tFTMGF24Gy/6q5REuMZSDe9v15R/QT0h2ii4Z2okIXpCU4LI ZyYM4mLUz3NyYb/HxUU4mXNXg/SLYGdp+wyX7gl4Jv3gdIM9pgy8K8UyMmLzVIUNGC7F2n/Jj9c K0HZ7cc3LVkPdHuGr4orCmAEPmRSqp3NWMvEGx0k+fdDaB0MxHtGgfTdt52qBIoT2dDFJZpIGFL Y4n+jqG4yq5moQFDKRKNo+vn5qsEODR7lV64ZDOqoC8BnT4Gr91eq+sdkCXDEimlo6HHCRLcMMq GSlAT6PYwhdodoEF8+AmwAGqTIjaYc8iox0aHtVsVJ0cBlJXwkQFw1V6xshgxVgCviNEO4bczcT u7wJLMWUuQELNeG58vNv1wIry7uIDf8RCw3tT8YcmhdxezbNENnJk0uNjm7XqwCWIifCtGJ5Qt3 s4gxeZ5V2620zPI01Jw== X-Proofpoint-ORIG-GUID: 7ku2CddmqmUcZXz3fznd78fsx3c4lvmf X-Proofpoint-Spam-Info: AW1haW4tMjYwOTA4MDE2NSBTYWx0ZWRfX1vqOHH9oEyDx pEui/1ujmDDA74nD+pCtb8eWaQiD7jAGvglKqVgZSflX095jlLai5+bswdC133VMt0wenADjc9U MPMddoXUo78GSQWPZGQ5dok3B1bzWkQodfL0T11oUBoNzrRNHL3X X-Authority-Analysis: v=2.4 cv=fpnsol4f c=1 sm=1 tr=0 ts=6aa026e6 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=HBUb3goEnnz3w2smY6d+Hw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=JR4YdQiviy7OQf72WyZ1:22 a=t2YXVXqu3yB8mPBWm3YA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-GUID: 7ku2CddmqmUcZXz3fznd78fsx3c4lvmf X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11899 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 phishscore=0 suspectscore=0 lowpriorityscore=10 impostorscore=10 malwarescore=0 spamscore=0 adultscore=0 bulkscore=10 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609080165 All callers have been converted to folio_swap_entry() and folio_page_swap_entry(), so remove it. Signed-off-by: Tal Zussman Acked-by: David Hildenbrand (Arm) --- include/linux/swap.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 1d979e76e78a..8032a0f3c319 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -305,15 +305,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