Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0FD2727466A for ; Fri, 7 Aug 2026 15:19:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115971; cv=none; b=Don4Ly7A4nETUBshOZ0zn+NH1TVSBWNpqc5CGVwyoEpJbg2gm18Ezdqo/w+RhOW3oBUHZEPPrXbeo1iHoZDGkDH+XcYrNNzLVR6OyNfc2zLqlgTQ4mD8gFUPYwq4J8+bRpFMgvbt74ZaUt454sqLd0LhEYnHDnkhDjV0767KmMU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115971; c=relaxed/simple; bh=hmqTEhLHVHR3toCJMVVnbfevx/OKcSoQE/mcNIcbeAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LEdk5LTsuuwcHUCKosxRHQuq9npAKtIdYBA0qoffG8vnUZToNyaDEHloJFhQw9kU28zWLjaLdZp6vUxj777lkf/0am2WFyvbOGVG0Y9Rxq/CBYvLhgx+bt8cVjipei27/z1pEJnyFWnnZo7ZIa3x45f8jtzhhbmYYL8pqXXPC8M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=box8Mm3h; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="box8Mm3h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4258B1F00A3F; Fri, 7 Aug 2026 15:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786115969; bh=ddqj3ENGx3voKsoJOvC8m8MjqDt8Yf5avMnofjvBs/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=box8Mm3hJaDxdwRWWy8CXoLxHdx9xdI09BvGAWhkmBiBo+QJG214OTFhz/8QyrOrU f6EK2CqSYLKTBAWXTmQ5CxTl01y/pDrwtPLESMeAIjZIsgzDkvFTz6fjEgH1/3fJVG N8k+s+OjBJ+oSaMMi50fRm3+ntPUY3vJIeRpQe3FUwKqrESzF16SEAotfPFhYzxhZv KJooPdfsPkdgxA0H5d3DpC+siiwNP+0uyMhpyjtfQXyU23HD3ZaXqvRarcujuRCVbo k5URkK/h15Q4Rer/uN6HhcB0ybwVTEvaV5GY4TbWg3Sfe9Ehtfde3epJGSEErtptlx wIJlm4ENPuDzw== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , Viacheslav Dubeyko , Christian Brauner , Sasha Levin Subject: [PATCH 6.12.y 2/5] ceph: Use a folio in ceph_page_mkwrite() Date: Fri, 7 Aug 2026 11:19:23 -0400 Message-ID: <20260807151926.2227006-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260807151926.2227006-1-sashal@kernel.org> References: <2026072946-idiom-facelift-7c9f@gregkh> <20260807151926.2227006-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthew Wilcox (Oracle)" [ Upstream commit 88a59bda3f3786107694a3f5fd7f9df421752c21 ] Convert the passed page to a folio and use it throughout ceph_page_mkwrite(). Removes the last call to page_mkwrite_check_truncate(), the last call to offset_in_thp() and one of the last calls to thp_size(). Saves a few calls to compound_head(). Signed-off-by: "Matthew Wilcox (Oracle)" Link: https://lore.kernel.org/r/20250217185119.430193-3-willy@infradead.org Tested-by: Viacheslav Dubeyko Reviewed-by: Viacheslav Dubeyko Signed-off-by: Christian Brauner Stable-dep-of: cbf59617cd71 ("ceph: fix writeback_count leak in write_folio_nounlock()") Signed-off-by: Sasha Levin --- fs/ceph/addr.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 9441344bdced4..d03cf2473b326 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1696,8 +1696,8 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_file_info *fi = vma->vm_file->private_data; struct ceph_cap_flush *prealloc_cf; - struct page *page = vmf->page; - loff_t off = page_offset(page); + struct folio *folio = page_folio(vmf->page); + loff_t off = folio_pos(folio); loff_t size = i_size_read(inode); size_t len; int want, got, err; @@ -1714,10 +1714,10 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) sb_start_pagefault(inode->i_sb); ceph_block_sigs(&oldset); - if (off + thp_size(page) <= size) - len = thp_size(page); + if (off + folio_size(folio) <= size) + len = folio_size(folio); else - len = offset_in_thp(page, size); + len = offset_in_folio(folio, size); doutc(cl, "%llx.%llx %llu~%zd getting caps i_size %llu\n", ceph_vinop(inode), off, len, size); @@ -1734,30 +1734,30 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) doutc(cl, "%llx.%llx %llu~%zd got cap refs on %s\n", ceph_vinop(inode), off, len, ceph_cap_string(got)); - /* Update time before taking page lock */ + /* Update time before taking folio lock */ file_update_time(vma->vm_file); inode_inc_iversion_raw(inode); do { struct ceph_snap_context *snapc; - lock_page(page); + folio_lock(folio); - if (page_mkwrite_check_truncate(page, inode) < 0) { - unlock_page(page); + if (folio_mkwrite_check_truncate(folio, inode) < 0) { + folio_unlock(folio); ret = VM_FAULT_NOPAGE; break; } - snapc = ceph_find_incompatible(page); + snapc = ceph_find_incompatible(&folio->page); if (!snapc) { - /* success. we'll keep the page locked. */ - set_page_dirty(page); + /* success. we'll keep the folio locked. */ + folio_mark_dirty(folio); ret = VM_FAULT_LOCKED; break; } - unlock_page(page); + folio_unlock(folio); if (IS_ERR(snapc)) { ret = VM_FAULT_SIGBUS; -- 2.53.0