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 5BF7147DD5D for ; Tue, 4 Aug 2026 18:52: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=1785869574; cv=none; b=k0TJ49CYzBQa2ORSqZZqAUpAGZCG7SIZsmG0AMZFLUtuB7LDpgvTGN/fp+hWWVmkEhbm1iYjdIs3L0HDBDdxRsR/KcGrwEldNcN3v4GVoSvTGtO99U/q4G6gg5Q+LGoWInLW6fgkfGiH63fb40TaZKbO+gxCSyR21czh/YG0D0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785869574; c=relaxed/simple; bh=500EpqFLV6KTsCK9vzHr1t9+N59E2kCrXGhqPKPlKoc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TAFnfVWqWYnPpOZEbTZJhienvAfTjkb1H4w63PFLp4scybDEW4baFQxbRVPUV7ghqu5M+tBoYLEyti6/LNnZnvKQntXE+eGjqhcIylhtKWMsDjWUQAnJFI24GW828wFdgojVmzY3YOmU8PtTsJgPKposLNh2wDLJ0gjnsk2/ee8= 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=TPTrIWS8; 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="TPTrIWS8" 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 674IYAcC2050109 for ; Tue, 4 Aug 2026 14:52:46 -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=CnNA DUinRNwat8S2OMUK6WgEOXqYRvhZzhuvbRl7oDQ=; b=TPTrIWS81PZQemSMf5t5 USmw4FdbDjyN23RSCrdvIHFD3UxdDzJM2cuFbsGXRn2yYlsFMmIjuAEPYcHTLZo8 r+NXhE6fYTMMXA59qf892/pQaTWOjgo1ucaACTygfBYnLdmAfcDyiCHIIzbHul1L Tpj6OzRAv+sHcT+Zm7L1xgKT31VyonHxG9et1b+U/3e4SpnP0HtQrZIWySFMSKRd cP+LRLaENEs4VsHRQ7ggn5EGtWpcx91FFZAKvwna3vKScKHLt9QGl+3KSo3C1Vhu pgYiG/Uft7bzf2wKit7jqnk0vGinskVKijo4mmbWqRonm9FrG0Ajl6MXVEygOOly 4Q== 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 4fuhpht7cr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Aug 2026 14:52:45 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c20762d21so1323421cf.0 for ; Tue, 04 Aug 2026 11:52:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785869565; x=1786474365; 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=CnNADUinRNwat8S2OMUK6WgEOXqYRvhZzhuvbRl7oDQ=; b=hqdG2XOw/7RtAZ3X/hwlV67HI+CpMJkhJQxvf7okADLyezbSxAoj8QENMEHKmd1/qX Jl9WMt2ROUgFra0yNMTDBU52eari4GSNXTw6EhN+/weekKgHCpuEleDZGaLJqWCCJJwQ AeW/zG/9PJ5pG/oEANMQjChMqDBFWR22qewy7xZFl2a14O0USXONpnPPp+r+YBX66x+r i7jU7ocF+itwTe1yz652vD463GK4LyeShPhSaknULPzdsmADmO2kHW2cFX+6bY/4HRkZ oKslZTQtgE/IybsjTVkdZ53UA4/MhPkxaQFnFsLsc43RkGvE4QrA+bhMuamFmkYj6B7w 1sow== X-Forwarded-Encrypted: i=1; AHgh+RqTdylU/ObF9dM5bEwr9xw+jnxYpRdMSJkjxApmuM8qEJFUfTFpRVST+K5Byx1DMy/TRxyUVcJ7dNwUBV4=@vger.kernel.org X-Gm-Message-State: AOJu0YxKPhD+rqKOvt+8AReuF7w4gvRVczFq9vPOGh5RugILnn/CndHM 4TX8apB1UilSSp+0wlLqFZt7N6KTdgFYPf44sbrkMLyVHjoulFH0CsQOEmDFVxAJwJn+ZdIYL5j rDI3eiIonrJTkgfMaZJ9tetN7tYPSgc5q4Jqwxu2BzD7TWH76u87fD30JNYrS1Q== X-Gm-Gg: AR+sD11HvbAMFhmS94c5JSHY6D+qbLxcsQszQc8+gaWg6LYvxBGaePisUdVuQh3gOGS BK9c8SOsai8KSOfM2ZKA4RBQBcqd0ASKLAcix1d3eHhvZjs73Tvvga5aYLnPrFtpda+MGRPdAW6 HkVTO3ksm6g0UUdkjVawGr2lWRJT/77fdiP1TD/AvEC+mAugcYr0cyc2yhT1tO/DEGDwpawwx6o oDuB9yWuoaOM17gfjLNRaxmKb8NxT+uVWPirX1aQtipLTyFmq8rtcIsJXKmYaMAlHPJDumD0m+D ORoSIsrsfKij1pmosSRySBztxBQQxZzwJ4uAwFvoFg+Z799eQjVqDIFaO1MPY8InzZg3hxL0LSZ vE9Vtm+n/ X-Received: by 2002:ac8:5e08:0:b0:527:f0a:ccbc with SMTP id d75a77b69052e-52ce5fa28acmr15090631cf.18.1785869564661; Tue, 04 Aug 2026 11:52:44 -0700 (PDT) X-Received: by 2002:ac8:5e08:0:b0:527:f0a:ccbc with SMTP id d75a77b69052e-52ce5fa28acmr15090071cf.18.1785869564163; Tue, 04 Aug 2026 11:52:44 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 11:52:43 -0700 (PDT) From: Tal Zussman Date: Tue, 04 Aug 2026 14:52:15 -0400 Subject: [PATCH v2 07/10] ceph: remove page remnants from write_folio_nounlock() 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-7-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=2510; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=500EpqFLV6KTsCK9vzHr1t9+N59E2kCrXGhqPKPlKoc=; b=UBXFoH6y7LgXHIhuQeQIAJrJ0u0TLtb+QPEwzLT3I8tdP4d68PDNx+HUqFw0HznkZYJXgc93m lkPyciv2BfKAqFjgWwF7vCQck65jvJA4ziPdSBfbfyDO+n229Fd4GIj X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfXwVylb6Q5bZkE ZCMTyuszmGUzUAOn7zQG7LyURvsrXKushMzHRcbNB9FRu2GLtW7GuCPrpGJnEDDsp/hW2VTStZ7 3Sn5QsW/bWPtShzJ71y4HPU3FCGdIxdlZodgwqOrcwgq1zsa4OCDNY9KtJHfSDQeqfYDO9LjNMD KU+5pwofaIX+REDRpBhterxlcQaxm6oYs5xvP7P6ksqgCMtHcEXqp6guD5eFSE6+y0cZ8rMZuQ/ x0mfAUzwSriYiMmgHWKKZR8AM7dL2Xvm7Db6PnyhSHuB8mP2u8Q8FWssGXQnwO36hlfV8OAgnif GEMpy8lhM8peqCYLP2Xj33hZqZwbAtuLfLuqCIuqu55C6aX/QfsfpSvSb1Y+ngmKloa8eCv/TbV y4r58kB08Cfb108I0HOYR7v4VH3bL3g0fI0Ie3G8S8nA3hI8wjiIMTSEmpczT8NIQH8tPRkbr2W vim8R8yHlvHV5LoxUwg== X-Authority-Analysis: v=2.4 cv=O+EJeh9W c=1 sm=1 tr=0 ts=6a7234fd cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=j1J1DEHOHTVaJYOjuVnKiw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=SsB-OO3BMngHh3ZO9fOt:22 a=xhPbJxARXHWvbxRXPbEA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: rr4iGFnbaPHS2xaGm0eqP2rcMkXM0kiQ X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfX2C2hCEf8ceAS /HoiVTWF7o5fiUnda+rZMHGCkPGPRM3NYOf1BsFnz+Pfu2ICtrZtxKWdDhMwunaWPEphT7QnvgU c71vwqczgoTI95GUBZ2A+bX9XnQXz1Sw7pdOK7kl4XEXIkF2a635 X-Proofpoint-ORIG-GUID: rr4iGFnbaPHS2xaGm0eqP2rcMkXM0kiQ 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 spamscore=0 lowpriorityscore=10 phishscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 adultscore=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-2608040152 Use ceph_folio_start_fscache() and only use a struct page pointer at the osd_req_op_extent_osd_data_pages() boundary, which requires a page array. This removes a call to compound_head() in ceph_set_page_fscache(). This was the last user of ceph_set_page_fscache(), so remove it. Signed-off-by: Tal Zussman --- fs/ceph/addr.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index a96986c503bf..59e559bdfdff 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -558,11 +558,6 @@ 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] */ -} - static void ceph_fscache_write_terminated(void *priv, ssize_t error) { struct inode *inode = priv; @@ -584,10 +579,6 @@ static inline void ceph_folio_start_fscache(struct folio *folio) { } -static inline void ceph_set_page_fscache(struct page *page) -{ -} - static inline void ceph_fscache_write_to_cache(struct inode *inode, u64 off, u64 len, bool caching) { } @@ -734,7 +725,7 @@ static u64 get_writepages_data_length(struct inode *inode, static int write_folio_nounlock(struct folio *folio, struct writeback_control *wbc) { - struct page *page = &folio->page; + struct page *page; struct inode *inode = folio->mapping->host; struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode); @@ -813,7 +804,7 @@ static int write_folio_nounlock(struct folio *folio, folio_start_writeback(folio); if (caching) - ceph_set_page_fscache(&folio->page); + ceph_folio_start_fscache(folio); ceph_fscache_write_to_cache(inode, page_off, len, caching); if (IS_ENCRYPTED(inode)) { @@ -833,9 +824,8 @@ static int write_folio_nounlock(struct folio *folio, /* it may be a short write due to an object boundary */ WARN_ON_ONCE(len > folio_size(folio)); - osd_req_op_extent_osd_data_pages(req, 0, - bounce_page ? &bounce_page : &page, wlen, 0, - false, false); + page = bounce_page ? bounce_page : &folio->page; + osd_req_op_extent_osd_data_pages(req, 0, &page, wlen, 0, false, false); doutc(cl, "%llx.%llx %llu~%llu (%llu bytes, %sencrypted)\n", ceph_vinop(inode), page_off, len, wlen, IS_ENCRYPTED(inode) ? "" : "not "); -- 2.39.5