From mboxrd@z Thu Jan 1 00:00:00 1970 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 E95D34963CA for ; Tue, 4 Aug 2026 18:52: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=1785869577; cv=none; b=euiI+Xl9FTXkvLURU2t/BYiwBAFDZw3A7/qDgfhz1x54EjFhgB7j7p8m6Y3B+ODTKVHtWJYDP+T345C/60B4MmywWvZUjCJFBuXjBucCTE7dCVxKQ6fwgeoERADGmxE4l3+hKbZoPmfF4Xf5YvYxg/SQHtFGodP4/J69/Eg44WY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785869577; c=relaxed/simple; bh=VtzqiAKIaGHunrdK+84+1QbqamvLCcoJ2tsGqghPxR0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MnGn9Gi+Fb94QmTCOXr828pP7B1yeUJLagQsyqMMKlNw7Fc+ktKIiJubXgNy8CS2gO3CMLcMOvccunYDOg5FKs43THNFuUCX2Vy1Ec+fJNDQBbl+6izLdGe+zcpOwBnUGFVxsQYQHnFgv7nUXJm3pGM0LF+yqGLjGYtH1d4/Wm0= 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=pIZFL8g3; 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="pIZFL8g3" 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 674IYMxs1998827 for ; Tue, 4 Aug 2026 14:52: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=5Z1d 1TlXkyKgDoQf2U27ofqIWC2kaIkUryg1X3S+EV8=; b=pIZFL8g3JUUeHvOt2OuV Wu71CXApi+WoFTVDKHD1/CThuPssXvgEf8afTE4woSfTDzDNlkbR7bk4I/MCT5yv v9kWn3cFllgIgzjvUCyZAozYejIzx79Na2hpfKysxhU6pXFutU9fZVq9NU119ojp QfitVEAY13o0BBon33Upj1u+6tGk5seoagnigVWhuX/VSZDbq7xi0cDKcJkhISh8 XSdacnrucuLydFB0ybrv73TudiDvxphvALvNgkRHZbYd3o7VtCmzMGOqxbJwQzt4 cz974U1Kl7j5Amd+MWNKejjew4aWTjtQtU0d9XOkhdaQ5yGSVOx++XuCVNNlGUjy WA== 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 4fuhqba8ed-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Aug 2026 14:52:48 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51bec738909so1041571cf.1 for ; Tue, 04 Aug 2026 11:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785869567; x=1786474367; 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=5Z1d1TlXkyKgDoQf2U27ofqIWC2kaIkUryg1X3S+EV8=; b=FvucI/d8kpW79Tu9trYXZRTRphYD3LznV2adlOt4DNXF5qSqhLWyiCHKqGEREBWBaD +HCqUzOWwYp5ODHOk0l6bzc2CGZnGqiVn++nVveyqzrOeAaQWEXiDv81LNZ3Rdv7bWpN tzkcyYUpzs9tR7WThYeezjxyXWbHO7c90Xa8JpYYPUET9ihBJx9I86OdHnMcARn04Jkg j9nzxIBNav+JDmXNUaw986mA6W2vc2JL275mLljfSnZ0fE7MWlGT7dDfCb+DQztYfua6 XhJrZ2DovNNSlIpjBATRA37+Qk56wT4jfE7bTMMwIM+T+/BudeD5srBdPITDpQ3mKyEy EbYw== X-Forwarded-Encrypted: i=1; AHgh+RpOQQlF4feBmCC+m1mdNAy9kqDIG5Nms3tpo3GHSNYqQklLgVV9BQTK/ChuD9jporUEaRbtc/stSDskOzc=@vger.kernel.org X-Gm-Message-State: AOJu0YxCLLGjbkofuge/+lQKP1FrF5NbbkBcw0ajf4APiTy1sZYkP24Q t79ymKvoUkVSzZpHXtwG6QKbPSVpQBqMfb9kOg2mVBbFxTX302mTwCt/l+Ehu4iPv1fyVqzKSvf BNiPz8rd3S5DOh7AbRAzOsnlNEGXA9YAdpqq7N0oqNZ55JAZszNmnpdhsmK7ODQ== X-Gm-Gg: AR+sD10quMvs7MjHQcQVYISDiEBYGe/p79YsFdQf7Pqf+e/CevXwQQj0pQQkrA3Yv/G Wk2hr9DkoKiukZ8E4Pg8LqiHhC/UQg+DeB2hcjn5Ic+3R5ZYq9ScEj+DNuMexoLJcwR00YdGSa4 6tqc6Ledhro0p3jIP4kL3lKpqafmNLOeORPMKLk1B4l5bjrEHCfr/XcIz75EFz1oTxV1RYi7gZu Myln0mMrgAEeCFpCvjjjVr7yhnt23swmzQ8gMnXA+hibTC6iQcxnLBT+VxOZYhXliAakGVjGqrT SNYSJ+0IuJrf4KdUrMsASa4oNbzdoeLExAPrPkAoqF5SmY+yEsPEUfqWsMueLbT6tMsfj/HbZQ+ zop/ZBbHO X-Received: by 2002:a05:622a:4811:b0:516:d60f:6438 with SMTP id d75a77b69052e-52ce5e01448mr16271601cf.0.1785869567608; Tue, 04 Aug 2026 11:52:47 -0700 (PDT) X-Received: by 2002:a05:622a:4811:b0:516:d60f:6438 with SMTP id d75a77b69052e-52ce5e01448mr16270781cf.0.1785869567080; Tue, 04 Aug 2026 11:52:47 -0700 (PDT) Received: from [127.0.1.1] ([77.137.77.124]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fec232d7fsm2313275f8f.20.2026.08.04.11.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 11:52:46 -0700 (PDT) From: Tal Zussman Date: Tue, 04 Aug 2026 14:52:16 -0400 Subject: [PATCH v2 08/10] ceph: convert page cleanup loop in writepages_finish() 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: 7bit Message-Id: <20260804-remove-wait-on-page-writeback-v2-8-81f0ab065284@columbia.edu> References: <20260804-remove-wait-on-page-writeback-v2-0-81f0ab065284@columbia.edu> In-Reply-To: <20260804-remove-wait-on-page-writeback-v2-0-81f0ab065284@columbia.edu> To: Ilya Dryomov , Alex Markuze , Viacheslav Dubeyko , "Matthew Wilcox (Oracle)" , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Tal Zussman X-Mailer: b4 0.14.3-dev-d7477 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785869541; l=2329; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=VtzqiAKIaGHunrdK+84+1QbqamvLCcoJ2tsGqghPxR0=; b=RyGOUa5eKloJbpygdzbwT4OucEq/qVhavJ6tD6H5WtS+DuBoeRpiGXKJb0kfgATrw5uo/X1hn fWUMpT5dvtsBAAGgVN8auf5poVNA6xzYJwPO6B0z3lte5+1ZD1v8SZ0 X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfX4Wx6jYhkuiZj cW7YUfwL6b87nlFFtFfFpnPlJv6UDzPp8RNvEsuk1U0x0Yh/QhFA4SyuBMGUQTcnK48ncVFsCKn yg9b/ER/j2/y1TtPC4ZW/q/n1lHMjWPg4G00xm/LvgMbsiKUuEtR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfX+SRAzSFSdVOY t4YBVWxLcoUI4DH8sQNkaCvxeInCSeSgCEgs8rZo45dDmaz5Tjv6X2wlsPhkgzP9Z/QVtuPTMMa LLXwAClxPyVYJm73az1s5Ftigr7lK4/siKqc/JANPD2KkMLDr+bpdt+LlVNFF8wYoNZEAUIDrtA secf4ke9Je4B5ZtE+rwOUXNcEi+FI6ciQD6rHmkPyXwSkbY98qv03GQHYEdGkgx3yXtD6zOh33Q cwH0sSkk9yciTjx9fOcmiDEw7oGoNtgUr1crWdZbqVeQvU0gahxlh2ltefG76mvu8ZrXJhE5nsI LXAUTDry2DUnzXyXrlFibJ/o4rgiqB2iMkPPCqRWmv8l2ZE5QJa7B+2ryUYQvXbxQIc62Gga9Yw uq9fDNplKRsPD3Y/3aChKxoAmc2PBder1Mo/0qKGcuX14Qhw8coL5O7979L2crLqaGLNGZEbj+i J3DVfZ/9UCfrB4hbuPQ== X-Authority-Analysis: v=2.4 cv=dsnrzVg4 c=1 sm=1 tr=0 ts=6a723500 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=j1J1DEHOHTVaJYOjuVnKiw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=svvvyxlR1OQQkelhaPoB:22 a=PHYVD-oPFUEr7kX-Mb8A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: RU2rrICDxqt7OCk0FpFfcdAbVs2N_qs5 X-Proofpoint-GUID: RU2rrICDxqt7OCk0FpFfcdAbVs2N_qs5 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11865 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=10 clxscore=1015 spamscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 bulkscore=10 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-2608040152 Convert the page cleanup loop in writepages_finish() to work on folios, resolving the folio directly after fscrypt_finalize_bounce_page() has replaced any bounce page with its pagecache page. This removes a use of detach_page_private() and five calls to compound_head() per page, while adding one back via page_folio(). No functional change. Signed-off-by: Tal Zussman --- fs/ceph/addr.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 59e559bdfdff..eaf5b3f6d13f 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -896,7 +896,6 @@ static void writepages_finish(struct ceph_osd_request *req) struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_client *cl = ceph_inode_to_client(inode); struct ceph_osd_data *osd_data; - struct page *page; int num_pages, total_pages = 0; int i, j; int rc = req->r_result; @@ -943,31 +942,33 @@ static void writepages_finish(struct ceph_osd_request *req) (u64)osd_data->length); total_pages += num_pages; for (j = 0; j < num_pages; j++) { + struct folio *folio; + fscrypt_finalize_bounce_page(&osd_data->pages[j]); - page = osd_data->pages[j]; - BUG_ON(!page); - WARN_ON(!PageUptodate(page)); + folio = page_folio(osd_data->pages[j]); + BUG_ON(!folio); + WARN_ON(!folio_test_uptodate(folio)); if (atomic_long_dec_return(&fsc->writeback_count) < CONGESTION_OFF_THRESH( fsc->mount_options->congestion_kb)) fsc->write_congested = false; - ceph_put_snap_context(detach_page_private(page)); - end_page_writeback(page); + ceph_put_snap_context(folio_detach_private(folio)); + folio_end_writeback(folio); if (atomic64_dec_return(&mdsc->dirty_folios) <= 0) { wake_up_all(&mdsc->flush_end_wq); WARN_ON(atomic64_read(&mdsc->dirty_folios) < 0); } - doutc(cl, "unlocking %p\n", page); + doutc(cl, "unlocking %p\n", folio); if (remove_page) generic_error_remove_folio(inode->i_mapping, - page_folio(page)); + folio); - unlock_page(page); + folio_unlock(folio); } doutc(cl, "%llx.%llx wrote %llu bytes cleaned %d pages\n", ceph_vinop(inode), osd_data->length, -- 2.39.5