From nobody Tue Nov 26 20:01:11 2024 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) (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 999C618BBB3 for ; Wed, 16 Oct 2024 05:28:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729056524; cv=none; b=g3Dju30cYip83NvoY6JF7wS4Go0D3dif/3yUPbHSUyrdFUv4XWISuqNlOC3L8qEFMJG8kBp8Nmd0Azcq6WDH//ZUdDK0pjoccasZkP/1Nm2Uw4dYKLX1w6FrWgNpx29FQdglGYQHDK0f/Tzk4xRGKmB8Cm+GsVWwBQJOCxPbm+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729056524; c=relaxed/simple; bh=CVlBHkWG4oQoe8tp2EbQksYyuSlSOrKILqqYX17nPCM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kKed/T1q+0RAMG3AEnpLEqMad+ib+KKpcvuHRPQJdpTQ/Ge4TtrrG2qOmMHUAitGUU/xjrV+cLl+IT3JrQpOagGtzsKRuS0bBMI/z0BQuHZdNVsc2Z7y3qLBEllgrpoqZSmEWikvormdcivQxIliAMu4jFzO3QaeqA+mux40Frc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 49G5S4Tx033842; Wed, 16 Oct 2024 13:28:04 +0800 (+08) (envelope-from Yi.Sun@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx02.spreadtrum.com [10.0.64.8]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4XSzy30xyXz2SWtk8; Wed, 16 Oct 2024 13:27:55 +0800 (CST) Received: from tj10379pcu.spreadtrum.com (10.5.32.15) by BJMBX02.spreadtrum.com (10.0.64.8) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 16 Oct 2024 13:28:02 +0800 From: Yi Sun To: CC: , , , , , , , Subject: [RFC PATCH 1/2] f2fs: introduce update_sit_entry_for_release() Date: Wed, 16 Oct 2024 13:27:57 +0800 Message-ID: <20241016052758.3400359-2-yi.sun@unisoc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241016052758.3400359-1-yi.sun@unisoc.com> References: <20241016052758.3400359-1-yi.sun@unisoc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 49G5S4Tx033842 Content-Type: text/plain; charset="utf-8" This function can process some consecutive blocks at a time. Signed-off-by: Yi Sun --- fs/f2fs/segment.c | 91 +++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index d91fbd1b27ba..f118faf36d35 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2424,6 +2424,58 @@ static void update_segment_mtime(struct f2fs_sb_info= *sbi, block_t blkaddr, SIT_I(sbi)->max_mtime =3D ctime; } =20 +static int update_sit_entry_for_release(struct f2fs_sb_info *sbi, struct s= eg_entry *se, + block_t blkaddr, unsigned int offset, int del) +{ + bool exist; +#ifdef CONFIG_F2FS_CHECK_FS + bool mir_exist; +#endif + int i; + int del_count =3D -del; + + for (i =3D 0; i < del_count; i++) { + exist =3D f2fs_test_and_clear_bit(offset + i, se->cur_valid_map); +#ifdef CONFIG_F2FS_CHECK_FS + mir_exist =3D f2fs_test_and_clear_bit(offset + i, + se->cur_valid_map_mir); + if (unlikely(exist !=3D mir_exist)) { + f2fs_err(sbi, "Inconsistent error when clearing bitmap, blk:%u, old bit= :%d", + blkaddr + i, exist); + f2fs_bug_on(sbi, 1); + } +#endif + if (unlikely(!exist)) { + f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u", + blkaddr + i); + f2fs_bug_on(sbi, 1); + se->valid_blocks++; + del +=3D 1; + } else if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { + /* + * If checkpoints are off, we must not reuse data that + * was used in the previous checkpoint. If it was used + * before, we must track that to know how much space we + * really have. + */ + if (f2fs_test_bit(offset + i, se->ckpt_valid_map)) { + spin_lock(&sbi->stat_lock); + sbi->unusable_block_count++; + spin_unlock(&sbi->stat_lock); + } + } + + if (f2fs_block_unit_discard(sbi) && + f2fs_test_and_clear_bit(offset + i, se->discard_map)) + sbi->discard_blks++; + + if (!f2fs_test_bit(offset + i, se->ckpt_valid_map)) + se->ckpt_valid_blocks -=3D 1; + } + + return del; +} + static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, in= t del) { struct seg_entry *se; @@ -2479,43 +2531,12 @@ static void update_sit_entry(struct f2fs_sb_info *s= bi, block_t blkaddr, int del) if (!f2fs_test_and_set_bit(offset, se->ckpt_valid_map)) se->ckpt_valid_blocks++; } - } else { - exist =3D f2fs_test_and_clear_bit(offset, se->cur_valid_map); -#ifdef CONFIG_F2FS_CHECK_FS - mir_exist =3D f2fs_test_and_clear_bit(offset, - se->cur_valid_map_mir); - if (unlikely(exist !=3D mir_exist)) { - f2fs_err(sbi, "Inconsistent error when clearing bitmap, blk:%u, old bit= :%d", - blkaddr, exist); - f2fs_bug_on(sbi, 1); - } -#endif - if (unlikely(!exist)) { - f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u", - blkaddr); - f2fs_bug_on(sbi, 1); - se->valid_blocks++; - del =3D 0; - } else if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { - /* - * If checkpoints are off, we must not reuse data that - * was used in the previous checkpoint. If it was used - * before, we must track that to know how much space we - * really have. - */ - if (f2fs_test_bit(offset, se->ckpt_valid_map)) { - spin_lock(&sbi->stat_lock); - sbi->unusable_block_count++; - spin_unlock(&sbi->stat_lock); - } - } =20 - if (f2fs_block_unit_discard(sbi) && - f2fs_test_and_clear_bit(offset, se->discard_map)) - sbi->discard_blks++; + if (!f2fs_test_bit(offset, se->ckpt_valid_map)) + se->ckpt_valid_blocks +=3D del; + } else { + del =3D update_sit_entry_for_release(sbi, se, blkaddr, offset, del); } - if (!f2fs_test_bit(offset, se->ckpt_valid_map)) - se->ckpt_valid_blocks +=3D del; =20 __mark_sit_entry_dirty(sbi, segno); =20 --=20 2.25.1 From nobody Tue Nov 26 20:01:11 2024 Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) (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 0FB2B18C021 for ; Wed, 16 Oct 2024 05:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729056527; cv=none; b=r+wD9oMKYEOIe5mKbxrNVXVbr77Vn3mQOc84dQGQmx0NCMGaT8GhEWsZq3WZ0fS4MWhV3Ty184z/bzZ4HOyAtxmOaYy5AoBRD2sSpGghOnmna7LKQQwttRHnL6cM7ZHGSG2qAS+aqfaEckwSRt6Y/qrejC3IFP1rJKIbr2hk6gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729056527; c=relaxed/simple; bh=NAyYjww6NuYkQYuCqsKaXzEHJZDoUd18AyghCBePBQ8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=h0+8ACDpikJuH5tMCnPwyRS3ycJSN3zK7DC3P9gQbwttdgAm1JLBkR8+z7ZX8dd+VZUONqXMWIN1oKlX2Jv/dIt4mWc5Tf3hiI6asE0PGcQNUva5mN1SwQfngu/doZ+9kuaeqsd0Bm8g+Lf+O0WFX8fHUrR0A7IITMLtasZiDJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 49G5S63f033963; Wed, 16 Oct 2024 13:28:06 +0800 (+08) (envelope-from Yi.Sun@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx02.spreadtrum.com [10.0.64.8]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4XSzy41Lghz2SW4QH; Wed, 16 Oct 2024 13:27:56 +0800 (CST) Received: from tj10379pcu.spreadtrum.com (10.5.32.15) by BJMBX02.spreadtrum.com (10.0.64.8) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 16 Oct 2024 13:28:03 +0800 From: Yi Sun To: CC: , , , , , , , Subject: [RFC PATCH 2/2] f2fs: introduce f2fs_invalidate_consecutive_blocks() Date: Wed, 16 Oct 2024 13:27:58 +0800 Message-ID: <20241016052758.3400359-3-yi.sun@unisoc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241016052758.3400359-1-yi.sun@unisoc.com> References: <20241016052758.3400359-1-yi.sun@unisoc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 49G5S63f033963 Content-Type: text/plain; charset="utf-8" When doing truncate, consecutive blocks in the same segment can be processed at the same time. So that the efficiency of doing truncate can be improved. Add f2fs_invalidate_compress_pages_range() only for doing truncate. Add check_f2fs_invalidate_consecutive_blocks() only for doing truncate and to determine whether the blocks are continuous and belong to the same segment. Signed-off-by: Yi Sun --- fs/f2fs/compress.c | 14 ++++++++++++++ fs/f2fs/f2fs.h | 5 +++++ fs/f2fs/file.c | 34 +++++++++++++++++++++++++++++++++- fs/f2fs/segment.c | 25 +++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 7f26440e8595..70929a87e9bf 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -2014,6 +2014,20 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_i= nfo *sbi, nid_t ino) } while (index < end); } =20 +void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi, + block_t blkaddr, int cnt) +{ + if (!sbi->compress_inode) + return; + + if (cnt < 1) { + f2fs_bug_on(sbi, 1); + cnt =3D 1; + } + + invalidate_mapping_pages(COMPRESS_MAPPING(sbi), blkaddr, blkaddr + cnt - = 1); +} + int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) { struct inode *inode; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ce00cb546f4a..99767f35678f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3716,6 +3716,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info= *sbi); int f2fs_flush_device_cache(struct f2fs_sb_info *sbi); void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free); void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr); +void f2fs_invalidate_consecutive_blocks(struct f2fs_sb_info *sbi, block_t = addr, int cnt); bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr); int f2fs_start_discard_thread(struct f2fs_sb_info *sbi); void f2fs_drop_discard_cmd(struct f2fs_sb_info *sbi); @@ -4375,6 +4376,8 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info *= sbi, struct page *page, bool f2fs_load_compressed_page(struct f2fs_sb_info *sbi, struct page *page, block_t blkaddr); void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino); +void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi, + block_t blkaddr, int cnt); #define inc_compr_inode_stat(inode) \ do { \ struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); \ @@ -4432,6 +4435,8 @@ static inline bool f2fs_load_compressed_page(struct f= 2fs_sb_info *sbi, struct page *page, block_t blkaddr) { return false; } static inline void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino) { } +static inline void f2fs_invalidate_compress_pages_range(struct f2fs_sb_inf= o *sbi, + block_t blkaddr, int cnt) { } #define inc_compr_inode_stat(inode) do { } while (0) static inline int f2fs_is_compressed_cluster( struct inode *inode, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 7057efa8ec17..634691e3b5f1 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -612,6 +612,18 @@ static int f2fs_file_open(struct inode *inode, struct = file *filp) return finish_preallocate_blocks(inode); } =20 +static bool check_f2fs_invalidate_consecutive_blocks(struct f2fs_sb_info *= sbi, + block_t blkaddr1, block_t blkaddr2) +{ + if (blkaddr2 - blkaddr1 !=3D 1) + return false; + + if (GET_SEGNO(sbi, blkaddr1) !=3D GET_SEGNO(sbi, blkaddr2)) + return false; + + return true; +} + void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) { struct f2fs_sb_info *sbi =3D F2FS_I_SB(dn->inode); @@ -621,6 +633,9 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_da= ta *dn, int count) int cluster_index =3D 0, valid_blocks =3D 0; int cluster_size =3D F2FS_I(dn->inode)->i_cluster_size; bool released =3D !atomic_read(&F2FS_I(dn->inode)->i_compr_blocks); + block_t con_start; + bool run_invalid =3D true; + int con_cnt =3D 1; =20 addr =3D get_dnode_addr(dn->inode, dn->node_page) + ofs; =20 @@ -652,7 +667,24 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_d= ata *dn, int count) valid_blocks++; } =20 - f2fs_invalidate_blocks(sbi, blkaddr); + if (run_invalid) + con_start =3D blkaddr; + + if (count > 1 && + check_f2fs_invalidate_consecutive_blocks(sbi, blkaddr, + le32_to_cpu(*(addr + 1)))) { + run_invalid =3D false; + + if (con_cnt++ =3D=3D 1) + con_start =3D blkaddr; + } else { + run_invalid =3D true; + } + + if (run_invalid) { + f2fs_invalidate_consecutive_blocks(sbi, con_start, con_cnt); + con_cnt =3D 1; + } =20 if (!released || blkaddr !=3D COMPRESS_ADDR) nr_free++; diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index f118faf36d35..edb8a78985ba 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2570,6 +2570,31 @@ void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi= , block_t addr) up_write(&sit_i->sentry_lock); } =20 +void f2fs_invalidate_consecutive_blocks(struct f2fs_sb_info *sbi, block_t = addr, int cnt) +{ + unsigned int segno =3D GET_SEGNO(sbi, addr); + unsigned int segno2 =3D GET_SEGNO(sbi, addr + cnt - 1); + struct sit_info *sit_i =3D SIT_I(sbi); + + f2fs_bug_on(sbi, addr =3D=3D NULL_ADDR || segno !=3D segno2); + if (addr =3D=3D NEW_ADDR || addr =3D=3D COMPRESS_ADDR) + return; + + f2fs_truncate_meta_inode_pages(sbi, addr, cnt); + f2fs_invalidate_compress_pages_range(sbi, addr, cnt); + + /* add it into sit main buffer */ + down_write(&sit_i->sentry_lock); + + update_segment_mtime(sbi, addr, 0); + update_sit_entry(sbi, addr, -cnt); + + /* add it into dirty seglist */ + locate_dirty_segment(sbi, segno); + + up_write(&sit_i->sentry_lock); +} + bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr) { struct sit_info *sit_i =3D SIT_I(sbi); --=20 2.25.1