From mboxrd@z Thu Jan 1 00:00:00 1970 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 DED1948167D for ; Tue, 4 Aug 2026 18:52:40 +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=1785869563; cv=none; b=m4UH/diE6SKQP78m5EUm/6ycEmTeKCcJSQBE5NPPSqK3LhY1xKXpxL8FurPzhqRPf6SLEUrRgHCbgs3eKBg4q4F+qFJ/A02a3mEjj0YxArUMfBDByFuV9Jm6E0b0aN1mWFBFx24hV+RyR6n8YvQMI2K6JMoM8til0fQfF6T1xks= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785869563; c=relaxed/simple; bh=ot3FCX4ZCWU57RESMTwlWgtG0MyckOFVRrjXpb8SpwU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=meipFVQeho3DULT5R3f0QoXNF5yvuqz6jPs0hxmfGGQTdvZKiquteZdrACxx2QCz65duDB+w6BnD2bMBCmWB2D1Wm3n4NFt/E411bJCUZV0h58ntLkMZge4oyjdwiEEdV2GPrReeKmM7iqGiG3hySYn1ON6C6328snMK4C8chXY= 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=G78mi6xc; 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="G78mi6xc" Received: from pps.filterd (m0167073.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 674IY5fu2226860 for ; Tue, 4 Aug 2026 14:52: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=BNbC kzyvx9N/XZgbSIGNDSvN3Z/YrabAYl1OWD2SP+8=; b=G78mi6xcsQXFKHaZtMTP 7FtylFLk1t4NNKdPbdey181DbLVcoXG6IcUSOJHB2ohSG3b1W5EHxqG7QUFThdyk 8QUB3cNlvoIBHjb2pO9Tu7vpSMIHgOazX6W01NXUOcgJezLbDoG9jxTIKDn2itoL 1D4HNtq+zGQ5ieTFBktPA1TxjrQ6L+xc4jNstO//DjJ53lRMMtYgGhMEYSDmoBW9 WJCEvwKsECe1Ara2ZAM26KNEwUibjEzKmwB8RbQ/R6z/MOrQr5QIxeFBOFjk7lWK zI13yRZ3YZto9yQtJnocn7PrEc1mBrwg/TIXkGBmBz+658N5eT9NysiCkWKKVP+0 ZQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4fuhh7abqb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Aug 2026 14:52:39 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-52769fc3f2eso1291281cf.0 for ; Tue, 04 Aug 2026 11:52:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785869559; x=1786474359; 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=BNbCkzyvx9N/XZgbSIGNDSvN3Z/YrabAYl1OWD2SP+8=; b=C16+zKAdaapwbLJFfTo8TjzRpMhMNwvMKkgDLBxhUNN4LduxhXVWooWJc3uFWyOnv7 foUZgj1fy0OB0d4rcubRNheeEI1GhPGXaVkZK8lv0M76OgKAudTivr49+IzukDFKNmxk TZ30Rrzv05MfV1/f8lMLj69bXckwZzs39Ne6nrCVykLWxb/bdMV1mar+r/6PlpKfrYYx 93iMgN0h96m4UPBs8L2WCh5IBHG2DLnZucLb4qBLHnHbJkej5CnpodFMjk9srztzsDgV atCIpzCmyMsUYpWrkGPN+wGq0d+EllFpv9yZVbA7okCchlQGe6DHKqmCpNqZzKi/w5wE 5iJQ== X-Forwarded-Encrypted: i=1; AHgh+RquyuicXznNqqgAXQ7X4n0aJF5iXUOruXm1OjspF9jeJNKV2xVsPH12qpboBQ+x2FVrLSemsb+93FqDImE=@vger.kernel.org X-Gm-Message-State: AOJu0YzCJwUXrmom0ylwfeyEQOaq2PTKgClj1cesQ1tRsrFM7brJaOZh fiwPVTPAZgJHJPWNhcxmgH780B5/Dify03cI8H9nleoOTHSAqmBlS55z9WtOQuZuLR4x6h6eFmY dHCRMxKZEJgAxPzlo0dnzCMMiT2TnzxlW4POcCg+Go6clupLdpx/mIg/6xaqtOw== X-Gm-Gg: AR+sD10jFK41KMHIrYxhZx3XNp1kr3h4IlAdXjr2mAcPKtJga1AOTYsUztUccL7auGc WORibKrsI6eMs3x6sTfbh9RnBSnkXc+kaO23uE7WGbJsjQ2qivy6Lg+ZggRVXqJXDgy6qXlqWc9 mO7wHPT+qVEekRY9EXy9ULnBhaEC+h4xDWVxV6ClmV2CDnYOnDg0AclC+u3z/4UispM++wAMxhP Ug1NgcCQnioOE1L5jaqSSMClQdmIYAo6JCpFhLPiR4LhUqeW/m4T82+YWU9P/zWcKTC0/0URSM8 43xcXOxJAAv95idccc/wnyLu+OMUogfrLVIOMuMNoG6ZqOXRl3RrUjQS7W0d/vSiPcJZ8sBbHpW qR2dELd51 X-Received: by 2002:a05:622a:c7:b0:52c:cc14:ff5f with SMTP id d75a77b69052e-52ce61e5923mr11904951cf.38.1785869558974; Tue, 04 Aug 2026 11:52:38 -0700 (PDT) X-Received: by 2002:a05:622a:c7:b0:52c:cc14:ff5f with SMTP id d75a77b69052e-52ce61e5923mr11904201cf.38.1785869558384; Tue, 04 Aug 2026 11:52:38 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 11:52:37 -0700 (PDT) From: Tal Zussman Date: Tue, 04 Aug 2026 14:52:13 -0400 Subject: [PATCH v2 05/10] ceph: convert ceph_submit_write() 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-5-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=4892; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=ot3FCX4ZCWU57RESMTwlWgtG0MyckOFVRrjXpb8SpwU=; b=G0grxSegvtpviy3zKZzUt9DT+v3NJt0MG4J+TlwxUUzGk0MBgrz1JzcFkY376tfuyfavF1yVP 4stT/JFPkW/DHD+fGwVtZywUw2EuD32vhOm5g0FUOv0qjCb7koZ14a6 X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfXxUnH3mP9hob4 X31zA1U+U8C5HJtPLOGsr2E4X0qAke/sBzWyHn9CTiBfUasKwCTwaN0Il9IM28anPuTpgQhvzLp ExbOpR6tCdFg5O2YBrscJFC22a59HAE+MlXyA/oWBzZh3+A8TmUaqXA+Sgj+k7bH4WJqjJEYIFl xe0CO88XEEa6pldyBOQaGbog/eT0ESlU/s6qSMPcWGornAjx1kU3Xfn4kmll5uvbkLYSjT7X0P1 yuoopxFRFtexjaa34lcOEXIvvGoMl8EJ063Y0fjDP3jDESTAUj3RlBXZQr4F4+E3vJ8TDk/XD5D S5/tCP4zrV9PkQjnxssGh74qcaH/pIR36vwMpF5C3txIOM3OP8hzK/7deY7HRpksr2oqz8JlUCQ U45Xdm5x3JVZGqa6qEPON7N8ViB2lQVDQbPYnq6yvmnd5EPDec4Av4EZA3vQCtYgCwYrgF1tzPF 7/eqgXzjLFmbYAETsXQ== X-Proofpoint-ORIG-GUID: u0Qo2rwHaxiOr5So4In5KKNUwgaULQfM X-Proofpoint-GUID: u0Qo2rwHaxiOr5So4In5KKNUwgaULQfM X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfX7NdBwOef4WRX q61MzhlFmzqnhTmrjrNrZgGvWlRrE8bo88ZD1B5J8H8wQ8fLUPWjlKYMdH5mRjDCI1cNkq5PeWl NMb/WBMz96GoQ3RR490mBYRDjYmppNixr4VofC/vz6SnXC/1Q9yV X-Authority-Analysis: v=2.4 cv=PYzPQChd c=1 sm=1 tr=0 ts=6a7234f7 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=jHxIr1HyPKZ_Q5_91PL3:22 a=RfODlEta0-z8xtihUo8A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11865 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=10 bulkscore=10 priorityscore=1501 spamscore=0 impostorscore=10 adultscore=0 malwarescore=0 phishscore=0 suspectscore=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 request assembly loop and error paths in ceph_submit_write() to folios. This drops ceph's uses of the set_page_writeback(), redirty_page_for_writepage(), and unlock_page() compatibility wrappers in the writeback submission path. Add ceph_folio_start_fscache(), a folio counterpart of ceph_set_page_fscache(). The remaining caller of the latter in write_folio_nounlock() will be converted separately. In total, this removes nine calls to compound_head() hidden in the page-based APIs, while adding four explicit ones via page_folio(). Note that get_writepages_data_length() must still be passed the possibly-bounce folio, not the unwrapped pagecache folio, as it checks fscrypt_is_bounce_folio() to round encrypted lengths up to the fscrypt block size. No functional change. Signed-off-by: Tal Zussman --- fs/ceph/addr.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index c81e9da42df9..a96986c503bf 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -553,6 +553,11 @@ const struct netfs_request_ops ceph_netfs_ops = { }; #ifdef CONFIG_CEPH_FSCACHE +static void ceph_folio_start_fscache(struct folio *folio) +{ + folio_start_private_2(folio); /* [DEPRECATED] */ +} + static void ceph_set_page_fscache(struct page *page) { folio_start_private_2(page_folio(page)); /* [DEPRECATED] */ @@ -575,6 +580,10 @@ static void ceph_fscache_write_to_cache(struct inode *inode, u64 off, u64 len, b ceph_fscache_write_terminated, inode, true, caching); } #else +static inline void ceph_folio_start_fscache(struct folio *folio) +{ +} + static inline void ceph_set_page_fscache(struct page *page) { } @@ -1436,14 +1445,14 @@ int ceph_submit_write(struct address_space *mapping, struct ceph_client *cl = fsc->client; struct ceph_vino vino = ceph_vino(inode); struct ceph_osd_request *req = NULL; - struct page *page = NULL; + struct folio *folio = NULL; bool caching = ceph_is_cache_enabled(inode); u64 offset; u64 len; unsigned i; new_request: - offset = ceph_fscrypt_page_offset(ceph_wbc->pages[0]); + offset = ceph_fscrypt_folio_offset(page_folio(ceph_wbc->pages[0])); len = ceph_wbc->wsize; req = ceph_osdc_new_request(&fsc->client->osdc, @@ -1467,29 +1476,28 @@ int ceph_submit_write(struct address_space *mapping, BUG_ON(IS_ERR(req)); } - page = ceph_wbc->pages[ceph_wbc->locked_pages - 1]; - BUG_ON(len < ceph_fscrypt_page_offset(page) + thp_size(page) - offset); + folio = page_folio(ceph_wbc->pages[ceph_wbc->locked_pages - 1]); + BUG_ON(len < ceph_fscrypt_folio_offset(folio) + folio_size(folio) - offset); if (!ceph_inc_osd_stopping_blocker(fsc->mdsc)) { for (i = 0; i < folio_batch_count(&ceph_wbc->fbatch); i++) { - struct folio *folio = ceph_wbc->fbatch.folios[i]; + folio = ceph_wbc->fbatch.folios[i]; if (!folio) continue; - page = &folio->page; - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); } for (i = 0; i < ceph_wbc->locked_pages; i++) { - page = ceph_fscrypt_pagecache_page(ceph_wbc->pages[i]); + folio = ceph_fscrypt_pagecache_folio(page_folio(ceph_wbc->pages[i])); - if (!page) + if (!folio) continue; - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); } ceph_osdc_put_request(req); @@ -1506,8 +1514,8 @@ int ceph_submit_write(struct address_space *mapping, for (i = 0; i < ceph_wbc->locked_pages; i++) { u64 cur_offset; - page = ceph_fscrypt_pagecache_page(ceph_wbc->pages[i]); - cur_offset = page_offset(page); + folio = ceph_fscrypt_pagecache_folio(page_folio(ceph_wbc->pages[i])); + cur_offset = folio_pos(folio); /* * Discontinuity in page range? Ceph can handle that by just passing @@ -1540,12 +1548,12 @@ int ceph_submit_write(struct address_space *mapping, ceph_wbc->op_idx++; } - set_page_writeback(page); + folio_start_writeback(folio); if (caching) - ceph_set_page_fscache(page); + ceph_folio_start_fscache(folio); - len += thp_size(page); + len += folio_size(folio); } ceph_fscache_write_to_cache(inode, offset, len, caching); @@ -1556,7 +1564,7 @@ int ceph_submit_write(struct address_space *mapping, /* writepages_finish() clears writeback pages * according to the data length, so make sure * data length covers all locked pages */ - u64 min_len = len + 1 - thp_size(page); + u64 min_len = len + 1 - folio_size(folio); len = get_writepages_data_length(inode, page_folio(ceph_wbc->pages[i - 1]), offset); -- 2.39.5