From nobody Sat Sep 26 22:05:07 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 69433416843 for ; Sat, 29 Aug 2026 19:09:23 +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=1788030565; cv=none; b=vCwUZKjHKQXyanVN8u7qfNhBCHVl54VCPJoax7vA64VO4odJK8wqZQVzaWQzyB7/2wV9I12pTrWSkugpiZzo0/UWVXIZyNYvPg0uNCLvanykqe2PARv5wfEikXxTlr8KL+rNF4kzZ/03BV8/Fw2mKs/LTq5TRFTkbvqhQVUfBZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030565; c=relaxed/simple; bh=bu2FKT6Zpidj2DaPOQ18Cz+j6n00zUJsobxVdi/Srlg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OP/oWN/zK4rZo9KvI2dvEWLCfB2pCQdQHBsry2I7sA2Op5PHGwmo+LAYPbb3Nndk3SO7S+/hBEuS6NTWgI9YG+5BwLbucuLsGsSXrlhRGvQvrflKg5pn6qg6G3FPyxXVWr3894pkIQiBytL0ufBcSCjLKER55BF6uUhkTCPiimw= 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=BrcJ8rPS; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=W0uFR0ju; 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="BrcJ8rPS"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="W0uFR0ju" Received: from pps.filterd (m0167068.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67TIZ2kE1792602 for ; Sat, 29 Aug 2026 15:09:22 -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=2plo sek4FqZnkL3UCaYJ0f9rmIWELlqNc8zdmdPP/o8=; b=BrcJ8rPS5yZmX+HHDhs+ 5Gt5klBGYmqbGrMkzQHlrd8OTj6qYw3dPhlgw/SlrAjuu5tfyXjD7ISVKjRiUCTu esDWg36CP3Z0xhCPcDM0A7WR5E+DdBkyYOHgvEgvHYQl83SnRzslEtHlmwjhiBGV 3zS1Bg3U/hToW2iEYslWceXO6rk4tvS28yhxxL6YX0ugg+JmIqPhvcu7Z6QJixf6 l6uBt1bKj5652rsEIUTnEc11jbmaL78zkd3PydGTe2h1kObc8aCv9Mo3t5+0v+bJ f+R0dqvzKdKAUhXbmU2Q34ikXvZoD+vENeni+1AdsMysmEd4DWiYi0J+0cBIHx/e Yg== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbsppb0pv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:22 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51bfe3fa93bso28320211cf.2 for ; Sat, 29 Aug 2026 12:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030561; x=1788635361; 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=2plosek4FqZnkL3UCaYJ0f9rmIWELlqNc8zdmdPP/o8=; b=W0uFR0juBAvjEDLX4powYmLyM0v6CVj0pI1s9qRlKpXyiUcBLn6/CdCMl9jEEOgWfo 5H9ajZn+jWM86TDXUEr9UFzoQ0ROw9HaoR26ppVzCCZNPuz8hT77ngfeLwnTy36u4yfN 8kj4kAE2iTPNJZ8RMdzpoqVHXGSVfTC2M9Wp6id/OfE3vsda8bgInCvBvDNOvPtKOv9h hyRCYjBWj884V+nPbh37NO+UHppmHsD3D8NiL4S9J0gEcJS7zkjsJ2bz3Se1eT+eF/bL USeiWBo095RTdByQtIYvSt+Ajfn+kA8FlQBRgWMe5ijTVFc1LnLpiF/i94lFkSr78DZY c51A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030561; x=1788635361; 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=2plosek4FqZnkL3UCaYJ0f9rmIWELlqNc8zdmdPP/o8=; b=Cr8NM92z6icY7LAcDKbvy4fDhHqDzUFuVPcZQbT8ERaoZduk9rWI/PmNnxP5jB1Pwu +x4XdKNSpDWU5R3Bxn9GtZm+HYtaBx5DS8Luxd8jDPmKbR4hZxJJiBalMyTbqJ9By7h9 ein49C6Mbt4xGVulb8qx5ffU4DrT/gAMzsmSQLAtLgXffx29D0q5JQwQm5R11KziTVbA Wnm93VQTZOJKW5yYqDQ8YEVwj+eVIK9y65MvVmdqIMueeV6WgvGUdQuM3FgQ8r7U3rRr YiKGkGTRMaKYQnM9meDJ8YuOQSA/B6JAHsEIQgHibTm2zbxvfzw3L0T7C3Des68AwcdB +MQw== X-Forwarded-Encrypted: i=1; AHgh+RpPv9SHUk0EhXEzptcxd6Ag3GgCv10rLnOYXNhAUpHlwKmFj7gSchPthS3pe9Uhrty7fqzn3AZ3eC0yZps=@vger.kernel.org X-Gm-Message-State: AFuF++lFkS0Xdnnd718i63ScskOFF1eZpymwZlH4Z6/wEuh+GVrweO9j 5bSqHlgxwndebkH+gugDKozTx5IILZZuu33pP4vDGUsAeR26NAr6R456GZAZ+KfXe8NEnstGnin mc9okF2vZZCKI4PE2jayLS1Rd+fsQ5deXSzmzdtLyD0FVrQEA5xLHHhnB5g4aSQ== X-Gm-Gg: AR+sD12UTdKIouhQkBpNsuJkmyq7LUTxtKlhz/8Mj+3Tnnb2BmEPLX1flqy6UDHl4PW b5EYt0B/utRbQ4CB/JWNidBTeY9lTrFMFOSdba9g+xJpSmcSVJHR5GDl9Sk7po4z+FtxtMRjzK7 lAwrVZqMRBkMTXFARst7CCyPzmcO3jDHiObrBOot7Txcu+7TYjwMchiu5KsGP7qvTncAQCYwAfG I/Bme6YLlvUQ4Auk/sXn5I7qG8BXh2YZHMZM4zpS1298x1BYant31JfsqEIDtBYTDChf2tGtNHX TZcrx9Xt+jL5B7VUaO3HVRH9l8sd2kWGja0PZq4u4t3/59U8Rv5b+oZp5nh29K7wkuTec+gzgC9 LgM9mXCN6wXDuq6VX9QdC4pOZ3X7cqWLvZsDxSRmVrQ== X-Received: by 2002:ac8:7f11:0:b0:517:78c7:d93a with SMTP id d75a77b69052e-52fb940f275mr189376651cf.16.1788030561684; Sat, 29 Aug 2026 12:09:21 -0700 (PDT) X-Received: by 2002:ac8:7f11:0:b0:517:78c7:d93a with SMTP id d75a77b69052e-52fb940f275mr189375951cf.16.1788030561276; Sat, 29 Aug 2026 12:09:21 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:20 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:00 -0400 Subject: [PATCH v2 1/6] mm/page_io: convert write completion handlers to folios 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: <20260829-b4-page_io-folios-v2-1-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=2005; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=bu2FKT6Zpidj2DaPOQ18Cz+j6n00zUJsobxVdi/Srlg=; b=SPYQA88a1LAIj2ZZnebxGr/3d/I52y8G1s/0Lon6h/WCJaTMjUdonRWdeaHSGfbAeW7dGmWcG c4+4WEPqIaHDWVvjeRp5+0FHnBusNxXIl3AcpeV6qrFoa3+y46ooI4L X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-ORIG-GUID: U3S8Cc-DpBSY-HW-3p8nkt9QDfAea-CM X-Authority-Analysis: v=2.4 cv=B6qJFutM c=1 sm=1 tr=0 ts=6a932e62 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=usPcmh10W0ubT8QP8_c3:22 a=ufHFDILaAAAA:8 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=rmnECYv2iy4ui3MlnykA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=ZmIg1sZ3JBWsdXgziEIF:22 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX7VTYv9swMU0P BGRmBG1snmG5gR1MiXtg1pSrebT7U3usIgJIekqBc6PlYyRjTWY3hVwEBrCo3UYcPj+GzWgTk/B h+s5rBUsGWTVGqJSrhi1W+ddUX6QU2PaDQ5A0NNnplR9fcKrqFjk00AS02ypO4o4bol8zeX5U3y KH5AvvZYKHWRF4ImawJrqqEVxmjqGqID3lNI/T3PeMy600W5QeWUPnSfTjQgPxbLuO3+PWJ0KhR Vssdkz3NGzmpPRSBKwxEiwAH5xlYEeaZ7SoDdgnd2gbBNLXrtUvYsDR3Sq/AxgX1J3VpfnM0H6G TI7eJLgrApk10+nmpmFmSMpuCnrFQTl7MJNFe5/3sP2xEUs74mmnTAoh+t0EYgdSelr3RkWFENB ozBiEImC6X3wghAOGKCvqZpD5PPgcyskm9vrhZsbIQFirv2BPiN4rtwSnnRQhY6YWQnzOy+ieXB k5slK4E9jgbiERpoTMA== X-Proofpoint-GUID: U3S8Cc-DpBSY-HW-3p8nkt9QDfAea-CM X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfXzsSVy0/mf3dQ SbQTcijt5HD2p54t32gSqc09P704Q9OGpMmswNm0yAonW+s2pRtrkVrFb+6iz4wU67pS5uMZ2I6 1h7y3gZU8TY/f9Mm9hhI7Ewxc2usktmIa+nyS5C8z2GiqweYSrrt X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=10 clxscore=1015 phishscore=0 bulkscore=10 priorityscore=1501 lowpriorityscore=10 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608290165 Convert swap_write_end() and swap_fs_write_complete() to operate on folios directly instead of going through the folio-compat page APIs. This removes calls to end_page_writeback() and set_page_dirty(), and the last caller of ClearPageReclaim(), saving two calls to compound_head() per folio on the write error path. Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Signed-off-by: Tal Zussman --- mm/page_io.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 88962571cb93..fbcf58ff292d 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -497,13 +497,13 @@ static void swap_write_end(struct swap_iocb *sio, boo= l failed) int p; =20 for (p =3D 0; p < sio->nr_bvecs; p++) { - struct page *page =3D sio->bvecs[p].bv_page; + struct folio *folio =3D bvec_folio(&sio->bvecs[p]); =20 if (failed) { - set_page_dirty(page); - ClearPageReclaim(page); + folio_mark_dirty(folio); + folio_clear_reclaim(folio); } - end_page_writeback(page); + folio_end_writeback(folio); } mempool_free(sio, sio_pool); } @@ -514,16 +514,16 @@ static void swap_fs_write_complete(struct kiocb *iocb= , long ret) bool failed =3D ret !=3D sio->len; =20 if (failed) { - struct page *page =3D sio->bvecs[0].bv_page; + struct folio *folio =3D bvec_folio(&sio->bvecs[0]); =20 /* * In the case of swap-over-nfs, this can be a temporary failure * if the system has limited memory for allocating transmit - * buffers. Mark the page dirty and avoid + * buffers. Mark the folio dirty and avoid * folio_rotate_reclaimable but rate-limit the messages. */ pr_err_ratelimited("Write error %ld on dio swapfile (%llu)\n", - ret, swap_dev_pos(page_swap_entry(page))); + ret, swap_dev_pos(folio->swap)); } =20 swap_write_end(sio, failed); --=20 2.39.5 From nobody Sat Sep 26 22:05:07 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 C3C732F7EE6 for ; Sat, 29 Aug 2026 19:09:26 +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=1788030568; cv=none; b=h+eSANumUR8qNjeJbudA+sCAqEgV2/HdX3IAbCm/p6kg5QsI3KbbUxUkHw+q0RHgkbjJt99ccetl5zIXbpyQVW9QeKTeshv1Ggu3G6JDXlurPpq/nPPw9jygrVQcD6n+l4af7wzSjnphp65GqpqbsdF4pEKkMC1K0sOwe0WG75c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030568; c=relaxed/simple; bh=BCcl2zDAdZHFcBdl79793ehAAmV8GYAzBaIVfNMP4qU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H25SkPeqmLv32ZGiXLKzcNUW4l6a0giZ7HnG8FluAAMkYAMDaJj1eW2sz6H/I6dj8BZ/1kKhECMmoD29/XxJvwzyeQ+w9rwH1NLKMtQ27hBm6zzncWiwRi8UdROuQz7pcg9xoW8q86P9kL9nhvpYZgM6AcYN1sa9zGUQGsg3nIo= 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=uB3xh2hY; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=kW2FS/yX; 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="uB3xh2hY"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="kW2FS/yX" 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 67TIZVg71211799 for ; Sat, 29 Aug 2026 15:09:26 -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=tU6k dSXF3QmqklrLl9ZtFiNMxMnkDC8HoR+tVfS5rbk=; b=uB3xh2hYIMCJRblC/zPV 0H+SqjqEnE5Y0CZXxMeBBBrGThAUy7m6XaO1dlLVeAVABRspY3K6xY48l6JbR50i d6k6rF/HlornDEWpsTDl0Fii8JDPFT6HEm3s7nfBEheEO1bZ5GzO13rcZW9FwJX0 lS9rq7SrPGWIzWERzmEJzpZI4/ZAJG2utHhUEyHWcIrlX0G6gm/xQVN9PIXgKa2j ZXrtO0CITxDjY/bnvDo5wMNz1gx2KmTBUMCHpOBSi4vuDSYdk1CrW+BQNcX7GDlb UB8PmtRaeu1tMREYKZxQdIItf41ACW2korCyCZzm+8QBglfnYIO2z84eCYX1cD/i qw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbufx2rmq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:25 -0400 (EDT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52dcf1bb6e9so44797331cf.1 for ; Sat, 29 Aug 2026 12:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030565; x=1788635365; 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=tU6kdSXF3QmqklrLl9ZtFiNMxMnkDC8HoR+tVfS5rbk=; b=kW2FS/yXhWapg+XMkKbxq+j9RT88Pw/adFRqKy9ntgISUuswLvFD2b3NFxYKsSRW/F kkPvcngOT4DV1M0/HMc98cZicJmaK+MDRptona6kbD8uXNk7vu10o+5rfgMC0SBoRHpl PaUnMPQIfD9mLZyRyxEBhEfBsIBSdG32wf3STIXIKI11j6izJbHpEtA3AluuSGFyVfPN /iQMW/E8SJYsc+O0kmhrCl4DNqGt8g+75M/H6CFNgNwk22EqJkHxTtMkXcFOpHXBrz2q bVstxSuOwZ9qamHTiKZhmRkMIKkz0nBkGEBsQonyc1U2SmpkSqrUW3rI1X1AOm3HVJ4j +a6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030565; x=1788635365; 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=tU6kdSXF3QmqklrLl9ZtFiNMxMnkDC8HoR+tVfS5rbk=; b=Fus1YHH2vqHgV/DTJCkGJw7H+8C5y6kLkm2BRK8Ryqbwz9tHAIoXh7mpe3r8OSCJJk IThbwtNP1qMS4woD1QIY7+iMxrq8CKC92Vi6YGnK5bBixVZw43dnAjAqo73TFrhSf89W zidwezcY3itjskBrDoyeB4y75fOGd0PQWg3/aob/Ohv4UQzI1BSThwrDhhkfHLRXccGT PPRjYL+QkmPAUeOIrJ1U0nhk/6p2KrPe8CfqlZOM6WwhsaTLh/FJud3FP077Jhc5bDHT MzH36S/MmjXmX/l3/qmPW9sXCxJh1TzYRJiX+GnMa7WUyJBc++66WaUpxUHSd68vOYHb zJDw== X-Forwarded-Encrypted: i=1; AHgh+RpWBoOMNOEoUrtEMtHxumB5jmkpuxRcR8bYevHQnStvhXHFtkstedSfDH19c9aW2AnObUNhLtM27jRHoHA=@vger.kernel.org X-Gm-Message-State: AFuF++mruDtUtwD3N6JWJcq1+ZGSn6SuYvO+lKBulCW0fsq+c1zPIl8Z qJ7kBYlPHVPVss9fkTKgVNtqkZZ6gtyOtLm0KZbZOIT44CGf+/ctqM/4itCmVsP5o7CrQUKd3nM UU9WVCDl6aPCr6BoegGzRwLivMJ0iDwDG2dopUqkVPZbD0vTlIsT5fniJlDohuA== X-Gm-Gg: AR+sD13opRLPFscDn762nwvdicbn3A+dUFsvRP9DX7NaOegyd0IcBoDjH9nRb9oumSQ X44hWxS2a/H8tMc/oNZI6c4/Iqpz2HQfbJOxFyRoK/09yUpJx8bDFR2enrVOAYm2BpoQnXrWZ8f Hyvi7BK1WHP2l2NO9hF85a7Ib8JaWk3a/bujPEUQ+yBgZvx2Bq6Wks0jyy2FQQ4JTXhp0cIRp4o JCJT1lc5StjhDI1RsHgl92l+nqnJimqTGPJIPBF51ZCNw9zgCzKe1rESpeC/+OowKe+eujhHizJ 7V4j/d7rzZm9y3nYm1szdz0TaJueMic46X4PGYdA+Woj1fov/r5/JnjLO3AaApZbITJuYrlGCrQ SSrJEM4suMVA93QterMXAbFYsqwQBuBnsYZfsF82eow== X-Received: by 2002:ac8:5f11:0:b0:52e:1e5:45d6 with SMTP id d75a77b69052e-52fa1a980c6mr256846631cf.6.1788030564837; Sat, 29 Aug 2026 12:09:24 -0700 (PDT) X-Received: by 2002:ac8:5f11:0:b0:52e:1e5:45d6 with SMTP id d75a77b69052e-52fa1a980c6mr256846091cf.6.1788030564433; Sat, 29 Aug 2026 12:09:24 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:23 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:01 -0400 Subject: [PATCH v2 2/6] mm: remove PageReclaim 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: <20260829-b4-page_io-folios-v2-2-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=1135; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=BCcl2zDAdZHFcBdl79793ehAAmV8GYAzBaIVfNMP4qU=; b=14EcgAuY3De4UNPWTxyA1/SmrS+ExW1ZYGxseS5Q3cBlLwJHB+Zz1/u9LTefMgLRnhzLxyAEv HqHDtZXa3IDALuQ9bcTHL4EdKMg0Uwd10Zx16kVEDvPUdQpmM6VBMsd X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfXzSZSs0au7/wu OS0RI7GCFFwPrfThwRA8vAnrV2Dvxm3aGFby22dbzJ6HPz354rbPsqRw3mMOyNGUxqq/qPt3dNN TpgWgDboN5fy+Zhz5gee2m048+AJY0N0GOetj5QDKeJXxf8KaNTx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX8TYx4mNKBLJg dSWPqY/+n3kPxkTeSNIeW5T3EVFC5qxmfJMBp3prtg5GJxUuBZnoJ3AQvdFw26rAvwE3opgJq4X t6xqvAblNqEVDVKKHOWg/onoTA7ecA06Kh4/s6kRFf1V9n7UdBNidadHGudl5E/IsDutV4lyD8I V5OgVzR8qsoIJ3etPahkKR+Ugn8tCJTH5QBipJgDli0njkbZDa+bAHu8JZQwtEeHFWUCorsJhHv JBfS8S9A1ctuW10ZWFXeaPQaEauJbNG2Itb6B+pri+2AeFQor+kzaYLOw48XrjiwQugwcQEzXiH vkHP6enrDOhGNzt9+6Phb3is/Bc9aJKhDLByz2c4galWC1IAeOo6B5U79Jo5ZK6t5UHd9i/H8VP SZyy5J850S/x1bOrWFHcaXEU6J6WIyl8pr+xEpYIDMiqa8KiaFo5L61qqqUI03IjuSt2+hTz2Pz xtdkFP8lCjDGjKiJMiw== X-Proofpoint-ORIG-GUID: ZK9wkD7DwDnqBL9fSnznmvt2Ps_n-DWh X-Authority-Analysis: v=2.4 cv=BoitB4X5 c=1 sm=1 tr=0 ts=6a932e65 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=svvvyxlR1OQQkelhaPoB:22 a=ufHFDILaAAAA:8 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=dpU52ea7H0PVM4Hx00EA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=ZmIg1sZ3JBWsdXgziEIF:22 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-GUID: ZK9wkD7DwDnqBL9fSnznmvt2Ps_n-DWh X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=10 lowpriorityscore=10 priorityscore=1501 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 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-2608290165 This flag is now only used on folios, so we can remove all the page accessors. folio_test_clear_reclaim() is not used, so don't add FOLIO_TEST_CLEAR_FLAG() for it. Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Acked-by: David Hildenbrand (Arm) Signed-off-by: Tal Zussman --- include/linux/page-flags.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 7a863572adce..ae2ebaed6d4d 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -593,8 +593,7 @@ TESTPAGEFLAG(Writeback, writeback, PF_NO_TAIL) FOLIO_FLAG(mappedtodisk, FOLIO_HEAD_PAGE) =20 /* PG_readahead is only used for reads; PG_reclaim is only for writes */ -PAGEFLAG(Reclaim, reclaim, PF_NO_TAIL) - TESTCLEARFLAG(Reclaim, reclaim, PF_NO_TAIL) +FOLIO_FLAG(reclaim, FOLIO_HEAD_PAGE) FOLIO_FLAG(readahead, FOLIO_HEAD_PAGE) FOLIO_TEST_CLEAR_FLAG(readahead, FOLIO_HEAD_PAGE) =20 --=20 2.39.5 From nobody Sat Sep 26 22:05:07 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 5E8D141737F for ; Sat, 29 Aug 2026 19:09:30 +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=1788030571; cv=none; b=K1ToytN0Cyicqh9b+mYDP0H+X6C4iVoGW6CeaULZwDafCZ+hy9Fp6E33UurtxgnmQiZoWOu2h7RlSTW+8J5A7aPByK82e/dyFk4F3rbjzPApNo8LRER2IDblNz7hkaWAjgwJD5nwV5pjtLRG+0l5GyaedwHTkpOY1mMTuQKyb0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030571; c=relaxed/simple; bh=3mETznkI5OH7f+YXwonxhIQNBhySzPV2vF7gnTTFy6I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dkifsAv5uLw71UiBV67wuva/Fto9LnJ45dwajNrS2x+l9vHwn3Fk0RA+K2YJKDDSFJsRn1Lfwl4UVV6oQapdZIRZ5rqflVi1dDXtZJHwZv0RkX/MD8o+aFfLdfB1KdJer5coeSRaOcZAruePlRBw9J4B9HOs5VZosiVXT4gfsjA= 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=q78TxGpU; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=v5vbEQ8x; 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="q78TxGpU"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="v5vbEQ8x" 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 67TIZHLe2638518 for ; Sat, 29 Aug 2026 15:09: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=Qd8c ecCELFD5bdWPS8BkzXqz+Y6D30q+8Og+jFoSTy4=; b=q78TxGpUNktCCwYYDZWa B6x739MK/D/w2tDFAhYlffntu1bm0LIrUXNEgo5ieW/SRpnx60Zbb+L031/dldzc uuFph98K+q9OPb1UqpecJZKQxKzIJlLPMLRDodSUtovneH6CKtX/LuhA3fsqnsCt fhPbOJYsxs5rwhjScQcZ4ml51hwBxDOoUrqPRnnNP8CFFOShS91075NSkboyBPo6 B1NsQ9DqpuIrs656RgEPv/FeCOu5dFNXdv5QJOEQk7CnMBhkIdqhdg8V2or+GrWR s5rpFyukAdoQJ9vPZKdq53dCsTE0ks5e/slVyRkMuxykIeJGEmGPqoGCnNG6BJNZ 7g== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbree35av-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:29 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-52fb2a46cb5so54120691cf.3 for ; Sat, 29 Aug 2026 12:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030568; x=1788635368; 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=Qd8cecCELFD5bdWPS8BkzXqz+Y6D30q+8Og+jFoSTy4=; b=v5vbEQ8xWoWAB6J6Ped3NHKhZnEXPpI58TxqTjsvTlxlyWGrlqm2HreSoniNc/fvyE n9fX9JbOGbnNbIgSoDTf2imKLXkxgQRamp+d4mUyQIafDyX98nnEIGaMXezdWeXpLdfM vihdLAVJRxyvDhOSnWRekq4KbIJagPU9biaRzP8d0u8fr48qWD0orFgZ12xsQcoNg6N1 VBOSkljxvVaOcQ6vhhWu1HT+AzFFaRYFfMgtiNIzmDiuM5dK1O8GN/+Asl41/INtc17K xNHEP7ZLs2DscQT5PR6LYrjjFKVxLrLlV99Z++Y/61rXvJq2ogkKUt+nXTVIGfeRl6SV LKaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030568; x=1788635368; 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=Qd8cecCELFD5bdWPS8BkzXqz+Y6D30q+8Og+jFoSTy4=; b=g6EOIdF6RPqmvjh2KQod3T08je1RMZZ8esza1Ff0frOZbO1GoLEpzbxiLgrP+2FZ7k G1JyOS3cfn1My7NVPF2G83LS4xdhh+kkYb+dE76SMR1UwUsTMUAYmqfq1O07o05oB1Nq 8LctNqlPr9xXGRt8+ylHaJrsxt1+pKJ8O8CreWenJx/X8LqFp0TseWQMhQY/oDYsk0OI EgSq1VFDPSl3VuIPI3G2LBVeSN/Os/0OcDY6w9ay0HjBTPaEazjyVU5cRP3lrQu7kCUl YlXU4VnAykoj1iaJdU51G0mTYTQXNffm/kB9E+WS+ze/BcxUIE23E2JjnBCMtD6xVOZq Qegw== X-Forwarded-Encrypted: i=1; AHgh+RoM40j+yZ5OpKBWrgtqGBy8tmwjwq7rw/vy2wR9nCYnXtm/2Z3IzHB6mR9YFySIVgWBQYrQrWQfCZFpcoc=@vger.kernel.org X-Gm-Message-State: AFuF++k4wxfNOsZLEXotT/3QWMf4C/tZXbbPy7fMybA+Efdmt4ECM2b4 9tRs7IsehaOB+9eSzkoip8xHydh4a02D6YwZTSpmwdz2H/Ac7KD0GBwG/pBhWpOMA1lQe2SuFvV OMfbOCGDfFrASvBSsm8SqmZ6zuy99jF7ZRAUA/4RdXW0BX3rCEOZCWBzWpIzLBA== X-Gm-Gg: AR+sD13CQJCsTBcAa0D0QSZOsodJQSJ4VKlkXgaLpMyZzgmOFaN7lwaVZMbY7CBEwor UzYqh5sBE3Waeb/tiritR5rJm5NPG3AIaDoCQVPrD/H8IoTWP/UWMJ/rq0F8tG/wTQt1o5yaM46 9VoSSyPobaHtmvIEvjZGO9hq2A4IZmhjgjjcwRYKj9VELMdeGqbjtYj/n6vsk9jhnQ2yVBINXbn 8NpupBQQ4xQS21NlHz0f8yp4k6BbFMREKmInK8CV5U8tevRBLysVBLpmRPv1AMPK05G3t/MTKGE W6uYyxbs+2ZkxaJLUysJZW90oUhF8avP2NOZRDaC3FbCshb+4pykdbAk+Brhtz8m7urlNfYasvl WYyX4pI8I2zac3l6rleuUeoVlEIhg/pw96Hn8vLAkGA== X-Received: by 2002:a05:622a:60d:b0:527:43a:2f31 with SMTP id d75a77b69052e-52fb9406840mr173558821cf.15.1788030568257; Sat, 29 Aug 2026 12:09:28 -0700 (PDT) X-Received: by 2002:a05:622a:60d:b0:527:43a:2f31 with SMTP id d75a77b69052e-52fb9406840mr173558331cf.15.1788030567802; Sat, 29 Aug 2026 12:09:27 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:27 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:02 -0400 Subject: [PATCH v2 3/6] mm/page_io: use swap entries directly in zeromap helpers 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: <20260829-b4-page_io-folios-v2-3-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=1980; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=3mETznkI5OH7f+YXwonxhIQNBhySzPV2vF7gnTTFy6I=; b=qT2xa4TBuFq785SRkjS6czWfdHiCo+8CrJ5OYkcXFJOK+hO5vVuW7nLuEhFRSMSTgJZRv7qa7 SjUMIiZXOi/B8ZL0k3knMQ5cuM36lRhwSnNOk1JHm7uSWhvBn0N5zlL X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX7EGOvPga3GaH M4zkS7BtRzFC/9LdRZcP7xSlPKHQnFELUXns96m/UvxpYYde0JouDs5V6NT5yiPC0FeUvG4Akrl L1PdH4/051RySPkPui+EMkXFfTj/o4/RpgJbqkhJI0iFBEuP3YHG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX56e/0Zbo1ZI9 0Jhmw63p6tjTcqqfBfIOHMeJZ1y76VK8wWoqa6M7cBLJE1WabDKz/4Xy9FitjXUWngY9J7RKv1i sd0Ekq359vuDseDPrmKa9bydLpUC4Hqt5Q7V1FEYYpMf7em3HhMFxkg5qLGgpEANH1vGpPpKO4E XmXYUiAtp+LZvTN8hF1yA7EegN0+cVziHceoGH1YS0y1b7d2mPbpPvsmPO00+ENxBHggbfiIai0 byp4iJVs/iLh91kyRstCOI0fLX56ae44xgOVG61MeXtLK5to6LHewUcFZm0OVLshB2bui0LneFS UEMOoqUoTJgNdpCnIArCBdw2zY1LtemGNqDe7IBVGbjjjpVoEAsxpey9GFyv1LWiZBfPoC/1NNN xOMrw24/HStTuNOgCM+qG5y94RRVmA3P1pWjxvwhMHG7tkyyR8362QJhte40/pap+nYGGVqEd7L tO1Bp20q8CvXnMBSeQg== X-Proofpoint-ORIG-GUID: ecXJIxE4BRD3h6S3FNQiylj70FeEIOT4 X-Proofpoint-GUID: ecXJIxE4BRD3h6S3FNQiylj70FeEIOT4 X-Authority-Analysis: v=2.4 cv=JtHBas4C c=1 sm=1 tr=0 ts=6a932e69 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=JR4YdQiviy7OQf72WyZ1:22 a=ufHFDILaAAAA:8 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=HViwNVsgdNRDn9LUnL8A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=ZmIg1sZ3JBWsdXgziEIF:22 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=10 bulkscore=10 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=10 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608290165 Increment swp_entry_t::val directly instead of recomputing each entry with page_swap_entry(). This removes the last struct page usage in page_io.c and saves one call to compound_head() per page. Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Signed-off-by: Tal Zussman --- mm/page_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index fbcf58ff292d..dd95cdb0cd7a 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -160,7 +160,7 @@ static void swap_zeromap_folio_set(struct folio *folio) struct obj_cgroup *objcg =3D get_obj_cgroup_from_folio(folio); int nr_pages =3D folio_nr_pages(folio); struct swap_cluster_info *ci; - swp_entry_t entry; + swp_entry_t entry =3D folio->swap; unsigned int i; =20 VM_WARN_ON_ONCE_FOLIO(!folio_test_swapcache(folio), folio); @@ -168,8 +168,8 @@ static void swap_zeromap_folio_set(struct folio *folio) =20 ci =3D swap_cluster_get_and_lock(folio); for (i =3D 0; i < folio_nr_pages(folio); i++) { - entry =3D page_swap_entry(folio_page(folio, i)); __swap_table_set_zero(ci, swp_cluster_offset(entry)); + entry.val++; } swap_cluster_unlock(ci); =20 @@ -183,7 +183,7 @@ static void swap_zeromap_folio_set(struct folio *folio) static void swap_zeromap_folio_clear(struct folio *folio) { struct swap_cluster_info *ci; - swp_entry_t entry; + swp_entry_t entry =3D folio->swap; unsigned int i; =20 VM_WARN_ON_ONCE_FOLIO(!folio_test_swapcache(folio), folio); @@ -191,8 +191,8 @@ static void swap_zeromap_folio_clear(struct folio *foli= o) =20 ci =3D swap_cluster_get_and_lock(folio); for (i =3D 0; i < folio_nr_pages(folio); i++) { - entry =3D page_swap_entry(folio_page(folio, i)); __swap_table_clear_zero(ci, swp_cluster_offset(entry)); + entry.val++; } swap_cluster_unlock(ci); } --=20 2.39.5 From nobody Sat Sep 26 22:05:07 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 37239416843 for ; Sat, 29 Aug 2026 19:09:33 +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=1788030574; cv=none; b=iJNoDqhdcSoph2oXTMUArrmzen95pWvrcmcF9+CvjGX67QOe6q+lzl42LE20vy3SS3wTDPaxVIVPuQpOCmPgbmGf2H1O/F553o/Bxn9oozq8wXVwmueaGYJ8hGF9+nC3VNl7gE/RLDV++TFQQTHz7QqCxQXQNWRr/oPOb6x46Q4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030574; c=relaxed/simple; bh=Y3cEnXs1YeV/0iBoVNSFQ7BAMa/E6hl2fJ5PkOunTBU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nXv4p3c1fRTGGpk4jDTLwxiknjnkyFswtlO6t4SgFWMe0PL7NLG1dpgqOA/ZZ7ynAUtaVxOo2TYVloFGuoLALc+CVO6JqlN6RWCdbuo17q95JGde0uGAfHJ3oPPgtInL+arceZk3Y1bTZ4acfAL85J1bnBLaHDE0ecxf6QT9NjQ= 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=QV1HRb7g; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=lClknGH3; 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="QV1HRb7g"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="lClknGH3" Received: from pps.filterd (m0167068.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67TIZ2kF1792602 for ; Sat, 29 Aug 2026 15:09:32 -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=E8sX UWWvgumxHaw6NteTp8vxgRbcmWk9fgTLWHiUUV8=; b=QV1HRb7gXk2P5EQTzx+V KNUFpZzKdMSgg6YR+o5qx5CaNnDiLV+godq5bY1Hf573Khmja8v7y/xNOQud5wLT X7Uh9vDnkWPqFvEZfNc2EF1g0PX59+ip4mSyI6mMJvNrwgCiuHXmGk0xWP/jpgPX LqA1zhCOncfDO/bbysqb8KXxgh3ur4SLA7joTgB/ZLTfXitsmT8E8y+OOGXpNauL IREnK3Cf3nWCg/vWzYcRDvqAfxDGCfVEf6MRFz2LXKOESWGxC2YSnc4FOYrxZXGU ELvaghMzfsjOEu6ZMf9gQnFaKtK0H3XtBWy6XNlBQXMR2cD1JkHzLiL+G2SLkx+8 ug== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbsppb0qv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:32 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c21c01cf3so42533271cf.2 for ; Sat, 29 Aug 2026 12:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030571; x=1788635371; 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=E8sXUWWvgumxHaw6NteTp8vxgRbcmWk9fgTLWHiUUV8=; b=lClknGH3GHd7SgG6qOm6APvxcVNyxiGGB2y5T50JF70O/W5FgqGRt6+3ac7m7Dc8Iu LClHAAZX77Q17bNooY/MVd9EqY2ZJJD2ny2GRTLm5EidpR+1Yz1/vPX9tnkRFGj58h+q tIVIj3COD6rLG6uY2hIBCHbpLnahbsAA029vCrruncVDP30HPbzyTpz18H4zL8dSfXMe 8RAB4FSoObmhsd0kerVmns5k0ccuuxElR0agMWCY+4eYPFNfmg9sSQJIeOx/8pWGQrn5 O6RvNVxg5wVlspPYW2MPcyoBbUR9HxYjWuquMpmgm8J8HBe2Tcly5aVYKYBu1L9mcKis hLxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030571; x=1788635371; 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=E8sXUWWvgumxHaw6NteTp8vxgRbcmWk9fgTLWHiUUV8=; b=jFrw8taXbLGv8+9Xnc4favYTEX+tsR1xaMy/+HEGW++6wHEUXLFyWuhwnyNwhuDvCr BkYpN3s7C6C2RGG2xf31MMR2XdhdozM1AjU6Kk/Vlh96tHj5QytOKL2uHbXI9vthdI2T EEmuHXW71LnjGcu9kqvybYD+noK2EbzxTbUiGYWKAZvqm/Doi29iTV9fw7/YjkIumgPY Bu6q4CX5mDZ14qzu2r03/hoE+z+sf+EjInamUHnj/YKfHLH3UKxJ7aH7JJPqcnBEcAXc EbbIlllRDpfP/xcxeoYSPgBgX3KEiAX9jqIQYcAy2WsU2hbal9756TUYpMiSdWGotcJS HYJA== X-Forwarded-Encrypted: i=1; AHgh+RoVFd3k95IX5zx8wSnTt1EwZQwn1TfVgkyEZNjSo7OTCxQUIX+s3K4tqaZlMeX4xgU/aqA8edzuhJh/nxA=@vger.kernel.org X-Gm-Message-State: AFuF++kp8/Zz2vX/sYwFV7jz+ewNJfe/gvQVPWX+Kk3BrdjRGfPFE2Fa D7qoJlpSl7RGqW/GdzJRUcHz4NJCkhY/8qoJ06AiYIuoRQjYt4zAnUtSHw8w/EkZgjPDmc2JRD+ FHyJ/q5KX1UJwwoQo77/c2bFL6p8D7D9LNpLMVJGgkRZI55wTBna5ZQ3fFwr4zQ== X-Gm-Gg: AR+sD11HX0ARUaorytO7xavU5+vz1wEP7h7twTVvSN/l4n6ZdylBRZOqNExSah9nw6C BtmNkHkdisU7YvgVyD4tJP3SRk+eRstTfLPKljTXaQeFUaSJj6DWGnb73ILOUnQJq0OordEqO9i Al40Y8lfGzBwlOgAjqggnlD98jNxswNS0Kvx+nEcbSSTex/MEzjVbEeLM8uptzRuEfO2u+l4Qzt Ezplftr06g/g+BpbwSIn6ARSUZnkFGZz6mlzhcSa0oI5hZmlNUdqx7sG2QIfGKfAoHVPRX5Xkc0 zt1ddx6V76D9iWYLxiFIP+RXEb9IEXblMZhQy/GROhj/dVXukuru85eHYFlsCKzvFk+2ItYs1Vf 7re3HDFE90IyPzL/DVCHPzB6uqeSIMVNMt35J6V1brg== X-Received: by 2002:ac8:7f11:0:b0:51e:47a4:4851 with SMTP id d75a77b69052e-52fb9374e5bmr185528821cf.8.1788030571446; Sat, 29 Aug 2026 12:09:31 -0700 (PDT) X-Received: by 2002:ac8:7f11:0:b0:51e:47a4:4851 with SMTP id d75a77b69052e-52fb9374e5bmr185528281cf.8.1788030571080; Sat, 29 Aug 2026 12:09:31 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:30 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:03 -0400 Subject: [PATCH v2 4/6] mm/page_io: rename bio_associate_blkg_from_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: <20260829-b4-page_io-folios-v2-4-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=1747; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=Y3cEnXs1YeV/0iBoVNSFQ7BAMa/E6hl2fJ5PkOunTBU=; b=L1JMeqhEXa1QnFULub28wOv3IoMKc0N4ikuTVAvdru7NNNjwsvKIFrD145lrYhmih84D/rE9Q AmolEdBg1uFAlDb+cnyt03B1zl0tirPNUPIqaSWPTeEHIHCEsEq+81o X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-ORIG-GUID: Qijd-aY_LDZP5XWkwlResDX6h9RieZey X-Authority-Analysis: v=2.4 cv=B6qJFutM c=1 sm=1 tr=0 ts=6a932e6c cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=usPcmh10W0ubT8QP8_c3:22 a=ufHFDILaAAAA:8 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=d-08HifAjaWcUkSzOnUA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=ZmIg1sZ3JBWsdXgziEIF:22 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX4VrW44RFuavR WjIREt1G9bhR3eEuIwRiI47ln558P9cRNuoLLDbWK2t8de5IOOz1wCjA52iLSM7hRbysFMxaYQH 9OpWj1dFDYEnOvvQRJPz86tN+9Otga2egNJISMauruOJS00BKC6bQcwKLFSlveOhxA0r5y3fkE5 5vuVybrMeHp9vVUEkHO0zYuaoyJdMtpYdM2T7Eo9ebF98M0/xR/4Woqgk55tDUtw8GrDXfzSdZo brB6A1HZgbT6mfyGA+UmgJ/7mZ4ii3CbsGhz+XvlrIZ+80ptWDEAe5mCP58NFMg32mhLSOjliXY E2lYlRyOwhT1X9TpMTQj+pjbhFZT6dCBaNeYCypWgdBc4aIE9DiAFJhfT3oJs4SIBNffmGL0Sj7 5udK4HEToJ4bC1M1iPDOiTK3lPc1gmQCFM/0ILQNp2i7s2qCh5IFyo85/NsCgCqLHZanCNKNlXB TgvadaS3guVl2QYm79A== X-Proofpoint-GUID: Qijd-aY_LDZP5XWkwlResDX6h9RieZey X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX0fsvBMCp3LW2 R7gtkvwzGQpxkrVd8KiQzpdEyfaIUpG2R64Wd1w1AlQAr3+PsLQ62P5k9OM/jrc66KYpDdmZh26 tS3bn/LCrfwDoAhOu3Ptrg43Y0kffMzYofGMHDtvt39GmuC5o2Uu X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11890 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=10 clxscore=1015 phishscore=0 bulkscore=10 priorityscore=1501 lowpriorityscore=10 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608290165 This function takes a folio. Rename it to bio_associate_blkg_from_folio() accordingly. While at it, convert the macro in the !CONFIG_MEMCG || !CONFIG_BLK_CGROUP case to a function. Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Signed-off-by: Tal Zussman --- mm/page_io.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index dd95cdb0cd7a..295cc6ac6244 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -277,7 +277,7 @@ static bool folio_blkg_can_merge(struct folio *folio, s= truct folio *prev_folio) return can_merge; } =20 -static void bio_associate_blkg_from_page(struct bio *bio, struct folio *fo= lio) +static void bio_associate_blkg_from_folio(struct bio *bio, struct folio *f= olio) { struct cgroup_subsys_state *css; =20 @@ -298,7 +298,9 @@ static bool folio_blkg_can_merge(struct folio *folio, s= truct folio *prev_folio) { return true; } -#define bio_associate_blkg_from_page(bio, folio) do { } while (0) +static void bio_associate_blkg_from_folio(struct bio *bio, struct folio *f= olio) +{ +} #endif /* CONFIG_MEMCG && CONFIG_BLK_CGROUP */ =20 static mempool_t *sio_pool; @@ -596,7 +598,7 @@ static void swap_bdev_submit_write(struct swap_io_ctx *= ctx) REQ_OP_WRITE | REQ_SWAP); bio->bi_iter.bi_size =3D sio->len; bio->bi_iter.bi_sector =3D swap_folio_sector(bio_first_folio_all(bio)); - bio_associate_blkg_from_page(bio, bio_first_folio_all(bio)); + bio_associate_blkg_from_folio(bio, bio_first_folio_all(bio)); =20 if (ctx->sis->flags & SWP_SYNCHRONOUS_IO) { submit_bio_wait(bio); --=20 2.39.5 From nobody Sat Sep 26 22:05:07 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 CD005314D34 for ; Sat, 29 Aug 2026 19:09:36 +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=1788030578; cv=none; b=JcPV2roFhZOxbyUZ4+P00hWFilLQAjdlt9ejeAmkv97+yhy3l9Rc4a3GjCwGWdhLQvjNjKTBrxD4bw9bX0iNeKgmXQCNKvG0PAPkMiHhZz0iBtYeco91/4wqgofo83m7lwwD6MHCJLZRryuvNzGfPsA4u76sddKuDl2k+RiMgig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030578; c=relaxed/simple; bh=QedbLtwO1bl04qwn37+9AdqEh2edhW9SRIQ3dAFkoUI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LLkthKnfFDPQJIrOAZoJcWHVw+ae2mZ49cHLSShxDJz0oCz46AarQCc/3zl8I+coaOIgQIMPIhiqsKJ3PZ3S03xP+9+W5nfap4vCIgEaf82lccp728CIhfC+7/dL6eNLNudBzyYGWMLGAQLZUxBK3sXJSsKjYdk3AZt2oh27knQ= 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=MbNwJo/o; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=E8pkcVCa; 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="MbNwJo/o"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="E8pkcVCa" Received: from pps.filterd (m0499199.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67TIZoxp1326937 for ; Sat, 29 Aug 2026 15:09:36 -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=nQnT j8WyNgh95RWq+FBqUqVmKUSQV9sehx4eFG/qu5Q=; b=MbNwJo/oOFvXzgGaKqxu dArcfBoaWYaY/Rh5AYkReelp8z5kl0rUUPGnU84J/adob7VIpR6/daVtf7oVFzCE O8zt9OlsTYzv3xwYqJj0xKHRyEHc51l5D1LeZdswdhDSPdX5Qby7FZXSWQhbd0Iy byQyjRmg6uLAvYkf9hYUbXuma6lXnmNXJNBk81NVXTSrZw4W82dV83S2m25pweqB VXBbbcUBaSv936NO5brWM4bbLNUh958dCVCszwNEMw9sJSd0aZe92bWr8g9txi++ oAoe0yKJ1xmhXcZBy+rfFCdGIjCE3cJQ2D45pfRmx4IeXCntEFYtAIC9JliQQS63 hg== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbqxhb5ve-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:35 -0400 (EDT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-52fc0097865so51176881cf.2 for ; Sat, 29 Aug 2026 12:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030575; x=1788635375; 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=nQnTj8WyNgh95RWq+FBqUqVmKUSQV9sehx4eFG/qu5Q=; b=E8pkcVCaYYSDSkCHTZnSskkXnyJAGEOXJCKZMEWaRVRLB4zdyfnNRt1OkJLGrmhF5s Y8CyDApzZwUAnAzLPgX6HG2DttUtP+Pbj8MT3qKNWI7nk42ECep2RPePuO//yQw+X10f 8vEGqJSycfn7ksssp/J2xPoQ6btSXEsMtmBLmnkK0iaZALeonAWIvn7FkTYihRDQD9ez 0RT0y9psE9G11gEiCSi9azjcnmQHN+3cFI2DQv8g3cdoOFV7/hbBjUG1t9gI7kfu9XR2 zUQuthQenm3Mfn0Ksm5ezAn3W53RY3i6R/6XbR21QXiMak1iEeIiAIKL5oMZdPhtwnVp xFQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030575; x=1788635375; 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=nQnTj8WyNgh95RWq+FBqUqVmKUSQV9sehx4eFG/qu5Q=; b=n0B6zsPU2jRtTJmFarVLrh/GwqQL9GB076K/YLviW2AaDG2QFPsG29OXbsvQB2xWA3 FODw3oBJ8XsyT+i2hKZVb06F/DT0AmnvmTbHQhS0ymykK3/1mea4t9WLdjqqTNI4dXpC Rs44yKpB2jGn6OfiRHghQQvfkte6hYF2JQhanfj6FBpGKMWoVB/Ed7WYN5UP6Mzbvu0C VTzUndhBrOL+JLa3i7LGM/ZXmU9lY29HicGuaO79yXq6vU3KTVBbzSs6+f5EoOyEAdK9 EeiQAjPaDOJSXTiWVgI77xl7UiUXJj9aFiirVW951Sefcx5dVYMZ5/tL23dnj0uAXMWD me5A== X-Forwarded-Encrypted: i=1; AHgh+RpplrYfBmULW3lYl4A3lEMSjfy7kWQ1k5z1UfHeJQc47DzIG2yCP3Cz5xKIqt3h0Bou+mPJYmKb/XDK+wk=@vger.kernel.org X-Gm-Message-State: AFuF++k69I5+nFhf7jN/GcGproF45g2nFDjJqrYguzmbQm8u45ZCKPcr MKaHR6glkfeDq48Lyd3x0xUj7je8vyEmDywxczaGOBIe5mHKHYkiMKLzfLd1LHticInBCIzOrBj b6Zq3J958tEjd9kc0BuOWNrLJByQ5Zh6lYIjGUAeuxqhu/P12PbGOT+T6jN9xgQ== X-Gm-Gg: AR+sD13mHb96MnaGTTfZK1F17mC2q5xoKilz879y1JVEkcBf/B21wgT1nLUpMZNZDCr JTe3P0LRqEe0xKan8f/KtHnNv0PSDpAZLyPX8rPug3piY8WrAFNvKrZGeUuCxFfeeV/HKKrqU3t H94VVGfrLH3CLNhTeUOTw3gE/l5FEYypxbFNtqX7eUO2Q5TAy+vbj6BRlKCm/kDUuUjhtj0cfxJ Tnh5n4XigJkEbHjyZ+ld07qJXtOUn1unDrc1ge2+GzhfbfjeCT+WRFvY9DPptVVchuhtal/c7kt Pf+oiELXvo5XIgIsuBYXAS1Rh6oKAMx0wpj5eGAVLqyrteCWeENq6cnZ3y7N6fIg8dSkXSULOL+ ykx+Td7aWDMRfx1vKNq8Oeje+5zCd3AN9WoVw8L4x6w== X-Received: by 2002:a05:622a:8414:10b0:52f:f73c:3269 with SMTP id d75a77b69052e-52ff73c39b4mr56517141cf.36.1788030574910; Sat, 29 Aug 2026 12:09:34 -0700 (PDT) X-Received: by 2002:a05:622a:8414:10b0:52f:f73c:3269 with SMTP id d75a77b69052e-52ff73c39b4mr56516771cf.36.1788030574464; Sat, 29 Aug 2026 12:09:34 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:33 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:04 -0400 Subject: [PATCH v2 5/6] mm/page_io: refer to folios in swap_writeout() comments 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: <20260829-b4-page_io-folios-v2-5-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=1249; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=QedbLtwO1bl04qwn37+9AdqEh2edhW9SRIQ3dAFkoUI=; b=U8hj8IA61aQIhcJjWSFwrECbO/7tmhgfcOkLobf5HmVWEn/qq18Q98/VuNH9J3ybPrBIFVkco FVCx1y2MZkTDta4hk9UW3dzHIwoLpBRw+5wVCYLfTVlPZ5mOOmUCRqg X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX33piVu1v4sW6 xpFvtv71HkI0siHRURIMamuNjUqx3UXLgmNgmvZM1yghJPQuwiB3Zn9ChJ3Izet4YMbPtFLC/8m pV+a7C+yWCCVccdccF3pXIhn7yDtXjXqEZf8IEBsZjpTeB2urPMu X-Proofpoint-ORIG-GUID: YdI9ZXJn7sCCUVbZYqy0mj3nyhYmusPD X-Proofpoint-GUID: YdI9ZXJn7sCCUVbZYqy0mj3nyhYmusPD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX2nF6ZoQQjhAr cD1UZX7tRvvmh4B5jTnhy1Iy3uqrwg3KPg4UePtRRijFb/fI041zl9fkE+WhY/J9fWTgLoQl24a w2+alo9you0u11OIK5w+dmkf+H852sFH8bUIf6rS0ktWJOhAqYHz17jy9h8/ONi3e2terkIgmxl cgPLQQvFgY2E8iQHLmGOWMtGo9yHdu8nwJ7nsm6p/QGDHrm7xCrYSpElD7pPLSzhdWcwPNHmjdx 1Ce8e25/++zAB4ArR4hdiWEfstZ/jfrpv0tJvA4VXLY+gjwAH2gd0iiwYDRR4YXapgrfaP8hGCe KcIvM8KEKNHuWaSGNHpInlwQA5UWhvvl2EK5b+lfb3CGm/63Wp87neFdE593Omn4KrReGRkMiNg 7GsDByPIlgOnrAZu5FoSH8yH+5fuS6qlq+605gv23NjvxFuRSS7bDHK1WR4sRi1bMp/E7VtSv8A zeu1TtRL7Ui0hxftFAw== X-Authority-Analysis: v=2.4 cv=MJpQXsZl c=1 sm=1 tr=0 ts=6a932e6f 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=G--0XuH5328wxK7v7Suf:22 a=ufHFDILaAAAA:8 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=o9dMDrf0hGvVio-mgDUA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 a=ZmIg1sZ3JBWsdXgziEIF:22 a=1CNFftbPRP8L7MoqJWF3:22 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 lowpriorityscore=10 bulkscore=10 adultscore=0 impostorscore=10 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608290165 swap_writeout() operates on folios, not pages. Update its comments accordingly. Acked-by: Johannes Weiner Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Signed-off-by: Tal Zussman --- mm/page_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 295cc6ac6244..36466159cf19 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -209,7 +209,7 @@ int swap_writeout(struct swap_io_ctx *ctx, struct folio= *folio) goto out_unlock; =20 /* - * Arch code may have to preserve more data than just the page + * Arch code may have to preserve more data than just the folio * contents, e.g. memory tags. */ ret =3D arch_prepare_to_swap(folio); @@ -220,7 +220,7 @@ int swap_writeout(struct swap_io_ctx *ctx, struct folio= *folio) =20 /* * Use the swap table zero mark to avoid doing IO for zero-filled - * pages. The zero mark is protected by the cluster lock, which is + * folios. The zero mark is protected by the cluster lock, which is * acquired internally by swap_zeromap_folio_set/clear. */ if (is_folio_zero_filled(folio)) { --=20 2.39.5 From nobody Sat Sep 26 22:05:07 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 4582E417BC3 for ; Sat, 29 Aug 2026 19:09:40 +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=1788030581; cv=none; b=pBKNvf0KKFgfIXSbRo8KnON8D82ECEHORaVE09XAsmZ15zmnkuCf6W0aEJTqcSvcP0t2lHpQoQUngDkUIwWRVltvDSCKPp8xovQTP70TgaULvxX7ir1YNQJFSc2uS0B5Jt+W522DeVpbse7VlInrhTROCD+RU64VhgqsEa+wigk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788030581; c=relaxed/simple; bh=G2ktRMgJTq06/55atnVs92oo/YszbeBoCTRq3W3l8TQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OIwd8WhMvliLL1TL6TCURwtQVS/HMYIyn+vG+4Rxhq4Y6fliiMOq6xzcKGhXY6NIJmsclPx3IwO2xUfNfpSRrYO+GoCaaRHvgkyDWJ+71MP0TlA5wL7K4yIH+8vWH8CwwRQkvxf1RZnk/qOQAN9J8wTbqYBWBRj5xL2OrLjpskY= 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=bsbIw8F2; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=GfXcl/g1; 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="bsbIw8F2"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="GfXcl/g1" Received: from pps.filterd (m0499199.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67TIZHQA1326075 for ; Sat, 29 Aug 2026 15:09:39 -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=7Jpu g6oWTGrHeweZlqYEb+sOFZBCujX66E+4i6PuPxA=; b=bsbIw8F2ayaMsOV2QzU9 C2PLOJKWGm+4XRx+SYenC+eFfeyKSFFFbQG/A9J4eH5zY9h3M2boY8Wr6Zsco3b9 9G3hl9KB0wZXSuPAPtKV1SZuNtTMye7n61iYJQpZ+YD9pUPrcKx+JA0YaMu99Dq2 cbSjWjp/CMAy7h7v4P0NDzI0UQx9z6S/2dTqWzczKw18KhMOn5K0RcduIZuYIhxJ Unu4/OCmAQzu74p6qhzsAe0mX1fv5zcLe1+92SvJ3JEpn1lAOWEQgD09JANHj2o4 5Yd+pTWgPBibo/uon0ap20LGqpYEw2izxj9My/hlCYWZi7OEHc4HDCo3Bs23Lofl sQ== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4gbqxhb5vn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 29 Aug 2026 15:09:39 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52ffe24490bso13420531cf.1 for ; Sat, 29 Aug 2026 12:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788030578; x=1788635378; 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=7Jpug6oWTGrHeweZlqYEb+sOFZBCujX66E+4i6PuPxA=; b=GfXcl/g1vKWXV1LWyDvwu/kdpM6VjkliCz0Lk806Ov3aay8oSlyjFDEuLgm6o+HyuN Fk5bc8qk3sER05vVPSKaE/s7p3dmcEwN308DzWfWSMALho92mJSdOIX1bIkJIviQ2m5A sUwrgs070i7N/Jd0sHVzQcwrvEqrVVmcdONLWitecchAD5xx9cdOv2GfqynGpmRMjct/ Jmf4F76jMdETMA73jSRSTUM4heIJrvgDOdsTNSjfXOC15L5dvJHi/Th+ub4XuJtJ33Ym OFue/RfnYFVKItMpN1BiKRzAI1zhu3Kfp1kvLAwoxwlESERT2aYBqdUucxtmNncwRLfG oEpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788030578; x=1788635378; 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=7Jpug6oWTGrHeweZlqYEb+sOFZBCujX66E+4i6PuPxA=; b=NZBvlfHEpFxwwu0xmhGHm/FgTl6Ysq4SD76ph7NIFNdyEbZF+XL0dbz2jfs5v2SCXJ iisfxkw3zih80TIDPgHQ0dTPLp2Bq6VrEAvwcGB8XZArC3YPzTON4AISvTVaruLiuxlV QmkNWHMZe1X8xc7+tZqjTL+lhIhP9UjKPjpgF6RcSNZy4vNLsDhFnTz2pcYWmJ2Qrg8s 5gx+bfquEzu1/H2hdX1zDOwiTsMlikC9kyOuGSHWtGmXLhz2HSh7af8/1iXsTZKDMWyg C2rAOYswcOmeoE3AOr8CtIVoXCCtBH+gvUsKqeeKbSNFIcUQHvKFiGzGCs3wYqrs6dne RLyA== X-Forwarded-Encrypted: i=1; AHgh+RozLLIRFWUkDGfrZrzWE1/kJxuqhX2CsGnEH7DEE2wjt0ioUFPhTtv/qiTB1M9H0Je4AL0gGFoOcsm2osw=@vger.kernel.org X-Gm-Message-State: AFuF++l069hI69EcI6ULQS1r49wlrNn/eoKiCFBAOn9HMSkpcRiTHZRD XbTwDWcY3j6n3UrQJ41YcpGwOjo16VgQmG20JnUd5sw5XA3PLYVcCAfGSt1zKE3Kcs1CByEEbO6 aMOqX2Fbln6AW3TW14eo3QpDFFfWGSP8qNklAX1Pa/1+b34uW2AX+9fXYTsbxjw== X-Gm-Gg: AR+sD10EWpvkH5WBUxCS+0G2l1ShUHFvPA/w+Ca9ElcJvaUMChvgIWYvLrYdzNwDaO7 yfIYBrstEZbCvFIG4QwSjg+mv+oXUn7tozJGudik1F7vQ9LSM9fm0nSKEGA6X25DjoTAVLl1Z54 ohnpFSpDvUsjoL0xxL6A+3nDvvpKMv/pM57PkuznfKTv1u63y7wUo4EWfPGmi3aQ8cOF3jVGNcF GUbWW2KGygxxnaFtzHfhTXRwmwtw7W4HRfEczNEvSzix8bIjmE3/Lc2BacowMCuc01O81Tm6aPC OudvdrHcOvN1MJytoGj54qQZsRH+WMHR33o1JTkT3mxkCSeo0evUvnG0McxOhDamDuxOMqhh+t0 +0UaWd3MjuW0l0gOpopXLoP5i50wsgwxkUANepVzmSw== X-Received: by 2002:a05:622a:389:b0:51b:f857:cf82 with SMTP id d75a77b69052e-52fb93d5114mr170604461cf.8.1788030578218; Sat, 29 Aug 2026 12:09:38 -0700 (PDT) X-Received: by 2002:a05:622a:389:b0:51b:f857:cf82 with SMTP id d75a77b69052e-52fb93d5114mr170603841cf.8.1788030577780; Sat, 29 Aug 2026 12:09:37 -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-49b963c3c0asm239150095e9.10.2026.08.29.12.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 12:09:36 -0700 (PDT) From: Tal Zussman Date: Sat, 29 Aug 2026 15:09:05 -0400 Subject: [PATCH v2 6/6] mm/swap: rename __swap_writepage() to __swap_writeout() 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: <20260829-b4-page_io-folios-v2-6-649728091117@columbia.edu> References: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> In-Reply-To: <20260829-b4-page_io-folios-v2-0-649728091117@columbia.edu> To: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Matthew Wilcox , Christoph Hellwig , Johannes Weiner , Yosry Ahmed , Chengming Zhou Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788030553; l=2860; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=G2ktRMgJTq06/55atnVs92oo/YszbeBoCTRq3W3l8TQ=; b=qi6e6/ntBcGd5Bt7IXAXtAUQphoFd5rvFHZ7YLCPOUHK30NGdCqvHAyO1e+iqX6QuXa87zECq p9V0LAWsCfxDlXWKV2uzpPOr/45TeS1J/jv2H/ASXR9LoR7RlBCqN9V X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX6A1tnmZ6pubZ V7gbh76kmZag+URvh6rytgPqaTMr/UDSyUmyeD+S6m2G311+B/g4+7zDmUceEIAaD//1sumrJFy zlpq9XaYrwDAatkp4Hd9sI3SFI8zNez6fVTn2O2syOURhOMz7rM0 X-Proofpoint-ORIG-GUID: pIrHISNl5yE7YJbTDux2KmZHpsRKFAbD X-Proofpoint-GUID: pIrHISNl5yE7YJbTDux2KmZHpsRKFAbD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI5MDE2NSBTYWx0ZWRfX9mR54rKN039z Q5Crg80nrZ3QJVQh2ZsSQcy+SmsVL/jTT9h02H+RZKwi1OtbfeUc9ef4IhQPSvRtqR5LiHGxob+ Hny2Fsfmwvi7vtvQDDmlqqCsQVhJrY9ae4eNh9pB1cVy6pU6YyDUkfWcDthU6GkX3Tf/saizNsX NabnlCCJSGUtl7XcljgjNQyzQGhMGYYasgARPs1PDDYy5mSpjfFoOzdaxtfOrhobXADlknSR8Gn 55ArELrRcvDY/0U4KY70lTaVOYagBCP6uFexvnhpHpAQEtg9CCjX2BYnEkiS5vZbvqVpLNQhQoQ djH2C12MlmcwpG8sqA4BiqWDo3cYGvRlisxHW1OJb1ksVogMM1bq3KwJliY8Z+Bdz2wJCRvwF9V l7a7qLacPtBx/vwIcEFfyFf73jgBazHfY3EJfQh1CmXd5CQo1vP8esg4SItGcRJbGzjyYGWQAxZ cqcxfe9bfs/ufA+X2Jw== X-Authority-Analysis: v=2.4 cv=MJpQXsZl c=1 sm=1 tr=0 ts=6a932e73 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=LRATYcvZeiQrLRB5MfbBvg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=G--0XuH5328wxK7v7Suf:22 a=JfrnYn6hAAAA:8 a=VwQbUJbxAAAA:8 a=An_WYHtdnaDCoZj6waEA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=1CNFftbPRP8L7MoqJWF3:22 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 lowpriorityscore=10 bulkscore=10 adultscore=0 impostorscore=10 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608290165 Commit 84798514db50 ("mm: Remove swap_writepage() and shmem_writepage()") renamed swap_writepage() to swap_writeout(). Rename __swap_writepage(), which operates on a folio, to match its caller. Update a stale reference to swap_writepage() in swapfile.c as well. Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Signed-off-by: Tal Zussman --- mm/page_io.c | 4 ++-- mm/swap.h | 2 +- mm/swapfile.c | 2 +- mm/zswap.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 36466159cf19..1da4ff484f09 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -248,7 +248,7 @@ int swap_writeout(struct swap_io_ctx *ctx, struct folio= *folio) } rcu_read_unlock(); =20 - __swap_writepage(ctx, folio); + __swap_writeout(ctx, folio); return 0; out_unlock: folio_unlock(folio); @@ -369,7 +369,7 @@ static void swap_add_folio(struct swap_io_ctx *ctx, str= uct folio *folio, int rw) } } =20 -void __swap_writepage(struct swap_io_ctx *ctx, struct folio *folio) +void __swap_writeout(struct swap_io_ctx *ctx, struct folio *folio) { VM_BUG_ON_FOLIO(!folio_test_swapcache(folio), folio); =20 diff --git a/mm/swap.h b/mm/swap.h index fddba7a87500..0b5d507739bc 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -258,7 +258,7 @@ void swap_read_folio(struct swap_io_ctx *ctx, struct fo= lio *folio); void swap_read_submit(struct swap_io_ctx *ctx); void swap_write_submit(struct swap_io_ctx *ctx); int swap_writeout(struct swap_io_ctx *ctx, struct folio *folio); -void __swap_writepage(struct swap_io_ctx *ctx, struct folio *folio); +void __swap_writeout(struct swap_io_ctx *ctx, struct folio *folio); =20 /* linux/mm/swap_state.c */ extern struct address_space swap_space __read_mostly; diff --git a/mm/swapfile.c b/mm/swapfile.c index 51f5a525bb61..ab9d45dbbef8 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2989,7 +2989,7 @@ EXPORT_SYMBOL_GPL(add_swap_extent); /* * A `swap extent' is a simple thing which maps a contiguous range of pages * onto a contiguous range of disk blocks. A rbtree of swap extents is - * built at swapon time and is then used at swap_writepage/swap_read_folio + * built at swapon time and is then used at swap_writeout/swap_read_folio * time for locating where on disk a page belongs. * * If the swapfile is an S_ISBLK block device, a single extent is installe= d. diff --git a/mm/zswap.c b/mm/zswap.c index 37f34e406c8e..88a1a74f9185 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1050,7 +1050,7 @@ static int zswap_writeback_entry(struct zswap_entry *= entry, folio_set_reclaim(folio); =20 /* start writeback */ - __swap_writepage(&ctx, folio); + __swap_writeout(&ctx, folio); swap_write_submit(&ctx); =20 out: --=20 2.39.5