From nobody Mon Jun 29 19:36:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C44FEC433F5 for ; Fri, 4 Feb 2022 01:05:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352178AbiBDBFu (ORCPT ); Thu, 3 Feb 2022 20:05:50 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:52372 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbiBDBFr (ORCPT ); Thu, 3 Feb 2022 20:05:47 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B87D7B83602 for ; Fri, 4 Feb 2022 01:05:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44A77C340E8; Fri, 4 Feb 2022 01:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643936745; bh=vsR1skta8BdBDj6kL6AEC79zRqPrW/y6o1L/lWlh4uI=; h=From:To:Cc:Subject:Date:From; b=PgVcBuMScdTKhISUU6GAxm4lb6Qe6RhZZhRePTVsqb0uk9ZwJMsWgXuxtXis/Gzj4 ocCl9h3UYg8ynbwbxbXcJgvnpR6oDrKOZBu8nsPLI9AF2fdRru1V5GkTHD1t3V+NHB DcJ6+hW/oeKNbq0OVaqnf9xjBo346IcUh9mYo1dNFUrD/QKQaLGE5hRJWZkWiyqWAm 9qr5Zw4cdX+N+AbWewuIiT6sisfx/5efA3jB/cgCJfU0HeMwtJpW3YO7yxp6ZNfS8j m+RRIgytOzZPKglxwpUjUfCwGjBRUqY58qco1D9k7iA5XuyFW/XfzK/XLQH++d2iJ7 1zh8ree/bSITw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2] f2fs: introduce F2FS_IPU_DEFRAG to allow file defragment in IPU mode Date: Fri, 4 Feb 2022 09:05:39 +0800 Message-Id: <20220204010539.42672-1-chao@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Once IPU policy is enabled in some cases: a) f2fs forces to use F2FS_IPU_FORCE in a small-sized volume b) user configures IPU policy via sysfs Then we may fail to defragment file via ioctl due to IPU policy check, it doesn't make sense, let's introduce a new IPU policy to allow OPU during file defragmentation, by default use IPU_DEFRAG instead of IPU_FORCE in small-sized volume for android device. Signed-off-by: Chao Yu --- v2: - handle F2FS_IPU_DEFRAG before F2FS_IPU_FORCE in check_inplace_update_poli= cy(). Documentation/ABI/testing/sysfs-fs-f2fs | 3 ++- fs/f2fs/data.c | 18 +++++++++++++----- fs/f2fs/f2fs.h | 3 ++- fs/f2fs/file.c | 18 +++++++++++------- fs/f2fs/segment.h | 8 ++++---- fs/f2fs/super.c | 2 +- 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/te= sting/sysfs-fs-f2fs index ce8103f522cb..d8abb674ee86 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -55,8 +55,9 @@ Description: Controls the in-place-update policy. 0x04 F2FS_IPU_UTIL 0x08 F2FS_IPU_SSR_UTIL 0x10 F2FS_IPU_FSYNC - 0x20 F2FS_IPU_ASYNC, + 0x20 F2FS_IPU_ASYNC 0x40 F2FS_IPU_NOCACHE + 0x80 F2FS_IPU_DEFRAG =3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Refer segment.h for details. diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index b3c152de4bba..3c0f001e3fe1 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2460,6 +2460,9 @@ static inline bool check_inplace_update_policy(struct= inode *inode, struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); unsigned int policy =3D SM_I(sbi)->ipu_policy; =20 + if (policy & (0x1 << F2FS_IPU_DEFRAG) && + is_inode_flag_set(inode, FI_DEFRAG_PROCESS)) + return false; if (policy & (0x1 << F2FS_IPU_FORCE)) return true; if (policy & (0x1 << F2FS_IPU_SSR) && f2fs_need_SSR(sbi)) @@ -2530,6 +2533,9 @@ bool f2fs_should_update_outplace(struct inode *inode,= struct f2fs_io_info *fio) if (is_inode_flag_set(inode, FI_ALIGNED_WRITE)) return true; =20 + if (is_inode_flag_set(inode, FI_DEFRAG_PROCESS)) + return true; + if (fio) { if (page_private_gcing(fio->page)) return true; @@ -3154,8 +3160,8 @@ static int __f2fs_write_data_pages(struct address_spa= ce *mapping, f2fs_available_free_memory(sbi, DIRTY_DENTS)) goto skip_write; =20 - /* skip writing during file defragment */ - if (is_inode_flag_set(inode, FI_DO_DEFRAG)) + /* skip writing in file defragment preparing stage */ + if (is_inode_flag_set(inode, FI_DEFRAG_PREPARE)) goto skip_write; =20 trace_f2fs_writepages(mapping->host, wbc, DATA); @@ -3729,6 +3735,7 @@ static int f2fs_migrate_blocks(struct inode *inode, b= lock_t start_blk, filemap_invalidate_lock(inode->i_mapping); =20 set_inode_flag(inode, FI_ALIGNED_WRITE); + set_inode_flag(inode, FI_DEFRAG_PROCESS); =20 for (; secidx < end_sec; secidx++) { f2fs_down_write(&sbi->pin_sem); @@ -3737,7 +3744,7 @@ static int f2fs_migrate_blocks(struct inode *inode, b= lock_t start_blk, f2fs_allocate_new_section(sbi, CURSEG_COLD_DATA_PINNED, false); f2fs_unlock_op(sbi); =20 - set_inode_flag(inode, FI_DO_DEFRAG); + set_inode_flag(inode, FI_DEFRAG_PREPARE); =20 for (blkofs =3D 0; blkofs < blk_per_sec; blkofs++) { struct page *page; @@ -3754,7 +3761,7 @@ static int f2fs_migrate_blocks(struct inode *inode, b= lock_t start_blk, f2fs_put_page(page, 1); } =20 - clear_inode_flag(inode, FI_DO_DEFRAG); + clear_inode_flag(inode, FI_DEFRAG_PREPARE); =20 ret =3D filemap_fdatawrite(inode->i_mapping); =20 @@ -3765,7 +3772,8 @@ static int f2fs_migrate_blocks(struct inode *inode, b= lock_t start_blk, } =20 done: - clear_inode_flag(inode, FI_DO_DEFRAG); + clear_inode_flag(inode, FI_DEFRAG_PREPARE); + clear_inode_flag(inode, FI_DEFRAG_PROCESS); clear_inode_flag(inode, FI_ALIGNED_WRITE); =20 filemap_invalidate_unlock(inode->i_mapping); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 6ddb98ff0b7c..5af415208488 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -737,7 +737,8 @@ enum { FI_DROP_CACHE, /* drop dirty page cache */ FI_DATA_EXIST, /* indicate data exists */ FI_INLINE_DOTS, /* indicate inline dot dentries */ - FI_DO_DEFRAG, /* indicate defragment is running */ + FI_DEFRAG_PREPARE, /* indicate defragment is preparing */ + FI_DEFRAG_PROCESS, /* indicate defragment is processing */ FI_DIRTY_FILE, /* indicate regular/symlink has dirty pages */ FI_PREALLOCATED_ALL, /* all blocks for write were preallocated */ FI_HOT_DATA, /* indicate file is hot */ diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6ccdd6e347e2..3a573125002b 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2559,10 +2559,6 @@ static int f2fs_defragment_range(struct f2fs_sb_info= *sbi, bool fragmented =3D false; int err; =20 - /* if in-place-update policy is enabled, don't waste time here */ - if (f2fs_should_update_inplace(inode, NULL)) - return -EINVAL; - pg_start =3D range->start >> PAGE_SHIFT; pg_end =3D (range->start + range->len) >> PAGE_SHIFT; =20 @@ -2570,6 +2566,13 @@ static int f2fs_defragment_range(struct f2fs_sb_info= *sbi, =20 inode_lock(inode); =20 + /* if in-place-update policy is enabled, don't waste time here */ + set_inode_flag(inode, FI_DEFRAG_PROCESS); + if (f2fs_should_update_inplace(inode, NULL)) { + err =3D -EINVAL; + goto out; + } + /* writeback all dirty pages in the range */ err =3D filemap_write_and_wait_range(inode->i_mapping, range->start, range->start + range->len - 1); @@ -2651,7 +2654,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info = *sbi, goto check; } =20 - set_inode_flag(inode, FI_DO_DEFRAG); + set_inode_flag(inode, FI_DEFRAG_PREPARE); =20 idx =3D map.m_lblk; while (idx < map.m_lblk + map.m_len && cnt < blk_per_seg) { @@ -2676,15 +2679,16 @@ static int f2fs_defragment_range(struct f2fs_sb_inf= o *sbi, if (map.m_lblk < pg_end && cnt < blk_per_seg) goto do_map; =20 - clear_inode_flag(inode, FI_DO_DEFRAG); + clear_inode_flag(inode, FI_DEFRAG_PREPARE); =20 err =3D filemap_fdatawrite(inode->i_mapping); if (err) goto out; } clear_out: - clear_inode_flag(inode, FI_DO_DEFRAG); + clear_inode_flag(inode, FI_DEFRAG_PREPARE); out: + clear_inode_flag(inode, FI_DEFRAG_PROCESS); inode_unlock(inode); if (!err) range->len =3D (u64)total << PAGE_SHIFT; diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 0291cd55cf09..a9373861ab1c 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -651,7 +651,8 @@ static inline int utilization(struct f2fs_sb_info *sbi) * pages over min_fsync_blocks. (=3Ddefault option) * F2FS_IPU_ASYNC - do IPU given by asynchronous write requests. * F2FS_IPU_NOCACHE - disable IPU bio cache. - * F2FS_IPUT_DISABLE - disable IPU. (=3Ddefault option in LFS mode) + * F2FS_IPU_DEFRAG - allow OPU during file defragmentation. + * F2FS_IPU_DISABLE - disable IPU. (=3Ddefault option in LFS mode) */ #define DEF_MIN_IPU_UTIL 70 #define DEF_MIN_FSYNC_BLOCKS 8 @@ -667,6 +668,7 @@ enum { F2FS_IPU_FSYNC, F2FS_IPU_ASYNC, F2FS_IPU_NOCACHE, + F2FS_IPU_DEFRAG, }; =20 static inline unsigned int curseg_segno(struct f2fs_sb_info *sbi, @@ -675,9 +677,7 @@ static inline unsigned int curseg_segno(struct f2fs_sb_= info *sbi, struct curseg_info *curseg =3D CURSEG_I(sbi, type); return curseg->segno; } - -static inline unsigned char curseg_alloc_type(struct f2fs_sb_info *sbi, - int type) +static inline unsigned char curseg_alloc_type(struct f2fs_sb_info *sbi, in= t type) { struct curseg_info *curseg =3D CURSEG_I(sbi, type); return curseg->alloc_type; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9af6c20532ec..cc0429279b4c 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3957,7 +3957,7 @@ static void f2fs_tuning_parameters(struct f2fs_sb_inf= o *sbi) F2FS_OPTION(sbi).alloc_mode =3D ALLOC_MODE_REUSE; if (f2fs_block_unit_discard(sbi)) sm_i->dcc_info->discard_granularity =3D 1; - sm_i->ipu_policy =3D 1 << F2FS_IPU_FORCE; + sm_i->ipu_policy =3D 1 << F2FS_IPU_DEFRAG; } =20 sbi->readdir_ra =3D 1; --=20 2.32.0