Received: by 2002:a05:622a:1442:b0:3a5:28ea:c4b9 with SMTP id v2csp756487qtx; Mon, 31 Oct 2022 13:08:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Td6nzDtC+FQ1NaPKr8CjDR5Vzf9muY9IIEynudaLssWaoHLY6UnfHGLSug3uGWaBH69lw X-Received: by 2002:a17:90a:520c:b0:212:d135:4471 with SMTP id v12-20020a17090a520c00b00212d1354471mr34536395pjh.71.1667246888608; Mon, 31 Oct 2022 13:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667246888; cv=none; d=google.com; s=arc-20160816; b=Dm61cJVI+huY3lbv4zipGYHvgB9An09/B8k4GBFYx9VtpxqmxhdbNnBQwxvfnP2w7m AbruoaB+nvZ1P76Mz4P7J30jw5eSC6JC0X9yD7zWik3g0TeQsNHVjmxjjmXdu1sGJilL 0mSVNnKwJdIgSl7KYubCNLIbWAVJ0E5eRCtZ8qBGxoUzS5FRXsOc24ICkHnigykaLSaV rpqKN5b1m+RUs7o2CSNhzZwP3A/xuqwVobDOcKbG6+XOHzHDZLeMh6WOD5WpM+WIy92I VREZAQtOmnoC7Asu6iSy3QYNIDQXQtMcdWC+MQ9sDJsE+Z4WN9ZHdqPlkfFTEAG5DiXm EbuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=es/0kWvvQxEpWUALVTo4G3gGn6qEo4PAzN7S5DlZtZc=; b=KUSLu9+fm2tpomOMAf2ryvnLl0c9G4e59ZkuF1VKkPD8aaqsIWfYKTYlSWu5ag6cn+ TCWiK18GXPLNTaiOblV2jbEP1Wq2wBnJr7vkWwG+3z8wyWfdQpcKLJeBl0ynquEkgCtY j81dr/WBCIkHUgUEzLw2LCb/CPCspzTQlN8sck+FZey13fQ/3z2FfxAwqYw1ekxZZlp1 HMRMO4u1MHul48aLkkIE9v5Kz3t0LVGCFCU6xC0JzPH/OCm58LK1CnjYVv08EBxb9Dez L5Zj5iQoFlkLOFOVp6nyVAVy6/GlgasgdcK/aXLFa7NgoczLtFciflwKjtenZDKEZRNh VEWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NzFvo3fT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e11-20020a17090a280b00b00200462c3f5csi8293241pjd.74.2022.10.31.13.07.55; Mon, 31 Oct 2022 13:08:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NzFvo3fT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230031AbiJaTY2 (ORCPT + 98 others); Mon, 31 Oct 2022 15:24:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229955AbiJaTY0 (ORCPT ); Mon, 31 Oct 2022 15:24:26 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F2DD12A93 for ; Mon, 31 Oct 2022 12:24:25 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id k15so3466713pfg.2 for ; Mon, 31 Oct 2022 12:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=es/0kWvvQxEpWUALVTo4G3gGn6qEo4PAzN7S5DlZtZc=; b=NzFvo3fTSk/jdPwbm7bOJ99+KIFmYROJ9EOzeCc6qjy0CQCXx9RXavb4qDZIKFfgQV uDA/PNGEHbwhjR6zdtzuhq8PmIBebvcCOudD09W7Iukh5d7GbFOjivEK2Qxere6J/VPc WejJk13gNI5hFc8jgdjTZaI0Dd/GbagbVkKx5KwptxQtTmbIlD9BqswfUTPskbBLmJwh CjO/cjoZZeb5zl0yT2VKCLRzkbXZexxuGJLRw3pM6G/GtNkJlFpKPJb1kg11dMGUL8Ha hxucXzQAojJcJqqh2679+Tteo9hi5UagfDl1QhU7j4eIyHHO7p8ZQOApvMuKAIVNQ0HA z9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=es/0kWvvQxEpWUALVTo4G3gGn6qEo4PAzN7S5DlZtZc=; b=fS7s0TyD4kDSjv1QeY5JMdtoeyXrvNJkgIav0fYtX9v5ZXCAZdXIgqGq13EyczgK/8 rfu9n2EbDgPStjBnpFlY9sxcZ3X4ptma6aiQHN0zwMOo2B9mNk5I3BTGFflA+mYbCIRF MNS5lVa/pY30CVxN2hm7nEhsVGntJjxjZ2mJNj+nAdmFGu/Df+6BhZqHENWn3FjzEDT3 PB3Ox/P0wWnrkhT0g7h/JMUIwTNNd3J4RHmG7uAEpURFrlgJ5bPe5693X7bjHcXyR/G+ r+veDtLL96WkLB6Uu+ymaX6CssduKh/nJy8y/QyrG05i4oxUeV3QCrtWGLcotWRc85eC A0lw== X-Gm-Message-State: ACrzQf3wSFRHxgx8WFQJenrTzYe4/umTUgiWkpsavITEy5AsHfzyMOan mt29pGw+Hm8+38sL8ayL750MGPtkHxg= X-Received: by 2002:a65:58cf:0:b0:46f:ba32:2eb9 with SMTP id e15-20020a6558cf000000b0046fba322eb9mr6960074pgu.590.1667244264833; Mon, 31 Oct 2022 12:24:24 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2620:15c:211:201:769d:1a73:1fb:944e]) by smtp.gmail.com with ESMTPSA id r11-20020aa7988b000000b0056babe4fb8asm4950466pfl.49.2022.10.31.12.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 12:24:24 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v6 2/2] f2fs: introduce F2FS_IOC_START_ATOMIC_REPLACE Date: Mon, 31 Oct 2022 12:24:16 -0700 Message-Id: <20221031192416.32917-2-daeho43@gmail.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031192416.32917-1-daeho43@gmail.com> References: <20221031192416.32917-1-daeho43@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daeho Jeong introduce a new ioctl to replace the whole content of a file atomically, which means it induces truncate and content update at the same time. We can start it with F2FS_IOC_START_ATOMIC_REPLACE and complete it with F2FS_IOC_COMMIT_ATOMIC_WRITE. Or abort it with F2FS_IOC_ABORT_ATOMIC_WRITE. Signed-off-by: Daeho Jeong --- v3: move i_size change after setting atomic write flag v2: add undefined ioctl number reported by --- fs/f2fs/data.c | 3 +++ fs/f2fs/f2fs.h | 1 + fs/f2fs/file.c | 20 ++++++++++++++------ fs/f2fs/segment.c | 14 +++++++++++++- include/uapi/linux/f2fs.h | 1 + 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5f895ddcd64a..bce4dcc3ad78 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3457,6 +3457,9 @@ static int prepare_atomic_write_begin(struct f2fs_sb_info *sbi, else if (*blk_addr != NULL_ADDR) return 0; + if (is_inode_flag_set(inode, FI_ATOMIC_REPLACE)) + goto reserve_block; + /* Look for the block in the original inode */ err = __find_data_block(inode, index, &ori_blk_addr); if (err) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e29f9adf60ca..d513ecd17550 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -765,6 +765,7 @@ enum { FI_ALIGNED_WRITE, /* enable aligned write */ FI_COW_FILE, /* indicate COW file */ FI_ATOMIC_COMMITTED, /* indicate atomic commit completed except disk sync */ + FI_ATOMIC_REPLACE, /* indicate atomic replace */ FI_MAX, /* max flag, never be used */ }; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 7ce629c95f4a..7b2d956bc52f 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1984,7 +1984,7 @@ static int f2fs_ioc_getversion(struct file *filp, unsigned long arg) return put_user(inode->i_generation, (int __user *)arg); } -static int f2fs_ioc_start_atomic_write(struct file *filp) +static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate) { struct inode *inode = file_inode(filp); struct user_namespace *mnt_userns = file_mnt_user_ns(filp); @@ -2053,10 +2053,6 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) f2fs_write_inode(inode, NULL); - isize = i_size_read(inode); - fi->original_i_size = isize; - f2fs_i_size_write(fi->cow_inode, isize); - stat_inc_atomic_inode(inode); set_inode_flag(inode, FI_ATOMIC_FILE); @@ -2064,6 +2060,16 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) clear_inode_flag(fi->cow_inode, FI_INLINE_DATA); f2fs_up_write(&fi->i_gc_rwsem[WRITE]); + isize = i_size_read(inode); + fi->original_i_size = isize; + if (truncate) { + set_inode_flag(inode, FI_ATOMIC_REPLACE); + truncate_inode_pages_final(inode->i_mapping); + f2fs_i_size_write(inode, 0); + isize = 0; + } + f2fs_i_size_write(fi->cow_inode, isize); + f2fs_update_time(sbi, REQ_TIME); fi->atomic_write_task = current; stat_update_max_atomic_write(inode); @@ -4089,7 +4095,9 @@ static long __f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) case FS_IOC_GETVERSION: return f2fs_ioc_getversion(filp, arg); case F2FS_IOC_START_ATOMIC_WRITE: - return f2fs_ioc_start_atomic_write(filp); + return f2fs_ioc_start_atomic_write(filp, false); + case F2FS_IOC_START_ATOMIC_REPLACE: + return f2fs_ioc_start_atomic_write(filp, true); case F2FS_IOC_COMMIT_ATOMIC_WRITE: return f2fs_ioc_commit_atomic_write(filp); case F2FS_IOC_ABORT_ATOMIC_WRITE: diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 9cbf88092c78..7f62118cbe6e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -261,14 +261,26 @@ static void __complete_revoke_list(struct inode *inode, struct list_head *head, bool revoke) { struct revoke_entry *cur, *tmp; + pgoff_t start_index = 0; + bool truncate = is_inode_flag_set(inode, FI_ATOMIC_REPLACE); list_for_each_entry_safe(cur, tmp, head, list) { - if (revoke) + if (revoke) { __replace_atomic_write_block(inode, cur->index, cur->old_addr, NULL, true); + } else if (truncate) { + f2fs_truncate_hole(inode, start_index, cur->index); + start_index = cur->index + 1; + } + list_del(&cur->list); kmem_cache_free(revoke_entry_slab, cur); } + + if (!revoke && truncate) { + f2fs_do_truncate_blocks(inode, start_index * PAGE_SIZE, false); + clear_inode_flag(inode, FI_ATOMIC_REPLACE); + } } static int __f2fs_commit_atomic_write(struct inode *inode) diff --git a/include/uapi/linux/f2fs.h b/include/uapi/linux/f2fs.h index 3121d127d5aa..955d440be104 100644 --- a/include/uapi/linux/f2fs.h +++ b/include/uapi/linux/f2fs.h @@ -42,6 +42,7 @@ struct f2fs_comp_option) #define F2FS_IOC_DECOMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 23) #define F2FS_IOC_COMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 24) +#define F2FS_IOC_START_ATOMIC_REPLACE _IO(F2FS_IOCTL_MAGIC, 25) /* * should be same as XFS_IOC_GOINGDOWN. -- 2.38.1.273.g43a17bfeac-goog