From mboxrd@z Thu Jan 1 00:00:00 1970 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 5D59EC7EE22 for ; Wed, 3 May 2023 14:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230353AbjECOcf (ORCPT ); Wed, 3 May 2023 10:32:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbjECOc0 (ORCPT ); Wed, 3 May 2023 10:32:26 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E02F6A7E; Wed, 3 May 2023 07:32:14 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D158D203FE; Wed, 3 May 2023 14:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1683124332; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aWbejA8GNeDgBmTGmuQLR46IgsXBuRjQO+luuyV9faA=; b=lomW53Q4MFMMrBfg3/UmKarSndasuFyqA820h4nhqMuczqgQMrpokE54KslIo8/zGrMoFn RKD2VRzdCo/SCC8EsVMCiAKEqN14F6mRXYQUppyyT0meabeaCzlAfAqN2VeEvk+Y+uusuu +04p9kwlZ2uegyMP+u/SoeSAoP9DS78= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1683124332; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aWbejA8GNeDgBmTGmuQLR46IgsXBuRjQO+luuyV9faA=; b=bONJMVUmO/LddXIMIzcxO9i7JGfxADf0n7IvwshI0cB4TqR1JBRtx1Fu8NNhn4TQ7d2IsQ QViIs1XkKib6YMDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C423C1331F; Wed, 3 May 2023 14:32:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id x+XgL2xwUmSARgAAMHmgww (envelope-from ); Wed, 03 May 2023 14:32:12 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 579D4A0744; Wed, 3 May 2023 16:32:12 +0200 (CEST) Date: Wed, 3 May 2023 16:32:12 +0200 From: Jan Kara To: Baokun Li Cc: linux-ext4@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ritesh.list@gmail.com, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, yukuai3@huawei.com Subject: Re: [PATCH v4 08/12] ext4: using nofail preallocation in ext4_es_insert_extent() Message-ID: <20230503143212.t7o7lme54k2f23xx@quack3> References: <20230424033846.4732-1-libaokun1@huawei.com> <20230424033846.4732-9-libaokun1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230424033846.4732-9-libaokun1@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 24-04-23 11:38:42, Baokun Li wrote: > 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 Looks good to me. Feel free to add: Reviewed-by: Jan Kara Honza > --- > 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_lblk_t lblk, > { > struct extent_status newes; > ext4_lblk_t end = lblk + len - 1; > - int err = 0; > + int err1 = 0; > + int err2 = 0; > struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > + struct extent_status *es1 = NULL; > + struct extent_status *es2 = NULL; > > 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_lblk_t lblk, > > ext4_es_insert_extent_check(inode, &newes); > > +retry: > + if (err1 && !es1) > + es1 = __es_alloc_extent(true); > + if ((err1 || err2) && !es2) > + es2 = __es_alloc_extent(true); > write_lock(&EXT4_I(inode)->i_es_lock); > - err = __es_remove_extent(inode, lblk, end, NULL, NULL); > - if (err != 0) > + > + err1 = __es_remove_extent(inode, lblk, end, NULL, es1); > + if (err1 != 0) > + goto error; > + > + err2 = __es_insert_extent(inode, &newes, es2); > + if (err2 == -ENOMEM && !ext4_es_must_keep(&newes)) > + err2 = 0; > + if (err2 != 0) > goto error; > -retry: > - err = __es_insert_extent(inode, &newes, NULL); > - if (err == -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb), > - 128, EXT4_I(inode))) > - goto retry; > - if (err == -ENOMEM && !ext4_es_must_keep(&newes)) > - err = 0; > > 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); > > + /* 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; > > ext4_es_print_tree(inode); > - > - return err; > + return 0; > } > > /* > -- > 2.31.1 > -- Jan Kara SUSE Labs, CR