From patchwork Mon Mar 24 11:49:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 14027108 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 39A3FC36002 for ; Mon, 24 Mar 2025 11:50:04 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1twgJe-0006Q4-4A; Mon, 24 Mar 2025 11:50:01 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1twgJc-0006PK-On for linux-f2fs-devel@lists.sourceforge.net; Mon, 24 Mar 2025 11:50:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tRPwUfgieSkCdXSbcv1OQcZSOK2H9WrT4FLfO6gfFno=; b=Gs659t2AF6bMWZ2nuZo/h8B5O+ Z4JQa6LzpxpBQdCs9tR4aWCN3eowrbpZk1LM2LRBMaEjQFsqDAOyrSX6SGFwesXipTI0Ym/GUT2iA Vitc/nVWGqWAcHjWEypH/VPtXvS9oHE90AJ0X65ZrMu9kaTbQ0Vs84e4y0udLV5IB5B8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=tRPwUfgieSkCdXSbcv1OQcZSOK2H9WrT4FLfO6gfFno=; b=W qkukTbSLBU/hcGsISgoxzpih35LoPgcNH2rkFx50nsS5kUIsVFrU38qODMKSDWn1GVyLc7MCps8s1 bXSoGrXkRsdfOCvZc6QBlEA3n8W9E47N3ewjfFwc9UIgkXHBiEKE+g3vLT4kBat4hBPtZ7RyBB7ux LBmXDYgJNQUfc1X0=; Received: from tor.source.kernel.org ([172.105.4.254]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1twgJW-0006DO-9a for linux-f2fs-devel@lists.sourceforge.net; Mon, 24 Mar 2025 11:50:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id C35FF61156; Mon, 24 Mar 2025 11:49:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F3E0C4CEDD; Mon, 24 Mar 2025 11:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742816983; bh=gCNyozYEmcRl2t4cfqrGA2O/KEDU2B95MNyZDaGu6sk=; h=From:To:Cc:Subject:Date:From; b=eEGwTrFglsvgu048gbfD2qvxYtSfbc7mGzX85Z77ForBb3+nVQZB3JlnYO4W6TXzY ET3b8hfOyCbc+MP/wd4M40J6iCxMumTgt17QQsB5JeBLS1ZClFekt2gt6mwXR4sm6F ACJLKT4dj9Aggm43IcbTj1GCQKTsxP0Ix8tWq5/KxQM1bJhMuiLSAOBgDuJiZknSCs Z8Uqq8DrhZ/qB6iw8YylEnND9pPTKpb+Hb5pY5j6XFM3PRrnZ59zdvSb5fd9AIWorQ XHoTA71xSeQP674KwTcO4xWHTx+7nyQ1NeZXMhTMdP8UKSWTL93tXYK17nh7ITrbcT hBdB+IFbLo6mg== To: jaegeuk@kernel.org Date: Mon, 24 Mar 2025 19:49:34 +0800 Message-ID: <20250324114935.3087821-1-chao@kernel.org> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog MIME-Version: 1.0 X-Headers-End: 1twgJW-0006DO-9a Subject: [f2fs-dev] [PATCH 1/2] f2fs: zone: fix to calculate first_zoned_segno correctly X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Chao Yu via Linux-f2fs-devel From: Chao Yu Reply-To: Chao Yu Cc: Daeho Jeong , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net A zoned device can has both conventional zones and sequential zones, so we should not treat first segment of zoned device as first_zoned_segno, instead, we need to check zone type for each zone during traversing zoned device to find first_zoned_segno. Otherwise, for below case, first_zoned_segno will be 0, which could be wrong. create_null_blk 512 2 1024 1024 mkfs.f2fs -m /dev/nullb0 Fixes: 9703d69d9d15 ("f2fs: support file pinning for zoned devices") Cc: Daeho Jeong Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 18 +++++++++++++----- fs/f2fs/segment.c | 2 +- fs/f2fs/super.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ca884e39a5ff..3dea037faa55 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4630,12 +4630,16 @@ F2FS_FEATURE_FUNCS(readonly, RO); F2FS_FEATURE_FUNCS(device_alias, DEVICE_ALIAS); #ifdef CONFIG_BLK_DEV_ZONED -static inline bool f2fs_blkz_is_seq(struct f2fs_sb_info *sbi, int devi, - block_t blkaddr) +static inline bool f2fs_zone_is_seq(struct f2fs_sb_info *sbi, int devi, + unsigned int zone) { - unsigned int zno = blkaddr / sbi->blocks_per_blkz; + return test_bit(zone, FDEV(devi).blkz_seq); +} - return test_bit(zno, FDEV(devi).blkz_seq); +static inline bool f2fs_blkz_is_seq(struct f2fs_sb_info *sbi, int devi, + block_t blkaddr) +{ + return f2fs_zone_is_seq(sbi, devi, blkaddr / sbi->blocks_per_blkz); } #endif @@ -4711,9 +4715,13 @@ static inline bool f2fs_valid_pinned_area(struct f2fs_sb_info *sbi, block_t blkaddr) { if (f2fs_sb_has_blkzoned(sbi)) { +#ifdef CONFIG_BLK_DEV_ZONED int devi = f2fs_target_device_index(sbi, blkaddr); - return !bdev_is_zoned(FDEV(devi).bdev); + return !f2fs_blkz_is_seq(sbi, devi, blkaddr); +#else + return true; +#endif } return true; } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 396ef71f41e3..dc360b4b0569 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3311,7 +3311,7 @@ int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi) if (f2fs_sb_has_blkzoned(sbi) && err == -EAGAIN && gc_required) { f2fs_down_write(&sbi->gc_lock); - err = f2fs_gc_range(sbi, 0, GET_SEGNO(sbi, FDEV(0).end_blk), + err = f2fs_gc_range(sbi, 0, sbi->first_zoned_segno - 1, true, ZONED_PIN_SEC_REQUIRED_COUNT); f2fs_up_write(&sbi->gc_lock); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 011925ee54f8..b2342366020a 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4307,12 +4307,26 @@ static void f2fs_record_error_work(struct work_struct *work) static inline unsigned int get_first_zoned_segno(struct f2fs_sb_info *sbi) { - int devi; +#ifdef CONFIG_BLK_DEV_ZONED + unsigned int segno; + int devi, i; - for (devi = 0; devi < sbi->s_ndevs; devi++) - if (bdev_is_zoned(FDEV(devi).bdev)) - return GET_SEGNO(sbi, FDEV(devi).start_blk); - return 0; + if (!f2fs_sb_has_blkzoned(sbi)) + return NULL_SEGNO; + + for (devi = 0; devi < sbi->s_ndevs; devi++) { + if (!bdev_is_zoned(FDEV(devi).bdev)) + continue; + + segno = GET_SEGNO(sbi, FDEV(devi).start_blk); + for (i = 0; i < FDEV(devi).total_segments; i++) { + if (f2fs_zone_is_seq(sbi, devi, + GET_ZONE_FROM_SEG(sbi, segno + i))) + return segno + i; + } + } +#endif + return NULL_SEGNO; } static int f2fs_scan_devices(struct f2fs_sb_info *sbi) @@ -4349,6 +4363,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) #endif for (i = 0; i < max_devices; i++) { + if (max_devices == 1) { + FDEV(i).total_segments = + le32_to_cpu(raw_super->segment_count_main); + FDEV(i).start_blk = 0; + FDEV(i).end_blk = FDEV(i).total_segments * + BLKS_PER_SEG(sbi); + } + if (i == 0) FDEV(0).bdev_file = sbi->sb->s_bdev_file; else if (!RDEV(i).path[0])