Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3679175pxb; Mon, 24 Jan 2022 15:09:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1nKNPrVJNRs11Hv0tJVWgYlfZyAUv+bXAaMb9oY/QiRmbuIE4gC4OFYiFs5N7rHbjJxD1 X-Received: by 2002:a17:902:9b95:b0:14b:1339:58d2 with SMTP id y21-20020a1709029b9500b0014b133958d2mr16246007plp.138.1643065781501; Mon, 24 Jan 2022 15:09:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643065781; cv=none; d=google.com; s=arc-20160816; b=fViLMQZDN7DP3OjqMZwv5zbYFcF6VqYVFzmR81HfwLTMUDVX+l+GdRlFw14Zb4yma7 00/IcypPhazfUpse4RLoL+OqE48CawklHJLiq2DB/3U1oFlEL2b43iVw8wDMIB2/Qr2o kCO0R3niUTaY4wQAB/vnGyFW8O8Q2oldyK9QKOqz/5zFTeg1FB+rNJLilP3ABH7IvUWh jXm8sy2HNlXJLqrKY9qeU4isb0He3HQc2RNcL52KonfM2ie+8TxPRBtN2HyEw/3Eyiwv /wh1jKSlpo+sKovyFJjg76LVBvhIswvC9zZ4fTODoOjXPNvyqnvao0NyS/Q4/mw+nA4K Beow== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ztbaHlWfhrxFxKJQ1ksmBAgN+WTvpyW7GmjP4ZK8dRY=; b=yjhBzJGaKM9vlPHcaRgI0fybxrNA7+Nmu3JlEeg28Mu/cWxhTP6eTV5pgeewThGHrP VcleF5gHh4OX0A1SFnr0Wm2V9XJ6nhxgdUitv3R0pVcBy53snUgWyki3i7aHXiypnagY 5h4O0IYdwEFBZYFYE6mPzPoWAXgISoVa1K/Ea2r20OWIfdzKneFMqOtZgMDh21sjZaB5 +Ic/7BBSXh8E01GGBNVOPMoOU2hJPyQSMLvkPX8ul0WCV0wZP/rbgMsb6/jnTNGhdEJG AJSL8bZwa5kxHYbmdpb9fr6jELlS1zNMhBSzGKMZA5YlsUvY3ip7yTSDWR1Bu4isBiG4 rifg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hHdWuY70; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f2si16225898pfe.317.2022.01.24.15.09.28; Mon, 24 Jan 2022 15:09:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hHdWuY70; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381209AbiAXXGo (ORCPT + 99 others); Mon, 24 Jan 2022 18:06:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381208AbiAXWT2 (ORCPT ); Mon, 24 Jan 2022 17:19:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C8CBC061344; Mon, 24 Jan 2022 12:49:04 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id D925260C19; Mon, 24 Jan 2022 20:49:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0CF6C340E8; Mon, 24 Jan 2022 20:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057343; bh=r+p6EuVF+PH7m/bX/eehcg7q4vczR+MgtacTIIK26gk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hHdWuY70FJ5GQcXQaTQk3mXPA6MCZCxO0AgD5dvuSa+k58aSJXjg8J475uOArmzIt HsyVtHzp3Zb0dcVGHG3EwZ2OUaDPqNJiMhCzeFLSEZFC96F5uJvACMF0vixuWFifc1 O4pT7/44L2v46CHqNab8DeD5Gn5JiDdSWqfhq7SA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org Subject: [PATCH 5.15 781/846] f2fs: fix to reserve space for IO align feature Date: Mon, 24 Jan 2022 19:44:58 +0100 Message-Id: <20220124184127.898468821@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu commit 300a842937fbcfb5a189cea9ba15374fdb0b5c6b upstream. https://bugzilla.kernel.org/show_bug.cgi?id=204137 With below script, we will hit panic during new segment allocation: DISK=bingo.img MOUNT_DIR=/mnt/f2fs dd if=/dev/zero of=$DISK bs=1M count=105 mkfs.f2fe -a 1 -o 19 -t 1 -z 1 -f -q $DISK mount -t f2fs $DISK $MOUNT_DIR -o "noinline_dentry,flush_merge,noextent_cache,mode=lfs,io_bits=7,fsync_mode=strict" for (( i = 0; i < 4096; i++ )); do name=`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 10` mkdir $MOUNT_DIR/$name done umount $MOUNT_DIR rm $DISK --- fs/f2fs/f2fs.h | 11 +++++++++++ fs/f2fs/segment.h | 3 ++- fs/f2fs/super.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ fs/f2fs/sysfs.c | 4 +++- 4 files changed, 60 insertions(+), 2 deletions(-) --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1012,6 +1012,7 @@ struct f2fs_sm_info { unsigned int segment_count; /* total # of segments */ unsigned int main_segments; /* # of segments in main area */ unsigned int reserved_segments; /* # of reserved segments */ + unsigned int additional_reserved_segments;/* reserved segs for IO align feature */ unsigned int ovp_segments; /* # of overprovision segments */ /* a threshold to reclaim prefree segments */ @@ -2184,6 +2185,11 @@ static inline int inc_valid_block_count( if (!__allow_reserved_blocks(sbi, inode, true)) avail_user_block_count -= F2FS_OPTION(sbi).root_reserved_blocks; + + if (F2FS_IO_ALIGNED(sbi)) + avail_user_block_count -= sbi->blocks_per_seg * + SM_I(sbi)->additional_reserved_segments; + if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { if (avail_user_block_count > sbi->unusable_block_count) avail_user_block_count -= sbi->unusable_block_count; @@ -2430,6 +2436,11 @@ static inline int inc_valid_node_count(s if (!__allow_reserved_blocks(sbi, inode, false)) valid_block_count += F2FS_OPTION(sbi).root_reserved_blocks; + + if (F2FS_IO_ALIGNED(sbi)) + valid_block_count += sbi->blocks_per_seg * + SM_I(sbi)->additional_reserved_segments; + user_block_count = sbi->user_block_count; if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) user_block_count -= sbi->unusable_block_count; --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -537,7 +537,8 @@ static inline unsigned int free_segments static inline unsigned int reserved_segments(struct f2fs_sb_info *sbi) { - return SM_I(sbi)->reserved_segments; + return SM_I(sbi)->reserved_segments + + SM_I(sbi)->additional_reserved_segments; } static inline unsigned int free_sections(struct f2fs_sb_info *sbi) --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -327,6 +327,46 @@ static inline void limit_reserve_root(st F2FS_OPTION(sbi).s_resgid)); } +static inline int adjust_reserved_segment(struct f2fs_sb_info *sbi) +{ + unsigned int sec_blks = sbi->blocks_per_seg * sbi->segs_per_sec; + unsigned int avg_vblocks; + unsigned int wanted_reserved_segments; + block_t avail_user_block_count; + + if (!F2FS_IO_ALIGNED(sbi)) + return 0; + + /* average valid block count in section in worst case */ + avg_vblocks = sec_blks / F2FS_IO_SIZE(sbi); + + /* + * we need enough free space when migrating one section in worst case + */ + wanted_reserved_segments = (F2FS_IO_SIZE(sbi) / avg_vblocks) * + reserved_segments(sbi); + wanted_reserved_segments -= reserved_segments(sbi); + + avail_user_block_count = sbi->user_block_count - + sbi->current_reserved_blocks - + F2FS_OPTION(sbi).root_reserved_blocks; + + if (wanted_reserved_segments * sbi->blocks_per_seg > + avail_user_block_count) { + f2fs_err(sbi, "IO align feature can't grab additional reserved segment: %u, available segments: %u", + wanted_reserved_segments, + avail_user_block_count >> sbi->log_blocks_per_seg); + return -ENOSPC; + } + + SM_I(sbi)->additional_reserved_segments = wanted_reserved_segments; + + f2fs_info(sbi, "IO align feature needs additional reserved segment: %u", + wanted_reserved_segments); + + return 0; +} + static inline void adjust_unusable_cap_perc(struct f2fs_sb_info *sbi) { if (!F2FS_OPTION(sbi).unusable_cap_perc) @@ -4148,6 +4188,10 @@ try_onemore: goto free_nm; } + err = adjust_reserved_segment(sbi); + if (err) + goto free_nm; + /* For write statistics */ sbi->sectors_written_start = f2fs_get_sectors_written(sbi); --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -415,7 +415,9 @@ out: if (a->struct_type == RESERVED_BLOCKS) { spin_lock(&sbi->stat_lock); if (t > (unsigned long)(sbi->user_block_count - - F2FS_OPTION(sbi).root_reserved_blocks)) { + F2FS_OPTION(sbi).root_reserved_blocks - + sbi->blocks_per_seg * + SM_I(sbi)->additional_reserved_segments)) { spin_unlock(&sbi->stat_lock); return -EINVAL; }