From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7E95C433FE for ; Tue, 16 Nov 2021 21:45:32 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6D1261A64; Tue, 16 Nov 2021 21:45:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A6D1261A64 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1mn6Gf-0003bP-P7; Tue, 16 Nov 2021 21:45:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mn6Gd-0003bF-SH for linux-f2fs-devel@lists.sourceforge.net; Tue, 16 Nov 2021 21:45:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=r2vu3pZMJg3OD7sUrjXoL2dcwmdXEvEBTyUyKCjZQXI=; b=PFHVWa1DcO4c9dOZ51QOIGbVdk HXmCQ70JCxvLZVYCx7L4Pg9RIov4ogjGZPj/BMCIK13zJBCCDWYGi+ksCN/wvmDbJmeW7L1CDvEgf S5SrVTKmhc87LGMfRodqOyPIBzQRX6gwQxrD7bD6MF9z6XZhotyHRF2bfzcBPnMAnkFc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=r2vu3pZMJg3OD7sUrjXoL2dcwmdXEvEBTyUyKCjZQXI=; b=YcZryTVcIIr6G3cKFWx1m0zLNg rf4SKqKCEoOQDF2mBgdoM2FhuemmDHHmRNWJzFPODa4Dm9nwU1PC9MWs6GCjdk1ijpyvCRS0o2tWR hOT0QVC55fPRgVzzycud+gYwbEudfMxlBWvLAbpTvBW+NtLzief7B6wiArSE7qUXnV1c=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1mn6Gb-0006Rz-1m for linux-f2fs-devel@lists.sourceforge.net; Tue, 16 Nov 2021 21:45:27 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5D81A63225; Tue, 16 Nov 2021 21:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637099118; bh=EI6vUJ9WkD58fKVLnV4C0oJIsMWAx/TRcAV1+VglDk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dt+H3f4kcHsM+umVL2/tvli2mQIEeCC+wvLErvlZVv1cJhaX3hVojnO3L1KXn0lYO MWnYjcR2W/iVtap9KavMEDxqUOyPpJh3z/KXeoE5UB1SC7Ev28xnEtWJEGEX/c21y1 /Nu0Ek19Ps9laDgHUZ3z9pyFocRq7GJxByCyoTG8/o0b6d3xQ9yaXRMpdeYC8nv5wU YpG1yD5u5PvtpKZgh42SsuCRkbHOnUC8xWkW8kVDIPX1X2Lp1n+CVMuZB8r0ThDvZr hy5n74odDOeDDNqYYZNz5USMoGKi6F+Khr0/TvAFrAIu8aSIkSPJmFcJkQcgcNfpbL M7l/9LbU5S8WQ== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Date: Tue, 16 Nov 2021 13:45:06 -0800 Message-Id: <20211116214510.2934905-2-jaegeuk@kernel.org> X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog In-Reply-To: <20211116214510.2934905-1-jaegeuk@kernel.org> References: <20211116214510.2934905-1-jaegeuk@kernel.org> MIME-Version: 1.0 X-Headers-End: 1mn6Gb-0006Rz-1m Subject: [f2fs-dev] [PATCH 2/6] f2fs: do not expose unwritten blocks to user by DIO X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jaegeuk Kim Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net DIO preallocates physical blocks before writing data, but if an error occurrs or power-cut happens, we can see block contents from the disk. This patch tries to fix it by 1) turning to buffered writes for DIO into holes, 2) truncating unwritten blocks from error or power-cut. Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 5 ++++- fs/f2fs/f2fs.h | 5 +++++ fs/f2fs/file.c | 24 +++++++++++++++++++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 3b27fb7daa8b..7ac1a39fcad2 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1543,8 +1543,11 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, flag != F2FS_GET_BLOCK_DIO); err = __allocate_data_block(&dn, map->m_seg_type); - if (!err) + if (!err) { + if (flag == F2FS_GET_BLOCK_PRE_DIO) + file_need_truncate(inode); set_inode_flag(inode, FI_APPEND_WRITE); + } } if (err) goto sync_out; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index be871a79c634..14bea669f87e 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -654,6 +654,7 @@ enum { #define FADVISE_KEEP_SIZE_BIT 0x10 #define FADVISE_HOT_BIT 0x20 #define FADVISE_VERITY_BIT 0x40 +#define FADVISE_TRUNC_BIT 0x80 #define FADVISE_MODIFIABLE_BITS (FADVISE_COLD_BIT | FADVISE_HOT_BIT) @@ -681,6 +682,10 @@ enum { #define file_is_verity(inode) is_file(inode, FADVISE_VERITY_BIT) #define file_set_verity(inode) set_file(inode, FADVISE_VERITY_BIT) +#define file_should_truncate(inode) is_file(inode, FADVISE_TRUNC_BIT) +#define file_need_truncate(inode) set_file(inode, FADVISE_TRUNC_BIT) +#define file_dont_truncate(inode) clear_file(inode, FADVISE_TRUNC_BIT) + #define DEF_DIR_LEVEL 0 enum { diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 4bf77a5bf998..ec8de0662437 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -960,10 +960,21 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); filemap_invalidate_lock(inode->i_mapping); + /* + * Truncate stale preallocated blocks used by the previous DIO. + */ + if (file_should_truncate(inode)) { + err = f2fs_truncate(inode); + if (err) + goto out_unlock; + file_dont_truncate(inode); + } + truncate_setsize(inode, attr->ia_size); if (attr->ia_size <= old_size) err = f2fs_truncate(inode); +out_unlock: /* * do not trim all blocks after i_size if target size is * larger than i_size. @@ -4257,6 +4268,13 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter) /* If it will be an out-of-place direct write, don't bother. */ if (dio && f2fs_lfs_mode(sbi)) return 0; + /* + * Don't preallocate holes aligned to DIO_SKIP_HOLES which turns into + * buffered IO, if DIO meets any holes. + */ + if (dio && i_size_read(inode) && + (F2FS_BYTES_TO_BLK(pos) < F2FS_BLK_ALIGN(i_size_read(inode)))) + return 0; /* No-wait I/O can't allocate blocks. */ if (iocb->ki_flags & IOCB_NOWAIT) @@ -4366,10 +4384,14 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) if (preallocated > 0 && i_size_read(inode) < target_size) { down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); filemap_invalidate_lock(inode->i_mapping); - f2fs_truncate(inode); + if (!f2fs_truncate(inode)) + file_dont_truncate(inode); filemap_invalidate_unlock(inode->i_mapping); up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + } else { + file_dont_truncate(inode); } + clear_inode_flag(inode, FI_PREALLOCATED_ALL); if (ret > 0) -- 2.34.0.rc1.387.gb447b232ab-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel