From patchwork Tue Feb 28 11:42:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791457wrd; Mon, 27 Feb 2023 19:43:38 -0800 (PST) X-Google-Smtp-Source: AK7set+KnYiRZLILf/8/CYsXsIjpdJjEVzcqqg+hafrc07rStAaSI8ixWoBXW7n9VOfhRZEY1vHi X-Received: by 2002:a05:6a20:1588:b0:cd:9da2:fdb8 with SMTP id h8-20020a056a20158800b000cd9da2fdb8mr1962881pzj.34.1677555817951; Mon, 27 Feb 2023 19:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555817; cv=none; d=google.com; s=arc-20160816; b=aoLua9A8xBoy3QCRcvX3PwCgXJVM0W2AZd6pVoyEVN1TpSYpLIgPJxusK+uP/zhk3L RJ+prJVFm2laXVpKvkt6TOuDo/j8SxDnO/S877L0QXy12tkDy+1GxL4YIwhKvFlUjWNF hPtosAmmW3JOtnfHPBdVqhuQ7MY/oGl9kA44571ot/fEpAbe5nNqICp0E6iauZsZUakf u7ycCVwM6VQW/khZO62VezjcjXR1NQCQdZ0wLYbFQuOeghicVfBX8J+0q6JuFyIOe52s cSxHDWVEwiSlOpD2Ezze1lOOF0dwm1efzWmqMc+5AOutqeWC76zoYXqh2Cywl3EyThEr a4mQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2JaXu6Ev8VZTPaXWSiKx/nxvgV5XZOdlTALwaE+OgXU=; b=Qgz9RfAPr5RFC9+I6glEqw73PIArxGbUxHyM3r/Tw+JLc/HAgh+Dzis5C6sGKdAGbh oHdcWfgsGNigEgMhjVtcTbP+nOqD70SXGhYGpChl/Om0uljJUbgm2rPGxES+vNTyfG5z KUB7EWtejotlbkB7x1D0XMhIEKbkCu0uZadn+9pQqGjHarn8Shj48pUHT2JlcM8pxDe7 eMbuk6MH6R5rsfB0oF/BCD/AGpSxwEzWJVQL/aJb5gHebel+tj1S+nJqSkQM5apH/aAz V+RkAWhD4awipPzGJ7TjJ4oCxyiPDwmkaLGktK+Wv64dg6u9xJtQO1nrxP1Fp7XOIxiC TXZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m29-20020a637d5d000000b004ccd057d472si9607094pgn.815.2023.02.27.19.43.23; Mon, 27 Feb 2023 19:43:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230225AbjB1Dlr (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43322244A6; Mon, 27 Feb 2023 19:41:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpK5vq3z4f41V1; Tue, 28 Feb 2023 11:41:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S6; Tue, 28 Feb 2023 11:41:31 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 04/20] ext4: correct calculation of s_mb_preallocated Date: Tue, 28 Feb 2023 19:42:50 +0800 Message-Id: <20230228114306.3328235-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFWDCFykAw4DKryrWFW8Crg_yoW8Gr15pa nxKr1UGwn3ur15Cayvgwn8Ww1xKa1xKr4UWryIgr4xZFZrJryaka1DtrW0gF93Zr4kZFnI vFW29r1UCrWI937anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759044769228837915?= X-GMAIL-MSGID: =?utf-8?q?1759044769228837915?= We will add pa_free to s_mb_preallocated when new ext4_prealloc_space is created. In ext4_mb_new_inode_pa, we will call ext4_mb_use_inode_pa before adding pa_free to s_mb_preallocated. However, ext4_mb_use_inode_pa will consume pa_free for block allocation which triggerred the creation of ext4_prealloc_space. Add pa_free to s_mb_preallocated before ext4_mb_use_inode_pa to correct calculation of s_mb_preallocated. There is no such problem in ext4_mb_new_group_pa as pa_free of group pa is consumed in ext4_mb_release_context instead of ext4_mb_use_group_pa. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b94c9f331a3c..90f765a350ea 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4667,8 +4667,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa->pa_len, pa->pa_lstart); trace_ext4_mb_new_inode_pa(ac, pa); - ext4_mb_use_inode_pa(ac, pa); atomic_add(pa->pa_free, &sbi->s_mb_preallocated); + ext4_mb_use_inode_pa(ac, pa); ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);