From nobody Thu Apr 9 12:49:56 2026 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83CBB22759C for ; Mon, 9 Mar 2026 10:37:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773052670; cv=none; b=uK3lhln9TsQmRC9f1T5Dnd5tEu/hx80Y6IVT9+sszjcs1/llZMqgEUlgSTtH3FUjF9nFNMnUnFjf4DXTG/vX/fJxHyilVd+AEN/vZjB2G9UtiE7UyfxH2rsf+1lvWY5CIvV9PHOMh05WbP1OfcSPe1IBpmywl2B78yJkdaa2LpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773052670; c=relaxed/simple; bh=m0zEb4F26BwQG0VoCr42ygexL4Svps/s6BGllOnVX0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=atVvg6ehzUaHxwQX0cxJJ6fK/ZN8DBy4Wd/e/AWtk9vU/ofvgeOyHfphlKSPdNcVeWmnwfMTFAVWOhFNEwY/9aiF4zFU7ehjsGgbtvPr5LYPUSmQaq89e3SUFIxBmzT+rpzQr27ECdP8MbH5Hc9pvyUopsv0TCdajni0jXkDF7A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CWTgT1MZ; arc=none smtp.client-ip=209.85.210.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CWTgT1MZ" Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-7d754c7c150so97516a34.0 for ; Mon, 09 Mar 2026 03:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773052667; x=1773657467; darn=vger.kernel.org; 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=ocFSNy72gpBYTyqbLTn5+BD/eUt6UO2paTu1vwXpU5E=; b=CWTgT1MZuqdRDvsoyEAkpUQXDaDzkXWLUY9cj/0HXxBaX2uPl6bJTeYrWMYTIAd3W/ ehOAe412E2pix4frWa71hux3XWz21w4vhuktX1hqUDPjsflwUJIOyyswsRfjeLZSCS5a qeaofGf/ApBcTzbrX1XFoD1sjWp729yrq8avOqoEQo2SUoc7rbk90FLOwFZ1RlvKg/jF rPeQf6eAGXqWdgQQ1vYT0JblCHeLl6ETbBuHrQSRQalZsPFnrJEEe6UDe7IaHQnnuTzb +ctBXo5SM10Ru0Y1NUmMErYURaC03SdqRzGbRR7GstKuOuG20HtvS8HSbRueU/baDx1w JSMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773052667; x=1773657467; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ocFSNy72gpBYTyqbLTn5+BD/eUt6UO2paTu1vwXpU5E=; b=ZQ5EcEzhU/3LvWs483wKXnURoGPn97sLwofOkT9wuUz96Ta6DxLbriQIjNgJvxaBHk Y84KIsVHsLNJieEcPc2b3R5ne/MAHnpZlysdHj+z6/H6D5cE/b0Z+BH1L36rMI/kpNm6 u3ubdVUVKiOi6SzOZP8m8zFJLqqGbtyvDGgq+2XihUzozOf8GG0CZGC8dKAjrvpiwALQ EZhib4+FkE1DyBWtwuI6SGhdh7rxGS4bifSfqBDVqkzzrjIjIzaiAh+O3HSMhYBeE8P1 QpRiEHhdEPTcfdH514Cx3LEXRyrPDkt/1kezWauR1Gyb3P2vtvrcJ4BmFQtjqusSdCdY FTaA== X-Forwarded-Encrypted: i=1; AJvYcCXFWjR1Lj2VCvPwHl1opAYQ/0D14erOO30S3MLc8BCGT9aSabc9UyRdq8KmE+EyqWKqFISiCzmVScTxevQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2vAZUbgRO5V+xH674bKUK9uRnpOf3JxopBuoOsqOMj4s2nW9s NsiO2WMZOM6b4i9RKqDzpdqjhfmIsYNgZeC6a2nYfLE4LfRQDXIKcTVV X-Gm-Gg: ATEYQzwGGChbxrtcVZFSc5evrHfKcFCIt857Uuzq48TVypIh9gezXEg90zKZkNhBOUs oxOnjUTtCnldEwnulVeQLPJTrGDwxQNM6Ca0LhQPtq3WmOqR3x20nzHzzKetZ5qgN0uQzlU39rd JE5v9wr7Fb2A4CCd/EJtX/YzV+PcAf5IXzaOhRD6LIKYrbqDFK9vKYDWucjmPi9egLfXnoHTFbe j3FgQvHRr3MqxBmLcYRSbAZEcQeIvy7Aki4bZ9BwayWo/fcQhfQyrZh4R9iqRQie++FDNltMZSK LKFOpvGLdKfc0ouH9h/LxaCqt2ojmomiT9hf853BHyonqz2xRG52MZuEIe/2/kKGPPb1IsYXjK3 pb0sMbBEmlU09V9AVScxbAdMR9IpaxeiGa2KE4tUwmlENXdi3jrGh/Rmdc0eiisFHVw0CRcVGCp XEP1AC/F+Dn1xrJGkgieEDG4bblc2meZH0MxOTOUDebWI1ulSv/eY= X-Received: by 2002:a05:6830:d18:b0:7ab:e111:1a57 with SMTP id 46e09a7af769-7d72705c2fcmr6133858a34.31.1773052667312; Mon, 09 Mar 2026 03:37:47 -0700 (PDT) Received: from starman.tricat-industries.com ([136.49.86.72]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d755603798sm231247a34.29.2026.03.09.03.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 03:37:46 -0700 (PDT) From: 'wallentx To: linux-f2fs-devel@lists.sourceforge.net Cc: jaegeuk@kernel.org, chao@kernel.org, linux-kernel@vger.kernel.org, wallentx Subject: [RFC PATCH 2/3] f2fs: reduce zoned LFS memory by sharing SIT valid maps Date: Mon, 9 Mar 2026 05:36:59 -0500 Message-ID: <20260309103700.489932-3-william.allentx@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309103700.489932-1-william.allentx@gmail.com> References: <20260309103700.489932-1-william.allentx@gmail.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 Content-Type: text/plain; charset="utf-8" From: wallentx For zoned devices, F2FS only allows LFS mode. In that configuration SSR is not used, IPU is not allowed, and discard defaults to section granularity. Even so, F2FS still allocates per-segment cur/ckpt valid maps for every segment, including the common cases where a segment is trivially empty or trivially full. Reduce that overhead by introducing shared zero/full SIT valid maps for zoned LFS. Empty inactive segments point at the shared zero map, full inactive segments point at the shared full map, and only active or partially valid segments keep private maps. Update SIT rebuild and runtime updates to move segments between shared and private maps safely, and retire replaced private maps with RCU. Also invalidate scanned SIT metadata pages after mount-time rebuild so META_MAPPING does not retain the full SIT scan, update memory reporting to reflect the new layout, and reject checkpoint=3Ddisable because its checkpoint-era validity accounting does not fit the collapsed shared-SIT representation. On a test system with 43 HM-SMR zoned volumes (~550 TB total), CONFIG_F2FS_CHECK_FS=3Dy, and this patch applied on top of jaegeuk/f2fs dev at 5f04e90eedd0, static F2FS memory dropped from 58.91 GiB to 27.70 GiB. Signed-off-by: wallentx --- fs/f2fs/debug.c | 20 ++- fs/f2fs/f2fs.h | 6 + fs/f2fs/segment.c | 338 ++++++++++++++++++++++++++++++++++++++++++---- fs/f2fs/segment.h | 3 + fs/f2fs/super.c | 4 + fs/f2fs/sysfs.c | 3 +- 6 files changed, 341 insertions(+), 33 deletions(-) diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index af88db8fdb71..d8bfdac5c1e4 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -319,9 +319,23 @@ static void update_mem_info(struct f2fs_sb_info *sbi) si->base_mem +=3D sizeof(struct sit_info); si->base_mem +=3D MAIN_SEGS(sbi) * sizeof(struct seg_entry); si->base_mem +=3D f2fs_bitmap_size(MAIN_SEGS(sbi)); - si->base_mem +=3D 2 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); - si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); - si->base_mem +=3D SIT_VBLOCK_MAP_SIZE; + + if (f2fs_use_shared_sit_map(sbi)) { + /* shared cur/ckpt maps (zero + full bitmaps) */ + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * 2; + /* Approximate private bitmaps for active logs */ + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * NR_CURSEG_TYPE; +#ifdef CONFIG_F2FS_CHECK_FS + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); +#endif + if (f2fs_block_unit_discard(sbi)) + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); + } else { + si->base_mem +=3D 2 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi); + si->base_mem +=3D SIT_VBLOCK_MAP_SIZE; + } + if (__is_large_section(sbi)) si->base_mem +=3D MAIN_SECS(sbi) * sizeof(struct sec_entry); si->base_mem +=3D __bitmap_size(sbi, SIT_BITMAP); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8942b2a63cfd..11f3601ffd34 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4914,6 +4914,12 @@ static inline bool f2fs_lfs_mode(struct f2fs_sb_info= *sbi) return F2FS_OPTION(sbi).fs_mode =3D=3D FS_MODE_LFS; } =20 +/* Share SIT valid maps only for zoned LFS. */ +static inline bool f2fs_use_shared_sit_map(struct f2fs_sb_info *sbi) +{ + return f2fs_sb_has_blkzoned(sbi) && f2fs_lfs_mode(sbi); +} + static inline bool f2fs_is_sequential_zone_area(struct f2fs_sb_info *sbi, block_t blkaddr) { diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c9cfc8f17698..0dab6b16ba56 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -31,6 +31,24 @@ static struct kmem_cache *discard_entry_slab; static struct kmem_cache *discard_cmd_slab; static struct kmem_cache *sit_entry_set_slab; static struct kmem_cache *revoke_entry_slab; +static struct kmem_cache *sit_bitmap_slab; + +struct f2fs_sit_bitmap { + struct rcu_head rcu; + unsigned char map[SIT_VBLOCK_MAP_SIZE]; +}; + +static void f2fs_free_sit_bitmap_rcu(struct rcu_head *rcu) +{ + struct f2fs_sit_bitmap *b =3D container_of(rcu, struct f2fs_sit_bitmap, r= cu); + + kmem_cache_free(sit_bitmap_slab, b); +} + +static struct f2fs_sit_bitmap *f2fs_sit_bitmap_from_map(void *map) +{ + return container_of(map, struct f2fs_sit_bitmap, map); +} =20 static unsigned long __reverse_ulong(unsigned char *str) { @@ -2444,6 +2462,31 @@ static int update_sit_entry_for_release(struct f2fs_= sb_info *sbi, struct seg_ent =20 f2fs_bug_on(sbi, GET_SEGNO(sbi, blkaddr) !=3D GET_SEGNO(sbi, blkaddr + de= l_count - 1)); =20 + if (f2fs_use_shared_sit_map(sbi)) { + struct sit_info *sit_i =3D SIT_I(sbi); + + if (se->cur_valid_map =3D=3D sit_i->bitmap_full) { + struct f2fs_sit_bitmap *b =3D f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_NOFS, true, sbi); + memset(b->map, 0xff, SIT_VBLOCK_MAP_SIZE); + rcu_assign_pointer(se->cur_valid_map, b->map); + se->ckpt_valid_map =3D b->map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, b->map, SIT_VBLOCK_MAP_SIZE); +#endif + } else if (se->cur_valid_map =3D=3D sit_i->bitmap_zero) { + /* Should not happen, freeing empty segment */ + struct f2fs_sit_bitmap *b =3D f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_NOFS, true, sbi); + memset(b->map, 0, SIT_VBLOCK_MAP_SIZE); + rcu_assign_pointer(se->cur_valid_map, b->map); + se->ckpt_valid_map =3D b->map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, b->map, SIT_VBLOCK_MAP_SIZE); +#endif + } + } + 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 @@ -2478,10 +2521,18 @@ static int update_sit_entry_for_release(struct f2fs= _sb_info *sbi, struct seg_ent f2fs_test_and_clear_bit(offset + i, se->discard_map)) sbi->discard_blks++; =20 - if (!f2fs_test_bit(offset + i, se->ckpt_valid_map)) { - se->ckpt_valid_blocks -=3D 1; - if (__is_large_section(sbi)) - get_sec_entry(sbi, segno)->ckpt_valid_blocks -=3D 1; + if (se->cur_valid_map !=3D se->ckpt_valid_map) { + if (!f2fs_test_bit(offset + i, se->ckpt_valid_map)) { + se->ckpt_valid_blocks -=3D 1; + if (__is_large_section(sbi)) + get_sec_entry(sbi, segno)->ckpt_valid_blocks -=3D 1; + } + } else { + if (exist) { + se->ckpt_valid_blocks -=3D 1; + if (__is_large_section(sbi)) + get_sec_entry(sbi, segno)->ckpt_valid_blocks -=3D 1; + } } } =20 @@ -2499,6 +2550,31 @@ static int update_sit_entry_for_alloc(struct f2fs_sb= _info *sbi, struct seg_entry bool mir_exist; #endif =20 + if (f2fs_use_shared_sit_map(sbi)) { + struct sit_info *sit_i =3D SIT_I(sbi); + + if (se->cur_valid_map =3D=3D sit_i->bitmap_zero) { + struct f2fs_sit_bitmap *b =3D f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_NOFS, true, sbi); + memset(b->map, 0, SIT_VBLOCK_MAP_SIZE); + rcu_assign_pointer(se->cur_valid_map, b->map); + se->ckpt_valid_map =3D b->map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, b->map, SIT_VBLOCK_MAP_SIZE); +#endif + } else if (se->cur_valid_map =3D=3D sit_i->bitmap_full) { + /* Should not happen in LFS alloc, but for safety */ + struct f2fs_sit_bitmap *b =3D f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_NOFS, true, sbi); + memset(b->map, 0xff, SIT_VBLOCK_MAP_SIZE); + rcu_assign_pointer(se->cur_valid_map, b->map); + se->ckpt_valid_map =3D b->map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, b->map, SIT_VBLOCK_MAP_SIZE); +#endif + } + } + exist =3D f2fs_test_and_set_bit(offset, se->cur_valid_map); #ifdef CONFIG_F2FS_CHECK_FS mir_exist =3D f2fs_test_and_set_bit(offset, @@ -2525,14 +2601,23 @@ static int update_sit_entry_for_alloc(struct f2fs_s= b_info *sbi, struct seg_entry * or newly invalidated. */ if (!is_sbi_flag_set(sbi, SBI_CP_DISABLED)) { - if (!f2fs_test_and_set_bit(offset, se->ckpt_valid_map)) { - se->ckpt_valid_blocks++; - if (__is_large_section(sbi)) - get_sec_entry(sbi, segno)->ckpt_valid_blocks++; + if (se->cur_valid_map !=3D se->ckpt_valid_map) { + if (!f2fs_test_and_set_bit(offset, se->ckpt_valid_map)) { + se->ckpt_valid_blocks++; + if (__is_large_section(sbi)) + get_sec_entry(sbi, segno)->ckpt_valid_blocks++; + } + } else { + if (!exist) { + se->ckpt_valid_blocks++; + if (__is_large_section(sbi)) + get_sec_entry(sbi, segno)->ckpt_valid_blocks++; + } } } =20 - if (!f2fs_test_bit(offset, se->ckpt_valid_map)) { + if (se->cur_valid_map !=3D se->ckpt_valid_map && + !f2fs_test_bit(offset, se->ckpt_valid_map)) { se->ckpt_valid_blocks +=3D del; if (__is_large_section(sbi)) get_sec_entry(sbi, segno)->ckpt_valid_blocks +=3D del; @@ -2582,6 +2667,40 @@ static void update_sit_entry(struct f2fs_sb_info *sb= i, block_t blkaddr, int del) =20 if (__is_large_section(sbi)) get_sec_entry(sbi, segno)->valid_blocks +=3D del; + + if (f2fs_use_shared_sit_map(sbi)) { + struct sit_info *sit_i =3D SIT_I(sbi); + + if (new_vblocks =3D=3D 0 && + se->cur_valid_map !=3D sit_i->bitmap_zero) { + void *old_map =3D se->cur_valid_map; + + rcu_assign_pointer(se->cur_valid_map, sit_i->bitmap_zero); + se->ckpt_valid_map =3D sit_i->bitmap_zero; +#ifdef CONFIG_F2FS_CHECK_FS + memset(se->cur_valid_map_mir, 0, SIT_VBLOCK_MAP_SIZE); +#endif + if (old_map !=3D sit_i->bitmap_zero && + old_map !=3D sit_i->bitmap_full) { + call_rcu(&f2fs_sit_bitmap_from_map(old_map)->rcu, + f2fs_free_sit_bitmap_rcu); + } + } else if (new_vblocks =3D=3D BLKS_PER_SEG(sbi) && + se->cur_valid_map !=3D sit_i->bitmap_full) { + void *old_map =3D se->cur_valid_map; + + rcu_assign_pointer(se->cur_valid_map, sit_i->bitmap_full); + se->ckpt_valid_map =3D sit_i->bitmap_full; +#ifdef CONFIG_F2FS_CHECK_FS + memset(se->cur_valid_map_mir, 0xff, SIT_VBLOCK_MAP_SIZE); +#endif + if (old_map !=3D sit_i->bitmap_zero && + old_map !=3D sit_i->bitmap_full) { + call_rcu(&f2fs_sit_bitmap_from_map(old_map)->rcu, + f2fs_free_sit_bitmap_rcu); + } + } + } } =20 void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr, @@ -4812,6 +4931,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) char *src_bitmap, *bitmap; unsigned int bitmap_size, main_bitmap_size, sit_bitmap_size; unsigned int discard_map =3D f2fs_block_unit_discard(sbi) ? 1 : 0; + bool share_map =3D f2fs_use_shared_sit_map(sbi); =20 /* allocate memory for SIT information */ sit_i =3D f2fs_kzalloc(sbi, sizeof(struct sit_info), GFP_KERNEL); @@ -4838,28 +4958,73 @@ static int build_sit_info(struct f2fs_sb_info *sbi) #else bitmap_size =3D MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * (2 + discard_map); #endif - sit_i->bitmap =3D f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); - if (!sit_i->bitmap) - return -ENOMEM; - - bitmap =3D sit_i->bitmap; =20 - for (start =3D 0; start < MAIN_SEGS(sbi); start++) { - rcu_assign_pointer(sit_i->sentries[start].cur_valid_map, - bitmap); - bitmap +=3D SIT_VBLOCK_MAP_SIZE; + if (share_map) { + sit_i->bitmap_zero =3D f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL= ); + if (!sit_i->bitmap_zero) + return -ENOMEM; + sit_i->bitmap_full =3D f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL= ); + if (!sit_i->bitmap_full) { + kfree(sit_i->bitmap_zero); + sit_i->bitmap_zero =3D NULL; + return -ENOMEM; + } + memset(sit_i->bitmap_full, 0xff, SIT_VBLOCK_MAP_SIZE); =20 - sit_i->sentries[start].ckpt_valid_map =3D bitmap; - bitmap +=3D SIT_VBLOCK_MAP_SIZE; + bitmap_size =3D MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * discard_map; +#ifdef CONFIG_F2FS_CHECK_FS + bitmap_size +=3D MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE; +#endif + if (bitmap_size) { + sit_i->bitmap =3D f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); + if (!sit_i->bitmap) { + kfree(sit_i->bitmap_full); + kfree(sit_i->bitmap_zero); + sit_i->bitmap_full =3D NULL; + sit_i->bitmap_zero =3D NULL; + return -ENOMEM; + } + bitmap =3D sit_i->bitmap; + } =20 + for (start =3D 0; start < MAIN_SEGS(sbi); start++) { + rcu_assign_pointer(sit_i->sentries[start].cur_valid_map, + sit_i->bitmap_zero); + sit_i->sentries[start].ckpt_valid_map =3D + sit_i->bitmap_zero; #ifdef CONFIG_F2FS_CHECK_FS - sit_i->sentries[start].cur_valid_map_mir =3D bitmap; - bitmap +=3D SIT_VBLOCK_MAP_SIZE; + sit_i->sentries[start].cur_valid_map_mir =3D + bitmap; + bitmap +=3D SIT_VBLOCK_MAP_SIZE; #endif + if (discard_map) { + sit_i->sentries[start].discard_map =3D bitmap; + bitmap +=3D SIT_VBLOCK_MAP_SIZE; + } + } + } else { + sit_i->bitmap =3D f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); + if (!sit_i->bitmap) + return -ENOMEM; + + bitmap =3D sit_i->bitmap; + + for (start =3D 0; start < MAIN_SEGS(sbi); start++) { + rcu_assign_pointer(sit_i->sentries[start].cur_valid_map, bitmap); + bitmap +=3D SIT_VBLOCK_MAP_SIZE; =20 - if (discard_map) { - sit_i->sentries[start].discard_map =3D bitmap; + sit_i->sentries[start].ckpt_valid_map =3D bitmap; bitmap +=3D SIT_VBLOCK_MAP_SIZE; + +#ifdef CONFIG_F2FS_CHECK_FS + sit_i->sentries[start].cur_valid_map_mir =3D bitmap; + bitmap +=3D SIT_VBLOCK_MAP_SIZE; +#endif + + if (discard_map) { + sit_i->sentries[start].discard_map =3D bitmap; + bitmap +=3D SIT_VBLOCK_MAP_SIZE; + } } } =20 @@ -5009,7 +5174,39 @@ static int build_sit_entries(struct f2fs_sb_info *sb= i) err =3D check_block_count(sbi, start, &sit); if (err) return err; - seg_info_from_raw_sit(se, &sit); + + if (f2fs_use_shared_sit_map(sbi)) { + unsigned int vblocks =3D GET_SIT_VBLOCKS(&sit); + unsigned char *map =3D NULL; + bool is_active =3D is_curseg(sbi, start); + + if (vblocks =3D=3D 0 && !is_active) { + map =3D sit_i->bitmap_zero; + } else if (vblocks =3D=3D BLKS_PER_SEG(sbi) && !is_active) { + map =3D sit_i->bitmap_full; + } else { + struct f2fs_sit_bitmap *b =3D + f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_KERNEL, + false, sbi); + if (!b) + return -ENOMEM; + map =3D b->map; + memcpy(map, sit.valid_map, SIT_VBLOCK_MAP_SIZE); + } + + se->valid_blocks =3D vblocks; + se->ckpt_valid_blocks =3D vblocks; + rcu_assign_pointer(se->cur_valid_map, map); + se->ckpt_valid_map =3D map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, map, SIT_VBLOCK_MAP_SIZE); +#endif + se->type =3D GET_SIT_TYPE(&sit); + se->mtime =3D le64_to_cpu(sit.mtime); + } else { + seg_info_from_raw_sit(se, &sit); + } =20 if (se->type >=3D NR_PERSISTENT_LOG) { f2fs_err(sbi, "Invalid segment type: %u, segno: %u", @@ -5039,6 +5236,15 @@ static int build_sit_entries(struct f2fs_sb_info *sb= i) get_sec_entry(sbi, start)->valid_blocks +=3D se->valid_blocks; } + if (f2fs_use_shared_sit_map(sbi)) { + pgoff_t start_addr =3D sit_i->sit_base_addr + start_blk; + pgoff_t end_addr =3D start_addr + readed - 1; + pgoff_t alt_start_addr =3D start_addr + sit_i->sit_blocks; + pgoff_t alt_end_addr =3D alt_start_addr + readed - 1; + + invalidate_mapping_pages(META_MAPPING(sbi), start_addr, end_addr); + invalidate_mapping_pages(META_MAPPING(sbi), alt_start_addr, alt_end_add= r); + } start_blk +=3D readed; } while (start_blk < sit_blk_cnt); =20 @@ -5065,7 +5271,52 @@ static int build_sit_entries(struct f2fs_sb_info *sb= i) err =3D check_block_count(sbi, start, &sit); if (err) break; - seg_info_from_raw_sit(se, &sit); + + if (f2fs_use_shared_sit_map(sbi)) { + unsigned int vblocks =3D GET_SIT_VBLOCKS(&sit); + unsigned char *map =3D se->cur_valid_map; + bool is_active =3D is_curseg(sbi, start); + + if (vblocks =3D=3D 0 && !is_active) { + if (map !=3D sit_i->bitmap_zero && + map !=3D sit_i->bitmap_full) + kmem_cache_free(sit_bitmap_slab, + f2fs_sit_bitmap_from_map(map)); + map =3D sit_i->bitmap_zero; + } else if (vblocks =3D=3D BLKS_PER_SEG(sbi) && !is_active) { + if (map !=3D sit_i->bitmap_zero && + map !=3D sit_i->bitmap_full) + kmem_cache_free(sit_bitmap_slab, + f2fs_sit_bitmap_from_map(map)); + map =3D sit_i->bitmap_full; + } else { + if (map =3D=3D sit_i->bitmap_zero || + map =3D=3D sit_i->bitmap_full) { + struct f2fs_sit_bitmap *b =3D + f2fs_kmem_cache_alloc(sit_bitmap_slab, + GFP_KERNEL, + false, sbi); + if (!b) { + up_read(&curseg->journal_rwsem); + return -ENOMEM; + } + map =3D b->map; + } + memcpy(map, sit.valid_map, SIT_VBLOCK_MAP_SIZE); + } + + se->valid_blocks =3D vblocks; + se->ckpt_valid_blocks =3D vblocks; + rcu_assign_pointer(se->cur_valid_map, map); + se->ckpt_valid_map =3D map; +#ifdef CONFIG_F2FS_CHECK_FS + memcpy(se->cur_valid_map_mir, map, SIT_VBLOCK_MAP_SIZE); +#endif + se->type =3D GET_SIT_TYPE(&sit); + se->mtime =3D le64_to_cpu(sit.mtime); + } else { + seg_info_from_raw_sit(se, &sit); + } =20 if (se->type >=3D NR_PERSISTENT_LOG) { f2fs_err(sbi, "Invalid segment type: %u, segno: %u", @@ -5844,8 +6095,30 @@ static void destroy_sit_info(struct f2fs_sb_info *sb= i) if (!sit_i) return; =20 - if (sit_i->sentries) - kvfree(sit_i->bitmap); + if (sit_i->sentries) { + if (f2fs_use_shared_sit_map(sbi)) { + unsigned int start; + + for (start =3D 0; start < MAIN_SEGS(sbi); start++) { + struct seg_entry *se =3D &sit_i->sentries[start]; + + if (se->cur_valid_map && + se->cur_valid_map !=3D sit_i->bitmap_zero && + se->cur_valid_map !=3D sit_i->bitmap_full) { + struct f2fs_sit_bitmap *b; + + b =3D f2fs_sit_bitmap_from_map(se->cur_valid_map); + kmem_cache_free(sit_bitmap_slab, b); + } + } + kfree(sit_i->bitmap_zero); + kfree(sit_i->bitmap_full); + if (sit_i->bitmap) + kvfree(sit_i->bitmap); + } else { + kvfree(sit_i->bitmap); + } + } kfree(sit_i->tmp_map); =20 kvfree(sit_i->sentries); @@ -5898,8 +6171,16 @@ int __init f2fs_create_segment_manager_caches(void) sizeof(struct revoke_entry)); if (!revoke_entry_slab) goto destroy_sit_entry_set; + + sit_bitmap_slab =3D f2fs_kmem_cache_create("f2fs_sit_bitmap", + sizeof(struct f2fs_sit_bitmap)); + if (!sit_bitmap_slab) + goto destroy_revoke_entry; + return 0; =20 +destroy_revoke_entry: + kmem_cache_destroy(revoke_entry_slab); destroy_sit_entry_set: kmem_cache_destroy(sit_entry_set_slab); destroy_discard_cmd: @@ -5916,4 +6197,5 @@ void f2fs_destroy_segment_manager_caches(void) kmem_cache_destroy(discard_cmd_slab); kmem_cache_destroy(discard_entry_slab); kmem_cache_destroy(revoke_entry_slab); + kmem_cache_destroy(sit_bitmap_slab); } diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 068845660b0f..cb45cfa7a658 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -233,6 +233,9 @@ struct sit_info { unsigned long long dirty_max_mtime; /* rerange candidates in GC_AT */ =20 unsigned int last_victim[MAX_GC_POLICY]; /* last victim segment # */ + + unsigned char *bitmap_zero; /* shared zero bitmap */ + unsigned char *bitmap_full; /* shared full bitmap */ }; =20 struct free_segmap_info { diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8774c60b4be4..83ce88ce12cb 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2617,6 +2617,10 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_in= fo *sbi) f2fs_err(sbi, "checkpoint=3Ddisable on readonly fs"); return -EINVAL; } + if (f2fs_use_shared_sit_map(sbi)) { + f2fs_err(sbi, "checkpoint=3Ddisable is not supported in zoned shared SIT= mode"); + return -EOPNOTSUPP; + } sbi->sb->s_flags |=3D SB_ACTIVE; =20 /* check if we need more GC first */ diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 9c79f7b63583..2baf349721c9 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -1788,8 +1788,7 @@ static int __maybe_unused segment_bits_seq_show(struc= t seq_file *seq, seq_printf(seq, "%d|%-3u|", se->type, se->valid_blocks); =20 rcu_read_lock(); - memcpy(map, rcu_dereference(se->cur_valid_map), - SIT_VBLOCK_MAP_SIZE); + memcpy(map, rcu_dereference(se->cur_valid_map), SIT_VBLOCK_MAP_SIZE); rcu_read_unlock(); =20 for (j =3D 0; j < SIT_VBLOCK_MAP_SIZE; j++) --=20 2.53.0