From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3184132EDFC; Mon, 5 May 2025 22:35:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484536; cv=none; b=QaAJiesibdf7743GygOgIcLkFhpJgEsVqq1xGZu2OPnceQkCyihCJGu0ddmDuVFpzZDGI+oeOXTBApqgCJfIBrrtaV+jWXTc1WkMxI02ZIxFUrLzoRUVvAdRc4hUkv2awavVGl336qdCs5gXgAJC6PFLaAPCBmsbd3cDtxSjP2Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484536; c=relaxed/simple; bh=inhaOWydxuk/ssqZID4r+/HivBjU+Kpz7k28+aLRNQk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=omofMILlrfB93vi5DLXIP1SgrX5qq/4lVXj7/Ej4gGwVukBeZmLGl9EFg/as30bHR174FtHvgRvLWahY+udoPSjK4J36NTWx1BbCWyo+mnjdGTI6CItsvSdFstIKR+EldJO6o1Va0kiAyYC9QoYgRl5L9RFvwNVa/SMTuDUpiwA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TKpKrAlE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TKpKrAlE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11F5AC4CEED; Mon, 5 May 2025 22:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484536; bh=inhaOWydxuk/ssqZID4r+/HivBjU+Kpz7k28+aLRNQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TKpKrAlEhQllmLQSCzTRtRQdult2jaKIwl98Xo8Or2khxK05tulj/y8RVij4iCwtI U1VvLQptlY8wVOC6rkTBlYjKt6mXKmLZSUtHwrhMkaWRkEDmNp5hgXEOtXUS/IKtdT 0zsQauusw+kMEsPhPUJnz0TUbJ9GWNRhbOPWYyuszsSDXY/GZPLqAesbx8rV4ggMcQ dyV378jmXFsxAPqZycB1HhIpFpbGD04VpPcp8lR8rxql90C6hwQj73XaOfT9kB0uJ/ fYnZd+co0YXR+fOwfBcpfVidS3nT4REaOhJXhW97ZG9M8K7r0ItIMvSUCjcfuGnlJl xKDuCdApC3XkA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Yi , Jan Kara , Ojaswin Mujoo , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 520/642] ext4: don't write back data before punch hole in nojournal mode Date: Mon, 5 May 2025 18:12:16 -0400 Message-Id: <20250505221419.2672473-520-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Zhang Yi [ Upstream commit 43d0105e2c7523cc6b14cad65e2044e829c0a07a ] There is no need to write back all data before punching a hole in non-journaled mode since it will be dropped soon after removing space. Therefore, the call to filemap_write_and_wait_range() can be eliminated. Besides, similar to ext4_zero_range(), we must address the case of partially punched folios when block size < page size. It is essential to remove writable userspace mappings to ensure that the folio can be faulted again during subsequent mmap write access. In journaled mode, we need to write dirty pages out before discarding page cache in case of crash before committing the freeing data transaction, which could expose old, stale data, even if synchronization has been performed. Signed-off-by: Zhang Yi Reviewed-by: Jan Kara Reviewed-by: Ojaswin Mujoo Link: https://patch.msgid.link/20241220011637.1157197-4-yi.zhang@huaweicloud.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/inode.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 74c5e2a381a6b..377fec39b24be 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3957,17 +3957,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) trace_ext4_punch_hole(inode, offset, length, 0); - /* - * Write out all dirty pages to avoid race conditions - * Then release them. - */ - if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { - ret = filemap_write_and_wait_range(mapping, offset, - offset + length - 1); - if (ret) - return ret; - } - inode_lock(inode); /* No need to punch hole beyond i_size */ @@ -4029,8 +4018,11 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) ret = ext4_update_disksize_before_punch(inode, offset, length); if (ret) goto out_dio; - truncate_pagecache_range(inode, first_block_offset, - last_block_offset); + + ret = ext4_truncate_page_cache_block_range(inode, + first_block_offset, last_block_offset + 1); + if (ret) + goto out_dio; } if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) -- 2.39.5