From nobody Thu Dec 18 04:50:49 2025 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 3CE2CC77B61 for ; Mon, 24 Apr 2023 03:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231128AbjDXDk1 (ORCPT ); Sun, 23 Apr 2023 23:40:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230399AbjDXDjq (ORCPT ); Sun, 23 Apr 2023 23:39:46 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAD91271C; Sun, 23 Apr 2023 20:39:45 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q4W4T6VZTznf6q; Mon, 24 Apr 2023 11:35:53 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 24 Apr 2023 11:39:43 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v4 08/12] ext4: using nofail preallocation in ext4_es_insert_extent() Date: Mon, 24 Apr 2023 11:38:42 +0800 Message-ID: <20230424033846.4732-9-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230424033846.4732-1-libaokun1@huawei.com> References: <20230424033846.4732-1-libaokun1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500021.china.huawei.com (7.185.36.21) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Similar to in ext4_es_insert_delayed_block(), we use preallocations that do not fail to avoid inconsistencies, but we do not care about es that are not must be kept, and we return 0 even if such es memory allocation fails. Suggested-by: Jan Kara Signed-off-by: Baokun Li Reviewed-by: Jan Kara --- fs/ext4/extents_status.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index f892277155fa..91828cf7395b 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -840,8 +840,11 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lb= lk_t lblk, { struct extent_status newes; ext4_lblk_t end =3D lblk + len - 1; - int err =3D 0; + int err1 =3D 0; + int err2 =3D 0; struct ext4_sb_info *sbi =3D EXT4_SB(inode->i_sb); + struct extent_status *es1 =3D NULL; + struct extent_status *es2 =3D NULL; =20 if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) return 0; @@ -869,29 +872,40 @@ int ext4_es_insert_extent(struct inode *inode, ext4_l= blk_t lblk, =20 ext4_es_insert_extent_check(inode, &newes); =20 +retry: + if (err1 && !es1) + es1 =3D __es_alloc_extent(true); + if ((err1 || err2) && !es2) + es2 =3D __es_alloc_extent(true); write_lock(&EXT4_I(inode)->i_es_lock); - err =3D __es_remove_extent(inode, lblk, end, NULL, NULL); - if (err !=3D 0) + + err1 =3D __es_remove_extent(inode, lblk, end, NULL, es1); + if (err1 !=3D 0) + goto error; + + err2 =3D __es_insert_extent(inode, &newes, es2); + if (err2 =3D=3D -ENOMEM && !ext4_es_must_keep(&newes)) + err2 =3D 0; + if (err2 !=3D 0) goto error; -retry: - err =3D __es_insert_extent(inode, &newes, NULL); - if (err =3D=3D -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), - 128, EXT4_I(inode))) - goto retry; - if (err =3D=3D -ENOMEM && !ext4_es_must_keep(&newes)) - err =3D 0; =20 if (sbi->s_cluster_ratio > 1 && test_opt(inode->i_sb, DELALLOC) && (status & EXTENT_STATUS_WRITTEN || status & EXTENT_STATUS_UNWRITTEN)) __revise_pending(inode, lblk, len); =20 + /* es is pre-allocated but not used, free it. */ + if (es1 && !es1->es_len) + __es_free_extent(es1); + if (es2 && !es2->es_len) + __es_free_extent(es2); error: write_unlock(&EXT4_I(inode)->i_es_lock); + if (err1 || err2) + goto retry; =20 ext4_es_print_tree(inode); - - return err; + return 0; } =20 /* --=20 2.31.1