From nobody Thu Dec 18 04:50:51 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 D29C5C77B78 for ; Mon, 24 Apr 2023 03:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230468AbjDXDjz (ORCPT ); Sun, 23 Apr 2023 23:39:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230385AbjDXDjo (ORCPT ); Sun, 23 Apr 2023 23:39:44 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82325212D; Sun, 23 Apr 2023 20:39:43 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Q4W401m0ZzSvRY; Mon, 24 Apr 2023 11:35:28 +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:41 +0800 From: Baokun Li To: CC: , , , , , , , , Subject: [PATCH v4 04/12] ext4: use pre-allocated es in __es_insert_extent() Date: Mon, 24 Apr 2023 11:38:38 +0800 Message-ID: <20230424033846.4732-5-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" Pass a extent_status pointer prealloc to __es_insert_extent(). If the pointer is non-null, it is used directly when a new extent_status is needed to avoid memory allocation failures. Suggested-by: Jan Kara Signed-off-by: Baokun Li Reviewed-by: Jan Kara --- fs/ext4/extents_status.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 18665394392f..a6a62a744e83 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -144,7 +144,8 @@ static struct kmem_cache *ext4_es_cachep; static struct kmem_cache *ext4_pending_cachep; =20 -static int __es_insert_extent(struct inode *inode, struct extent_status *n= ewes); +static int __es_insert_extent(struct inode *inode, struct extent_status *n= ewes, + struct extent_status *prealloc); static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t end, int *reserved); static int es_reclaim_extents(struct ext4_inode_info *ei, int *nr_to_scan); @@ -768,7 +769,8 @@ static inline void ext4_es_insert_extent_check(struct i= node *inode, } #endif =20 -static int __es_insert_extent(struct inode *inode, struct extent_status *n= ewes) +static int __es_insert_extent(struct inode *inode, struct extent_status *n= ewes, + struct extent_status *prealloc) { struct ext4_es_tree *tree =3D &EXT4_I(inode)->i_es_tree; struct rb_node **p =3D &tree->root.rb_node; @@ -808,7 +810,10 @@ static int __es_insert_extent(struct inode *inode, str= uct extent_status *newes) } } =20 - es =3D __es_alloc_extent(false); + if (prealloc) + es =3D prealloc; + else + es =3D __es_alloc_extent(false); if (!es) return -ENOMEM; ext4_es_init_extent(inode, es, newes->es_lblk, newes->es_len, @@ -868,7 +873,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lbl= k_t lblk, if (err !=3D 0) goto error; retry: - err =3D __es_insert_extent(inode, &newes); + 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; @@ -918,7 +923,7 @@ void ext4_es_cache_extent(struct inode *inode, ext4_lbl= k_t lblk, =20 es =3D __es_tree_search(&EXT4_I(inode)->i_es_tree.root, lblk); if (!es || es->es_lblk > end) - __es_insert_extent(inode, &newes); + __es_insert_extent(inode, &newes, NULL); write_unlock(&EXT4_I(inode)->i_es_lock); } =20 @@ -1366,7 +1371,7 @@ static int __es_remove_extent(struct inode *inode, ex= t4_lblk_t lblk, orig_es.es_len - len2; ext4_es_store_pblock_status(&newes, block, ext4_es_status(&orig_es)); - err =3D __es_insert_extent(inode, &newes); + err =3D __es_insert_extent(inode, &newes, NULL); if (err) { es->es_lblk =3D orig_es.es_lblk; es->es_len =3D orig_es.es_len; @@ -2020,7 +2025,7 @@ int ext4_es_insert_delayed_block(struct inode *inode,= ext4_lblk_t lblk, if (err !=3D 0) goto error; retry: - err =3D __es_insert_extent(inode, &newes); + 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; --=20 2.31.1