From patchwork Fri Nov 11 17:04:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daeho Jeong X-Patchwork-Id: 18912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp862369wru; Fri, 11 Nov 2022 09:07:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf6OEJu8+na1rupgYHKNVP6bAcGrYVT/Mfeayvu1YgPP/bRKfzInihc7nqBq1X+YamUclMDD X-Received: by 2002:a17:90a:4544:b0:212:bfc3:3271 with SMTP id r4-20020a17090a454400b00212bfc33271mr2807181pjm.99.1668186471420; Fri, 11 Nov 2022 09:07:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668186471; cv=none; d=google.com; s=arc-20160816; b=l+qLz3+3SxNyG4IJ2gH8i+wJYSM06oGYm5hAbZkn4DDlCOwj5aQKlZbU7iYx/DaQqG f3pHOqNF2KAgeUTbnbHKBP3MyiNN5w/Lj/St1dBE3M2YG33rAczr+nEXZ9UPTI+7RW6S F3rDHWMqoIKV/r1B2w0CzKv2lM/3lJ87ckEx2MwAGgXs7MWSHaK8rXbGszOVxT77gYTs 96B5rg88JTPuusJJoh3A8nL6Cf0Ht4SJ5OtS8RHT3jZ+SnZgEnNXqWKlh+vZzuY2NLJd eOkThhAtFgpsENQyEU8yEFqTI4sEbXOSibnsC7QWFHOHtoVFhfBPD8TAkIisnXY+kZ97 3iZg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=X+70jSVesYOoVF/IXWRbdTauFYwEc+auPprGXRcR1ME=; b=x1iMMpi683RZp2Hr5+QtSCKMUO2l2Wl3jrChOrGlU6r61mQ31oncuxTYagDiWSJHwI 4n/2AO1H5zNlym+k6Apj4fDiv5TBXDRTn4xrV3hKyd392dPgyrkU/PRPjfTlqrCrsvTU PIsyfhRGMyvinEXEOLqfINxe2MKb3qWOZ43RGkvMxl4fZzYVeoTIIotSD0NRuTGK1IWh HUq6GgteFJnlVzV/soQ9bT+UkwhKTJQtrJD4r/TSg2O73X6HThJbiCjp+sJoXNglCxmi ncFqA2lYJ/VNEWIlJF32UUJ3KKh62Uhr7bV2uaNis7s8A1nJKsQUAbwMExI3c/RzXZ1S VdtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KAC3sPvt; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e2-20020a637442000000b00434ba40afd5si2810931pgn.873.2022.11.11.09.07.36; Fri, 11 Nov 2022 09:07:51 -0800 (PST) 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=KAC3sPvt; 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 S233542AbiKKREP (ORCPT + 99 others); Fri, 11 Nov 2022 12:04:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232851AbiKKREM (ORCPT ); Fri, 11 Nov 2022 12:04:12 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF97171F28 for ; Fri, 11 Nov 2022 09:04:11 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id h14so4909680pjv.4 for ; Fri, 11 Nov 2022 09:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=X+70jSVesYOoVF/IXWRbdTauFYwEc+auPprGXRcR1ME=; b=KAC3sPvtwUWLqV/CfVyc/KAmjrnipAGbnAOsBQS9X3IONUNP7v8MHWFCegsozrwyQd s8xzCAVr8tkW+R6kIWfjdEfNiCy8XbLUUy6xtad3aLG4QUKwFYx9TrN36n/BfrSKIQYr Sn4oRStBtDbL8bBsmPaDZt0trwWwqAtHd+elpwnUMnfD9aSpOOWh1sQVGkbQF/2VP8cK nkyQJBw3mIS9iC9wn5uLTAmoOpnu9CAqw+fiNN2D2iUgWMwPqbciY1CId0SZkHEd+iRM TiLGTGy3Xhqz7en9VWJtO0i3LwO27oo0KZdUHMVoYtF6I0BSTbEkWXQcVxBJ8tPnvS1E DJRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X+70jSVesYOoVF/IXWRbdTauFYwEc+auPprGXRcR1ME=; b=3mUejNKmCLbbdYg+s7+xTGGOFUE4pxdVh+KLtEiuifmmeMnwV+55Ot1wXfjnAXmzWM IG0Z32ZrPPtXc5/ToYpq5J21vns9uiDAS1ECCajABZUeYtbq0vcLz7+s4UyByXQjB+ln nwIPQ1Ep/6TVay3vFczqnCKRVgoyAy8KST4V5ZfLgmJoWeZ657Zin4MFuvy1KTSxIYIs qevwGebYzBlwkcLiG80QyaKJq+uo7S4aHr4iiufcxcvcS5PKr/H+KKrY56lI/xezmrQv cBljFq/RCuSlcYpxptirweRlxd56qoGXbN8uLnVnjlRjbb4dzqMUcBZo+Ntm19XDzhQx NZRw== X-Gm-Message-State: ANoB5pmV17wkpWtH0TPJFCNH9nFZBr+s/WPdc9VT+YRBa9zz+fignNxC arhgtq4kF9uPoxSvMMrxVndJNv/dmyc= X-Received: by 2002:a17:90a:4282:b0:212:f810:a846 with SMTP id p2-20020a17090a428200b00212f810a846mr2960405pjg.71.1668186250818; Fri, 11 Nov 2022 09:04:10 -0800 (PST) Received: from daehojeong-desktop.mtv.corp.google.com ([2620:15c:211:201:b2f7:934a:d681:59d2]) by smtp.gmail.com with ESMTPSA id w9-20020a1709026f0900b001837463f654sm1926449plk.251.2022.11.11.09.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 09:04:10 -0800 (PST) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v7] f2fs: introduce F2FS_IOC_START_ATOMIC_REPLACE Date: Fri, 11 Nov 2022 09:04:06 -0800 Message-Id: <20221111170406.1086745-1-daeho43@gmail.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749220297330712735?= X-GMAIL-MSGID: =?utf-8?q?1749220297330712735?= 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 Reviewed-by: Chao Yu --- v7: changed where to clear FI_ATOMIC_REPLACE fixed tentative race condition in f2fs_ioc_start_atomic_write() 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 | 21 +++++++++++++++------ fs/f2fs/segment.c | 13 ++++++++++++- 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..f9a04f6d76cb 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,15 +2053,22 @@ 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); set_inode_flag(fi->cow_inode, FI_COW_FILE); clear_inode_flag(fi->cow_inode, FI_INLINE_DATA); + + 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_up_write(&fi->i_gc_rwsem[WRITE]); f2fs_update_time(sbi, REQ_TIME); @@ -4089,7 +4096,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..f2930fffbc7d 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -197,6 +197,7 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean) fi->cow_inode = NULL; release_atomic_write_cnt(inode); clear_inode_flag(inode, FI_ATOMIC_COMMITTED); + clear_inode_flag(inode, FI_ATOMIC_REPLACE); clear_inode_flag(inode, FI_ATOMIC_FILE); stat_dec_atomic_inode(inode); @@ -261,14 +262,24 @@ 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); } 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.