From patchwork Fri Mar 3 17:21:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307389wrd; Fri, 3 Mar 2023 01:20:55 -0800 (PST) X-Google-Smtp-Source: AK7set/a4ZhjbtGanqFjE1asRJG6iWtJmf+6hdJ3Erqirs0FyzaWQKXEpVqGuLmQJtFpUnqDluaX X-Received: by 2002:a17:906:5ca:b0:8f6:ad32:cd51 with SMTP id t10-20020a17090605ca00b008f6ad32cd51mr974266ejt.62.1677835255513; Fri, 03 Mar 2023 01:20:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835255; cv=none; d=google.com; s=arc-20160816; b=gRIe7WVbImU1Y/N6zhckkEgLqHuDZ+3qehw1z/WYohfs5cbk5/MS0Y2qmC+OdxFARO mei1aqHCQGDSBlspwsWCGndAxcKq8NEfnRo5C6oCKxjOwudx6kbH+L5OAIAUYxHH+76G 35XX4n4gDg1dxLP9kUy3Dui0uE5zF+wNC2dyaLXMavsJd2HhRSlB1s+5mLguq2x8fq1R qI2D/zZz9qJP5ZGM9UMOx80i5ylTGQ8bEYBFV+tj68AXN3ZaAMbaC1lxdYFJpyNmrf/A VY3xetUPZ3SKtYt/Gn4I56JNJ+8vigZ63kLE5HoswVQJ9N+C4qgA4dEXw+MpY4dFm+e0 fIhQ== 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=oHlDg7eJ0ZK7Rn7f1kFZpD5CKysG1oBJI+eCD8BbGlc=; b=0dab6hFIX4xHYdigI3oKEoLMIfO+qNlRFE+1tXAH8Fqeck/B97E8d50lC4zqedk5S4 0R6GpGlM6yyynCqOvpiXdlUNHLHjl+iKTEWrPjLc34qcx9iN+Ai5jdEppkoFnBIV85Gf GpwRjuE1dfnrhsidCSMG2dDfAg1epom1DmhpzA/+5Xof5TA69Sli5H8vHxfMN9rv63B3 lHHBTYWH7GNXsWY1ONvlHFodFYbr4BT1EnLUOZpbJIW10UvVDI95aXPJO2hUOr/AXuvw /midnXQ7abWCj2fNKRchBv2pDcUW2DSMBNJfhKRPno2MTrG7GlAxYoL9SBSv9OxX9FjT MsSw== 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 g15-20020a170906868f00b008e418335b5dsi722863ejx.793.2023.03.03.01.20.32; Fri, 03 Mar 2023 01:20:55 -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 S230247AbjCCJUO (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 734D1149A3; Fri, 3 Mar 2023 01:19:51 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9G3MCkz4f3mJT; Fri, 3 Mar 2023 17:19:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S3; Fri, 03 Mar 2023 17:19:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 01/20] ext4: set goal start correctly in ext4_mb_normalize_request Date: Sat, 4 Mar 2023 01:21:01 +0800 Message-Id: <20230303172120.3800725-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S3 X-Coremail-Antispam: 1UD129KBjvJXoW7AF4rKry7Wr1xGFWxKw17ZFb_yoW8CrWkpF s3XFW3Gr4fur1UuFs7W3WDWw1rKw4xGryUCrySyr1xGFy3JFWkCa1qqay8AF9I9rZ3Arn8 Za1vva17ur429aDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pR3PE3UUUUU = 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?1759337780871860942?= X-GMAIL-MSGID: =?utf-8?q?1759337780871860942?= We need to set ac_g_ex to notify the goal start used in ext4_mb_find_by_goal. Set ac_g_ex instead of ac_f_ex in ext4_mb_normalize_request. Besides we should assure goal start is in range [first_data_block, blocks_count) as ext4_mb_initialize_context does. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5b2ae37a8b80..36cd545f5ab4 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3993,6 +3993,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, struct ext4_allocation_request *ar) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); + struct ext4_super_block *es = sbi->s_es; int bsbits, max; ext4_lblk_t end; loff_t size, start_off; @@ -4188,18 +4189,20 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, ac->ac_g_ex.fe_len = EXT4_NUM_B2C(sbi, size); /* define goal start in order to merge */ - if (ar->pright && (ar->lright == (start + size))) { + if (ar->pright && (ar->lright == (start + size)) && + ar->pright - size >= le32_to_cpu(es->s_first_data_block)) { /* merge to the right */ ext4_get_group_no_and_offset(ac->ac_sb, ar->pright - size, - &ac->ac_f_ex.fe_group, - &ac->ac_f_ex.fe_start); + &ac->ac_g_ex.fe_group, + &ac->ac_g_ex.fe_start); ac->ac_flags |= EXT4_MB_HINT_TRY_GOAL; } - if (ar->pleft && (ar->lleft + 1 == start)) { + if (ar->pleft && (ar->lleft + 1 == start) && + ar->pleft + 1 < ext4_blocks_count(es)) { /* merge to the left */ ext4_get_group_no_and_offset(ac->ac_sb, ar->pleft + 1, - &ac->ac_f_ex.fe_group, - &ac->ac_f_ex.fe_start); + &ac->ac_g_ex.fe_group, + &ac->ac_g_ex.fe_start); ac->ac_flags |= EXT4_MB_HINT_TRY_GOAL; } From patchwork Fri Mar 3 17:21:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307256wrd; Fri, 3 Mar 2023 01:20:31 -0800 (PST) X-Google-Smtp-Source: AK7set9yrqELrmFkwKdnVkuGHXh7rf5lmqc92Qb+jo7H7Ifex9g1O7hC/ayWWcdHbwPi8pvcPjc/ X-Received: by 2002:a17:907:8b11:b0:8b1:749f:b2c0 with SMTP id sz17-20020a1709078b1100b008b1749fb2c0mr1049037ejc.74.1677835231564; Fri, 03 Mar 2023 01:20:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835231; cv=none; d=google.com; s=arc-20160816; b=AIwUZIyfozTgnOEWh0sWrUgteV/EYsKDh2K8/7I+Hc3qjFQObD7cz0Fwqm2xxQYHoV ayMNuqsWeqsawTfnW01p0PBAjlWSlTzYRZIXCoZbpHbtrOdM5kKLfvOQsfu69n1CT6CS pCN0wfehi32pTYcuJv0GyniCGsauqNPVSdLEVlK+Oabh2JWqA5rGLxBYd1oZWJb9fwT+ 9xSZy4OMfWgawJH2kWKqIf+lfaThRM/Cv9Uu3ARxZxPSqC3zEHYkE7J7R4LRSFEQB/qz pZ9i+85+V+sZFn1RzIkYtyzUBg4htn3VfOvG5VLs9OUSxHGmCfLn/SxJwyc6SJ+XDvAj YzEg== 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=g4pBFkpaZrn9OiADlVk4zlAiHcQ5ebf1UtT77lTYIYg=; b=bi15qw1bE/8J7TAHbC+mFhP4TcJ6qafw7sbjeAYqZHrcbpQNYrwUYS+Izy0ogCTAXS /GT4gW7LVFMPibVuoxFP0MG/GTsfMolWImzdanp70+a3+ImbtWIskhIBvSBJA7iH2qjP dSiRFHpSG2dvR9/dGS4P2HgJ3VPrz/ajkUU4+CyE37JA3/d3YdHKz1JhF6Wd1iv4udQu +Sj3NqjNif7LZUXB0HdhZf/LCOigOsuPMKXoQXYPqzB3qyaQenQAPzlhrFcoHo/oTspM UIavY6jU02QjoqKMRys/ykPpQmNylarmLxsEI1JQQT8wh7rwG2nY2vxxbdjB5qKPUcVS qRvQ== 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 e22-20020a056402089600b004bca220ebcesi2322298edy.292.2023.03.03.01.20.08; Fri, 03 Mar 2023 01:20:31 -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 S229910AbjCCJUC (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229913AbjCCJTw (ORCPT ); Fri, 3 Mar 2023 04:19:52 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9826A23DA8; Fri, 3 Mar 2023 01:19:51 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9H0S5Yz4f3m7K; Fri, 3 Mar 2023 17:19:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S4; Fri, 03 Mar 2023 17:19:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 02/20] ext4: allow to find by goal if EXT4_MB_HINT_GOAL_ONLY is set Date: Sat, 4 Mar 2023 01:21:02 +0800 Message-Id: <20230303172120.3800725-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S4 X-Coremail-Antispam: 1UD129KBjvdXoWrury7ur4xtw1kZr4DtFW7twb_yoWDKFcE9F yUAr1xZan5Jw1S93Z5AayFkF4vgF4Fqr4rXFWrJrZxZF4UXw48Aa4qyrs3Zwn2kw47Zry3 Z34YgFyxAr4IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR mfOrUUUUU 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?1759337755518921542?= X-GMAIL-MSGID: =?utf-8?q?1759337755518921542?= If EXT4_MB_HINT_GOAL_ONLY is set, ext4_mb_regular_allocator will only allocate blocks from ext4_mb_find_by_goal. Allow to find by goal in ext4_mb_find_by_goal if EXT4_MB_HINT_GOAL_ONLY is set or allocation with EXT4_MB_HINT_GOAL_ONLY set will always fail. EXT4_MB_HINT_GOAL_ONLY is not used at all, so the problem is not found for now. 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 36cd545f5ab4..6122278e91eb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2162,7 +2162,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, struct ext4_group_info *grp = ext4_get_group_info(ac->ac_sb, group); struct ext4_free_extent ex; - if (!(ac->ac_flags & EXT4_MB_HINT_TRY_GOAL)) + if (!(ac->ac_flags & (EXT4_MB_HINT_TRY_GOAL | EXT4_MB_HINT_GOAL_ONLY))) return 0; if (grp->bb_free == 0) return 0; From patchwork Fri Mar 3 17:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307366wrd; Fri, 3 Mar 2023 01:20:51 -0800 (PST) X-Google-Smtp-Source: AK7set9bdBrh5kGFY3zNVIU3GU4f02OgO+KC3Q5Xb7KekeI7TCxtSlXrSKBbeSFxrh29QiCL7SO4 X-Received: by 2002:a17:906:f255:b0:886:fcbf:a1e5 with SMTP id gy21-20020a170906f25500b00886fcbfa1e5mr794353ejb.59.1677835251675; Fri, 03 Mar 2023 01:20:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835251; cv=none; d=google.com; s=arc-20160816; b=Y2k64FTFDEzYnL1uaogBHSY3+Xu+m+qPbqWC6JOGkNa8Y8KwcBNRigVsZ8ZBt9wysN kKqvQZLR7ny7e1dVO+0Fa5Iaahf40j2QQNW+SUNj+gmv9d/Wn8jdrHhc2EdCtuh0sMvn cI7eAw3i9w8D2vV0zYzcy3UlMD/VHn8nqqLggFO9iP4YIpnBug/xYaNnw8FHXtMoCU4p GFQwC1yURXswjBAsMIU/Etei3xAKx/CgJdx5TtEgPohIn+Zd9zkVEFTd1J9MfBTdg0wm UJqMqnMgOzCx9kAaBEzVZPqPXAwJicXCFqUG1eR2LKf+WK9tqqrIwptq+J9hnlb9eHwj o/bQ== 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=aHJSuqjZoNXHjR+mkspZpFNILPY0DASUuACNXc623tI=; b=0ftmWt4c4CThgYge6iJGl1eCUP9TSPq1W7nS8lt4jDxMZoGNT1dfMcvz6uSxg6N7mI RLf9oE5d8YXe1UOY38d3biQwLBOtKH9zXanAH9i02cNJ3OxCwh73iNQxbdCI+MCamiSF xQIBoUXMNPJeAT1QwCjT/YQP/Ga2ZxRdRJ1ZmSm9txzHgjSg4T0lynjSOUR6Uyy8ytYJ QKgU6ifkuRKgJGspv2M5LQiJOS5g0gyKINKjZ5EBxBpCjjPCUdXjBydb3dUBNfa+b0dN JcRMcOyDcK90M6tBRb2kAJ4XWheQUydOjN5VbSlOLVESJbc3+E7LAB8oRla+A9Gk6eOW WqGQ== 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 d25-20020a056402079900b004bff4ce5ec3si2184158edy.371.2023.03.03.01.20.28; Fri, 03 Mar 2023 01:20:51 -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 S230229AbjCCJUL (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBC0734301; Fri, 3 Mar 2023 01:19:51 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9H1Ldtz4f3mJY; Fri, 3 Mar 2023 17:19:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S5; Fri, 03 Mar 2023 17:19:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 03/20] ext4: get correct ext4_group_info in ext4_mb_prefetch_fini Date: Sat, 4 Mar 2023 01:21:03 +0800 Message-Id: <20230303172120.3800725-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tFW5Jw1fAr4kGrykCr45KFg_yoW8JFWxpw nxCF1UurW5Wr1DCw40k3y0q3Wxtw1Igry8XryfWw15urWxJrykXFy3KF18AF18JFZa9r1a vw1YvF13Cr1xC3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRPEf5UUUUU = 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?1759337776542200876?= X-GMAIL-MSGID: =?utf-8?q?1759337776542200876?= We always get ext4_group_desc with group + 1 and ext4_group_info with group to check if we need do initialize ext4_group_info for the group. Just get ext4_group_desc with group for ext4_group_info initialization check. Signed-off-by: Ritesh Harjani (IBM) Signed-off-by: Ojaswin Mujoo Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 6122278e91eb..d1c5b6ea57da 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2569,14 +2569,14 @@ ext4_group_t ext4_mb_prefetch(struct super_block *sb, ext4_group_t group, void ext4_mb_prefetch_fini(struct super_block *sb, ext4_group_t group, unsigned int nr) { - while (nr-- > 0) { - struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, - NULL); - struct ext4_group_info *grp = ext4_get_group_info(sb, group); + struct ext4_group_desc *gdp; + struct ext4_group_info *grp; + while (nr-- > 0) { if (!group) group = ext4_get_groups_count(sb); group--; + gdp = ext4_get_group_desc(sb, group, NULL); grp = ext4_get_group_info(sb, group); if (EXT4_MB_GRP_NEED_INIT(grp) && From patchwork Fri Mar 3 17:21:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307284wrd; Fri, 3 Mar 2023 01:20:39 -0800 (PST) X-Google-Smtp-Source: AK7set8+biLGQnVdbnkz3YcWN++kwNE/9BbHVc1OHutSXO/zp7hE3PYK73DnwcZwbcRmG5S2cPIu X-Received: by 2002:aa7:c318:0:b0:4ac:bd84:43d9 with SMTP id l24-20020aa7c318000000b004acbd8443d9mr1235204edq.2.1677835239196; Fri, 03 Mar 2023 01:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835239; cv=none; d=google.com; s=arc-20160816; b=JvW9Xu1dKJ/K5VWs9ekK9wmOtqI+OI6v+pZzxs3lWZh5rWgd1W+CyhSPrnTWZc4yhh +9rwP91I6/qdB2zOtE6hbNxgJm1ZXlCROe39OLyvREnLIpGu76WJajUZSQ4TQmwDTLA3 M5axw6uozxZX/omfFmLrywszlFExv922WA02pJS/HAEdzOpej8cxsssqZRESMsC67/5c SURPUAUVT0KkGU41/F5cXwElcmrllUMiEG1fwgvvKwcwMSbqXoKVNLvi5IpuQGac+b6y 8eJHARq83yFSCkf/5eLL0J8ReBPN24rpHQeCYXN9t3u0+a36sJgYVLC9uu51EWRQXoFz bYIg== 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=wRyeKPIdQkrPT3jEX1mlESuaqmPMRHRU30aQ+voffGI=; b=F1Au4Z/bhVW4yl8gjgTyipR9QGyd+JM3Ec2w6wsu0epgbF8rXclRBACSy8JuGNYUT5 d/unaBejDImcqWi4xOmfm/vw69VWjCZ0S9EkLI+dEq3xaq5Rf0OXGMKq9ylAH4ik8LoG wekLZmaBsuuq8kNhOMNE4yEGpuNvGTBiDWWRwWgjTJYN1uwiDUh6yrTVwOgmwFn2vwuw oz2Y2zg/LxTAhE4M9gbXJgnwo3KGp6pbG9JNKFPsyTU4xWMy1og+zs1pncSnPTv71tuS DpbsdfDjI3ivMwh5dy4Q8rJQVm3URw0s75t9Oxp0H7btrwq/+itERysoVlrWoCT7TSdW fCiA== 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 op28-20020a170906bcfc00b008b17eb1fda6si1652609ejb.423.2023.03.03.01.20.16; Fri, 03 Mar 2023 01:20:39 -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 S230036AbjCCJUE (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229987AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4714A3A853; Fri, 3 Mar 2023 01:19:52 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9H5XNjz4f3nTT; Fri, 3 Mar 2023 17:19:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S6; Fri, 03 Mar 2023 17:19:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 04/20] ext4: correct calculation of s_mb_preallocated Date: Sat, 4 Mar 2023 01:21:04 +0800 Message-Id: <20230303172120.3800725-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFWDCFykAw4DKryrWFW8Crg_yoW8Gr15pa nxGr1UGwn3ur1Ykayvgwn8Ww1Ika1xKr45GryIgr4xuFZrJryakF1DtrW8WF9avr48ZFnI vrW2vryUCrWI937anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx 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?1759337763774150597?= X-GMAIL-MSGID: =?utf-8?q?1759337763774150597?= 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 d1c5b6ea57da..d7ea3c2014ff 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4670,8 +4670,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); From patchwork Fri Mar 3 17:21:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307323wrd; Fri, 3 Mar 2023 01:20:45 -0800 (PST) X-Google-Smtp-Source: AK7set/XEwvKE5Rq1kxSAhMn9VlY3Slrd/TwUXXAB/kYXpeA1AIGtaD5Q25deXHhl6Y4peD/wIAV X-Received: by 2002:a17:906:1e47:b0:8ae:a761:e361 with SMTP id i7-20020a1709061e4700b008aea761e361mr951479ejj.41.1677835245068; Fri, 03 Mar 2023 01:20:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835245; cv=none; d=google.com; s=arc-20160816; b=mwWizFITa3ZXMBA8fMfXIwmch9JLoegpMn308pNA8ocVUyhEkEyRP/bj6JlB+6O1JA RBof9ir3T4RPDPrry3YfFFfSrVzvLG4YH+8Fe0TdM3sZC6oQLVH6ioRAp8kozFaZhKx8 HWewEfYnc+1iOeR5fxqpW3H+o6TYxVNgLHk8YIYvP9gJujg4rd3W4bedp887GWzkynwH w+JRHLwsVCrH0NKiUvFRgNTYD6MQtu+1EtOh3W9rKTjog7T0w10kFdDHB8Z6V+GD38ey oUCwEajfqFIo9BbxRmy8T3gvWjIrb1qK7QHn4XV2uIgea3QMBAfYUbBbaddsnvKJrcMD +6HA== 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=5jBOq9KOnuFWQXDzOdz4WoErKQaJ1hv2DvbAIsJr/Bk=; b=PVsRHqeASWoFyB96B4X9LevMv6q7B+1D8bqLCauI6u3k9n8qJAHcPcpXiiKmED5vE8 Z6vEVJV7vcsUHG8vp3vCzd+qz+7iXbBJMBqZRU49YgoKu0YUeOnoirFGrkmHNUdkzmZn EdJ7yIHrjbK6T2XRhouMmOSuIguE+xnzIr2WIwoR5XgS+BjNex8pqM0sZpVibceZF22t zHO+x/u3vVEeqCjW7TXz8LGCQjCt26MRSLUZChPPV0BJGvhsbk7I1t7adJv+ywvn3ghc 5kXbSyUmvHfjcvrLdwq6UwqdBIjvJmMlufwdmfC24JxL+RMJo1ozbZxUMDKJeKP2RwUo JCxA== 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 f9-20020a50ee89000000b004c21e05c798si2273190edr.27.2023.03.03.01.20.22; Fri, 03 Mar 2023 01:20:45 -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 S230137AbjCCJUH (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 820EF41B7F; Fri, 3 Mar 2023 01:19:52 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9H6VZqz4f3mJd; Fri, 3 Mar 2023 17:19:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S7; Fri, 03 Mar 2023 17:19:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 05/20] ext4: correct start of used group pa for debug in ext4_mb_use_group_pa Date: Sat, 4 Mar 2023 01:21:05 +0800 Message-Id: <20230303172120.3800725-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S7 X-Coremail-Antispam: 1UD129KBjvdXoWrZF17Jr1ftr1rZrWxKFWxZwb_yoW3GFbE9a 40yrZ7Wa4rX3s3u3Z5tr4SganIgFs5AF1UXFs3Jr1ru3W5WF48Gw1DWrs5XFW5WrW7Ary7 JasxAryUJFyFvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== 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?1759337769867654199?= X-GMAIL-MSGID: =?utf-8?q?1759337769867654199?= As we don't correct pa_lstart here, so there is no need to subtract pa_lstart with consumed len. 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 d7ea3c2014ff..d6a27e47584a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4322,7 +4322,7 @@ static void ext4_mb_use_group_pa(struct ext4_allocation_context *ac, * Other CPUs are prevented from allocating from this pa by lg_mutex */ mb_debug(ac->ac_sb, "use %u/%u from group pa %p\n", - pa->pa_lstart-len, len, pa); + pa->pa_lstart, len, pa); } /* From patchwork Fri Mar 3 17:21:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307429wrd; Fri, 3 Mar 2023 01:21:05 -0800 (PST) X-Google-Smtp-Source: AK7set/jl5alAJiq/k7airg0BqvvVMXX5yuu1ySP07iBtt0Hlfn+fnAAP0l3Aq5ZeLn2XxIBYp7e X-Received: by 2002:a05:6a20:431e:b0:cc:9b29:f617 with SMTP id h30-20020a056a20431e00b000cc9b29f617mr2065462pzk.0.1677835265340; Fri, 03 Mar 2023 01:21:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835265; cv=none; d=google.com; s=arc-20160816; b=mFHf7vdlIQZ8nu1hZg8TNSbTQsGRMgEvBH3T7IqSvnetAkFYLVn2vuG4VgTxIJom4o T5oV4iW06YNvNSg+gDNSWOt2drZWoNV2EHI2mU7j/byBO8A8eb5ZhBFQPXiF1cIByS2b Nxd40D3O26+J1D5LOkolrVSRPi+ZoXiBoh6Ajh2l4/M4BGVYiITqJjuR0N6hcOE+b93M 3VDl3gXUK77fvAQ5q/Nhzwp4G7G/PlxCGqXFmZWpwRbxcCESvcHCV7bUWoirUZtTWnem vVcb/ks/7dRTYGTvFuVEC8pWlYE35Gf79f0TBGGIpcw+KieaMUuOXkI2Z1KChxfE/kfC 9cpg== 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=0cSBCCqH3DUMoPiEfavHLIiQ46NcSse9SRVqXKiHayw=; b=We8XQYXmygS0w67OpsBwX0grwyhr5Pc/hLLSi14+eBFhyLgtlUCeM7ZoDvA5wKG5YA gP2iJZs1/Zy+MewMtPzZJZ4lJJ+ML4mhim6Wf/HNO1+Ld1Qrq+diAHd0sgjiBWEHGUve hpH020y4IptbPk6tfqXsIUvufco7TUISbqkUasUMZsiNkGK67TsWDN4nkj85hIkkXG+b HU6+bXuzzv+obz1WQ2TiRfOZ4wfa2NWR3bZoq7CRJlygBxX0+orblbxy4HoYGIIk5LB1 f9oIez9HvdQSyUHsH2Eo/UKlOli3eIixygbpPYZGtuoECt+E+SlzwDzlOPL3O2JdmAJS r9Bg== 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 w4-20020a656944000000b005030127c431si1494431pgq.808.2023.03.03.01.20.52; Fri, 03 Mar 2023 01:21:05 -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 S230346AbjCCJUY (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230000AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C8C23DA8; Fri, 3 Mar 2023 01:19:52 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9J3XCHz4f3nTZ; Fri, 3 Mar 2023 17:19:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S8; Fri, 03 Mar 2023 17:19:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 06/20] ext4: protect pa->pa_free in ext4_discard_allocated_blocks Date: Sat, 4 Mar 2023 01:21:06 +0800 Message-Id: <20230303172120.3800725-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S8 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1UGF18KFyfKw1fXF1rCrg_yoW3KrbE9a 48CF4xJFWrJw1fu3W8tay0qrs5KF4Fyr4UWFWrtw1fu3WrXF4fG3WDXr1rJr9rWa1jy343 C3s5uryUGF40gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== 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?1759337790950381421?= X-GMAIL-MSGID: =?utf-8?q?1759337790950381421?= If ext4_mb_mark_diskspace_used fails in ext4_mb_new_blocks, we may discard pa already in list. Protect pa with pa_lock to avoid race. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d6a27e47584a..56f35a25842c 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4266,8 +4266,11 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) ext4_mb_unload_buddy(&e4b); return; } - if (pa->pa_type == MB_INODE_PA) + if (pa->pa_type == MB_INODE_PA) { + spin_lock(&pa->pa_lock); pa->pa_free += ac->ac_b_ex.fe_len; + spin_unlock(&pa->pa_lock); + } } /* From patchwork Fri Mar 3 17:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307454wrd; Fri, 3 Mar 2023 01:21:12 -0800 (PST) X-Google-Smtp-Source: AK7set8HBrCpruUhHGBpAkleTH8cG8canLvp0t/hsyw7Wrh2AnxK7bLx5VfVY+8VvDS/oTvxIUgI X-Received: by 2002:a17:902:c14c:b0:19d:74c:78e4 with SMTP id 12-20020a170902c14c00b0019d074c78e4mr1243590plj.55.1677835272514; Fri, 03 Mar 2023 01:21:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835272; cv=none; d=google.com; s=arc-20160816; b=074uaOwgx1J+qeQXaz5RpBD58rKtECiE0Ghewcp3cLBN8g+mkLzWrf2KnORtXgzLB5 TV2Niu3Q6W+pZnxSfX2SSGPOpjki4ufL4kFYKL7Pqu17VJENNovqEMLCnWOZeIIt2P7n bOO+WetK2/kGaRgcix8p8177RTlIb5XWnuMSizzu9rYraXNga8ktf5zP8jfnLRc8f1i0 R27ePP20CH6P3AmwhK7jg5ugp3LWIFnJZx43pDObitKrW9YccfJhPg7tjLnmEfPMNT4c 5tFYtOfLbO6SWRUlO4uJoIeK6joZeHdRFvsN5V35YvfC+Wk2+FCBet5OZMDnBOqDEOAF EnLw== 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=v5AjgFjcr8Zu+vR4InzaKedLXt28MDbK6q82UtYwgIU=; b=U8FkVBcRXy9TjvB4Kn28tvXqA4d8pA/DIyo59PZw9NTjTXgCJ6EpkZLSHyY+7a2hHF y9buloC/ZvuhV3W3rAtwZIRtDn1lVtsmLVqpWr0tVdxpNqQj/y4ayUAq7pzljaRvww9b vL0w2O5zg0hZ2p0T3OHuaeavjJSOy6YxA2KgNwYfE4umtEbkWAIw3RCrzG8pNuLDny4N h8YS3in9IAUExPyE+bBjYLHGJs4hAJbckIm8FLW1KPTJkExned7VEzKT3eQM5ox81gPs G5+1xdqLaDncdOKblHmfDGvTNDCAhPej81AVciKPhvw9AHlB7fhRDbCETf+vQBqVdAQz OHvw== 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 ld14-20020a170902face00b0019a84b88f81si1666275plb.435.2023.03.03.01.21.00; Fri, 03 Mar 2023 01:21:12 -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 S230446AbjCCJUg (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230021AbjCCJTy (ORCPT ); Fri, 3 Mar 2023 04:19:54 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B695DBDB; Fri, 3 Mar 2023 01:19:53 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9J5p6Dz4f3nTm; Fri, 3 Mar 2023 17:19:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S9; Fri, 03 Mar 2023 17:19:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 07/20] ext4: add missed brelse in ext4_free_blocks_simple Date: Sat, 4 Mar 2023 01:21:07 +0800 Message-Id: <20230303172120.3800725-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4kXF15Gr4DZFW3KF48JFb_yoW8Wry3pr 4DAF4UGFn5Wr1DWF4IqryUX3W8tw1xW3WUGFyrGwnrCrW3tr9aqF4xKF1F93W5tFZ3AanI vFn093yrJF1jgFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU 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?1759337798558540430?= X-GMAIL-MSGID: =?utf-8?q?1759337798558540430?= Release bitmap buffer_head we got if error occurs. Besides, this patch remove unused assignment to err. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 56f35a25842c..fca11be28fcb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5848,13 +5848,12 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_get_group_no_and_offset(sb, block, &group, &blkoff); bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { - err = PTR_ERR(bitmap_bh); pr_warn("Failed to read block bitmap\n"); return; } gdp = ext4_get_group_desc(sb, group, &gdp_bh); if (!gdp) - return; + goto err_out; for (i = 0; i < count; i++) { if (!mb_test_bit(blkoff + i, bitmap_bh->b_data)) @@ -5863,7 +5862,7 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, mb_clear_bits(bitmap_bh->b_data, blkoff, count); err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh); if (err) - return; + goto err_out; ext4_free_group_clusters_set( sb, gdp, ext4_free_group_clusters(sb, gdp) + count - already_freed); @@ -5872,6 +5871,8 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_handle_dirty_metadata(NULL, NULL, gdp_bh); sync_dirty_buffer(bitmap_bh); sync_dirty_buffer(gdp_bh); + +err_out: brelse(bitmap_bh); } From patchwork Fri Mar 3 17:21:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307949wrd; Fri, 3 Mar 2023 01:22:47 -0800 (PST) X-Google-Smtp-Source: AK7set94BZZxph1RoHHPHuUJgV2MBnCPmDGbqD15aZAVFB47yME67VAUZ36lmbHWiqO6zLeEc5IL X-Received: by 2002:a17:90b:1b52:b0:22b:b82a:f3a2 with SMTP id nv18-20020a17090b1b5200b0022bb82af3a2mr1091494pjb.11.1677835367143; Fri, 03 Mar 2023 01:22:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835367; cv=none; d=google.com; s=arc-20160816; b=cbOkqSHIJpF3T4rMtXE56kIIWyQL6vJ5e85XShgPOACnXoB1Ib6czqrmRaV9ERTJ50 0C3cv2GvEuzjBlRMGaxxmYMJq59RRtCCKzhJqTBdPQsr5LPqL9ts8r9g2leDdxw50hl1 /JOOrg0cUQlnEnev7Z1PqNbazitJeAm29x+P28zYFqNAMpv/mCHbAfBJB6axEvvwhstQ It3cucvjVQOidKN4n7+ZMxJ41gMiTuQPn5mvHdVvtb3nceDi2k+wOXf37/XrqyfDxtOC syOiXbC4kXL/09BYBNpdoaiSPltbagnHYMrwAZrSf7wzrRi5fKzQPgypBC2wzK8JgRpp CNeA== 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=k6dsT/X/2A+yh2cfjoNvHM+auveP2zP1QKxKZ5iTUEw=; b=F1FddbBPtiMLrioxdaMM/J7gWFnwP3ye//GsiBCeRshFzwrtqXOiA/p39APlvAm71A j1Kjlt2VhQYhShvgaHWM8gsWtJfTfmSdEGl6z6/fKqssgro+EJXWe658irgvWReJBHme gkacGDBrHljxRG6tOG6wvj1uFhBgoOdeQroGAKFHTpARC7QsHdILfCUioEVvv0UpPqx7 OPq0nPMi0UUNfBnl+ILLdJ685Ah1Hn82e9g7OBy5Wn7EMFnzgE1RPoTGD4bHmhPUFjnc QLqzG019n1tc+wRwzOc6d0S7dA2C2961FeGC2k3bDyJ+xsDrhJ1Sw058r9WuynouMjZT JvEQ== 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 gq1-20020a17090b104100b00235563071d3si4576146pjb.75.2023.03.03.01.22.34; Fri, 03 Mar 2023 01:22:47 -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 S229930AbjCCJU2 (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230045AbjCCJTz (ORCPT ); Fri, 3 Mar 2023 04:19:55 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D382634301; Fri, 3 Mar 2023 01:19:53 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9K0zbqz4f3nTW; Fri, 3 Mar 2023 17:19:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S10; Fri, 03 Mar 2023 17:19:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 08/20] ext4: remove unused return value of ext4_mb_try_best_found and ext4_mb_free_metadata Date: Sat, 4 Mar 2023 01:21:08 +0800 Message-Id: <20230303172120.3800725-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S10 X-Coremail-Antispam: 1UD129KBjvJXoWxJrWUZFWxZFW8tF18XF48tFb_yoW8tr47pF srJFy8Cr1xXrn8uFZrua15X3ZY9w4xua4UGryIgw1rCF13urWDKF47t3W0vFyFqrWkuFnx AFWqvr15GrsrK37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU 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?1759337898211237245?= X-GMAIL-MSGID: =?utf-8?q?1759337898211237245?= Return value static function ext4_mb_try_best_found and ext4_mb_free_metadata is not used. Just remove unused return value. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index fca11be28fcb..df76f859f3ff 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2124,7 +2124,7 @@ static void ext4_mb_measure_extent(struct ext4_allocation_context *ac, } static noinline_for_stack -int ext4_mb_try_best_found(struct ext4_allocation_context *ac, +void ext4_mb_try_best_found(struct ext4_allocation_context *ac, struct ext4_buddy *e4b) { struct ext4_free_extent ex = ac->ac_b_ex; @@ -2135,7 +2135,7 @@ int ext4_mb_try_best_found(struct ext4_allocation_context *ac, BUG_ON(ex.fe_len <= 0); err = ext4_mb_load_buddy(ac->ac_sb, group, e4b); if (err) - return err; + return; ext4_lock_group(ac->ac_sb, group); max = mb_find_extent(e4b, ex.fe_start, ex.fe_len, &ex); @@ -2147,8 +2147,6 @@ int ext4_mb_try_best_found(struct ext4_allocation_context *ac, ext4_unlock_group(ac->ac_sb, group); ext4_mb_unload_buddy(e4b); - - return 0; } static noinline_for_stack @@ -5699,7 +5697,7 @@ static void ext4_try_merge_freed_extent(struct ext4_sb_info *sbi, kmem_cache_free(ext4_free_data_cachep, entry); } -static noinline_for_stack int +static noinline_for_stack void ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, struct ext4_free_data *new_entry) { @@ -5742,7 +5740,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, EXT4_C2B(sbi, cluster), "Block already on to-be-freed list"); kmem_cache_free(ext4_free_data_cachep, new_entry); - return 0; + return; } } @@ -5768,7 +5766,6 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, list_add_tail(&new_entry->efd_list, &sbi->s_freed_data_list); sbi->s_mb_free_pending += clusters; spin_unlock(&sbi->s_md_lock); - return 0; } /* From patchwork Fri Mar 3 17:21:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63820 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307435wrd; Fri, 3 Mar 2023 01:21:07 -0800 (PST) X-Google-Smtp-Source: AK7set8WPMx8NnABDu+dQqJcthjpNQrGky6VFZBHmTLfxoLvDnypeVIXi3Xfu7G0zDha4GQXeuYR X-Received: by 2002:aa7:c391:0:b0:4c0:95c:42a8 with SMTP id k17-20020aa7c391000000b004c0095c42a8mr1255432edq.4.1677835266925; Fri, 03 Mar 2023 01:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835266; cv=none; d=google.com; s=arc-20160816; b=TtBHj4VQPT9BRvjnGbKHOZPrJzBNE86R2W0qSICvFXcLmoM4MLuFpLLMMQ/8LrnEkA D5o9rv5OQJrADw6yPGzNrVE81OgHy6UdEniX4WKA3N2GwF8ciEuyQ9gCrRYCvLVihnFr x2QE0+RlAy5D+L45ipfjQRfBP6LiyU9L0m5E+0Mv8e+qhoKP/Ic7lToYHQ39ymG5Zalj GRcVU0y2FgPTMIaJgsmBiitUTVqWMkC19DIa+DB/3uGc6QBwg2pReRZumIz+2IbqOEGU xu0i9sW5LAeIhIcrqHZ5NfDtyz9++D6HluOGrSWt0PPUuU8Kbj6zmjqoRBE/+O5b3bYF 0U9A== 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=TXtfZR1autEiRb2fbG7LLwG+630NCT6922jOySCSLfg=; b=ubMd65x5rjoP24hceok1MZkns5cWRV71wZkDpdtjMWc/344xSLDBeJpufdIryHG24z b3Tp9DTHzjjmuhgUeiAQf/ZUxmxyzvwGi4sZgIp4LrDegLXPID6Xu46UH5lBfbjVSaQ2 8EAUnB0E3lK3XH1sHQcX8u+hZuTUxBKSiOKLLeaBjmW2Vldf4hlr8qp4HsfGLaUi86sR gdCh8wsTnhcTrm+6XBKfQHeh2GPuv1YRI5XNh/Putb1lWCswGA1nvM4AyUgP8om9klOl xVrx1+j/fnOjOPYsWkHfDDuSIm/OUCuHPB3x2i71UQQJ76MxHfWjNZy5Fs11kTNSVh2e blRg== 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 v25-20020aa7cd59000000b004acb81fcb3esi2009636edw.499.2023.03.03.01.20.44; Fri, 03 Mar 2023 01:21:06 -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 S229728AbjCCJUW (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbjCCJTy (ORCPT ); Fri, 3 Mar 2023 04:19:54 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAEFC23DA8; Fri, 3 Mar 2023 01:19:53 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9K1r2qz4f3mJp; Fri, 3 Mar 2023 17:19:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S11; Fri, 03 Mar 2023 17:19:51 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 09/20] ext4: Remove unnecessary release when memory allocation failed in ext4_mb_init_cache Date: Sat, 4 Mar 2023 01:21:09 +0800 Message-Id: <20230303172120.3800725-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S11 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw1rKw1DWrWUWF4DAr4UXFb_yoW3ArcEga 4v9r1kX3yrt3Wft3Wvyw4Fqr90qan5AF4kXrZxtFs3uF1Ygw4fu3WkJrs5AwnrW3WavrZ8 Cr93Jry5KFW0yjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 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?1759337792778854777?= X-GMAIL-MSGID: =?utf-8?q?1759337792778854777?= If we alloc array of buffer_head failed, there is no resource need to be freed and we can simpily return error. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index df76f859f3ff..9e998b5d4037 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1168,10 +1168,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp) if (groups_per_page > 1) { i = sizeof(struct buffer_head *) * groups_per_page; bh = kzalloc(i, gfp); - if (bh == NULL) { - err = -ENOMEM; - goto out; - } + if (bh == NULL) + return -ENOMEM; } else bh = &bhs; From patchwork Fri Mar 3 17:21:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63821 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307448wrd; Fri, 3 Mar 2023 01:21:10 -0800 (PST) X-Google-Smtp-Source: AK7set9UK5SNXyBsfS7RnUpDyq78mYAjfgwytUwxxZzcUyFBIwu98jRsHU24d9kKgxCq2RCr4zg3 X-Received: by 2002:a17:902:ecca:b0:195:e9d4:5380 with SMTP id a10-20020a170902ecca00b00195e9d45380mr1491925plh.56.1677835270294; Fri, 03 Mar 2023 01:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835270; cv=none; d=google.com; s=arc-20160816; b=UiP6AJcFrKnPu+kt8QT+XBMOEycGStvsyiofhq2eo56Yb/GHuOgRNi4qniHzVUDNMy 1ZdJ9/u4tdOOsdTdO7fqSy73oDNYNCnHP1PJvUmXIk8HonkwhzWgZIsF9YUZjC1FmGV+ 6Uo012W3l1PNZfTQbRHAzDu2Eb5ZqQCEzEutTrJbMQbynx9s00/CPTVMtLuz8QXfRqsI upjB75avvOTbD2UYVAVgBuCMdYWLeohv5ll2lF3Zh7+nnOt2o3HPj6Bz1Gu6T5IpjTob 6JIPEAiOdAyjaBI+z3f7Mfq66k1Z5mBMT4AsdkNCMjKzESZbNJ1fuPh9BiTaPJr85wDD Dr3A== 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=G/QoxnSXoO9OWs/yd4RnwVNnZcYjDWSyJ6VRjrabOAk=; b=NOFyd9+LR1xYalrNJ+JrLFQ2tvj/u79ZYAdl90VuOCANsystk8AihDAVyNn/8muA72 TCkCGi05L2SyTKHEnD+TW4aT8QdHEzwZHbFutlCVpFT9+L1+XxVrNYdxfVdrtOFVjhcQ fJyDnCxKbaLCcKdcMbsMb7Dbp0xh1s8bK6GTa9j5C6/vWlaX5xXwc1fqCa2Flsr7rtu3 ql1Ju1f8uvSjUc4N/0grLW36/mWss8zZZG0KWAP4QgYedo9GsaG8JFZ2KhEHMrt3wQCD NqVjNR4v0uTCZ4L9yatgDlRL7tGQZmonVoqk579f/X/S8jBVPmCOPe0PeKSdj2FviPq2 E7iA== 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 kl5-20020a170903074500b0019c33d386e5si1659709plb.517.2023.03.03.01.20.57; Fri, 03 Mar 2023 01:21:10 -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 S230404AbjCCJUb (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbjCCJTz (ORCPT ); Fri, 3 Mar 2023 04:19:55 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 349733A853; Fri, 3 Mar 2023 01:19:54 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9K4Nq6z4f3l6l; Fri, 3 Mar 2023 17:19:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S12; Fri, 03 Mar 2023 17:19:51 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 10/20] ext4: remove unnecessary e4b->bd_buddy_page check in ext4_mb_load_buddy_gfp Date: Sat, 4 Mar 2023 01:21:10 +0800 Message-Id: <20230303172120.3800725-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S12 X-Coremail-Antispam: 1UD129KBjvdXoWrZr1rGF1UuF45Ar1rZry5Arb_yoW3twb_Ga 4Ikr48tr4rJr90kFn7ZwsIyws8KanY9rW8XFZ3tryUZFyUArWDZw1kur1rAa1xuFyj9rW5 CF13ZF9rJFW09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 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?1759337796615112442?= X-GMAIL-MSGID: =?utf-8?q?1759337796615112442?= e4b->bd_buddy_page is only set if we initialize ext4_buddy successfully. So e4b->bd_buddy_page is always NULL in error handle branch. Just remove the dead check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 9e998b5d4037..6eea1296b82a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1555,8 +1555,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, put_page(page); if (e4b->bd_bitmap_page) put_page(e4b->bd_bitmap_page); - if (e4b->bd_buddy_page) - put_page(e4b->bd_buddy_page); + e4b->bd_buddy = NULL; e4b->bd_bitmap = NULL; return ret; From patchwork Fri Mar 3 17:21:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp310686wrd; Fri, 3 Mar 2023 01:27:21 -0800 (PST) X-Google-Smtp-Source: AK7set8RiTfdCO51LAXliXcByyaea+EoskJaERjOUNHHUgd5sORDXCPKz+WQgku8uUlDxkspniUK X-Received: by 2002:aa7:c245:0:b0:4ac:b431:4762 with SMTP id y5-20020aa7c245000000b004acb4314762mr1104838edo.23.1677835641157; Fri, 03 Mar 2023 01:27:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835641; cv=none; d=google.com; s=arc-20160816; b=a5SvC0HMdzieqlyI2Yw+uQbwMfgePNcWm8TlKkGrPkLTuwoljf25MyDcHMepmSbFbU 8Z++vvxaeQkf9iz/DCxxCn4bEB9HzCzxWDfroTx9zmNMz/EId4sETt5xV4WC2dJ3tUk/ qsddtcRRqzt2OXU6lvxEDweFfEOiV18LtQcy0iY6pn1FbwVe5XwgYmlnrax/9nLdIfTh FpTWh0oaNb/46gdF/COBZyALxZkxJVMQKsKs8ffhF8igC4KZMG58PmfsWiK+Pi0qIeS/ Lti352C+joYorWURzGJSRWJ2+2oLhhzyJrJK6FNjGUESPUX46SGhhIySIVRj+hOddChA zWuA== 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=WruWC3YAQIoqQZZHCjrYDJEEEbDGpHUkYW1DodYnFxE=; b=Y3MVJiUKOZqBn8Zpazw59A7SUQQnO6mdDoILpHvmmEQhXE0xSvtyuwD1TbYrbEzh/O RIMbjabgAZE3rlUQ5CfOAw2KH/valzZ7SrzyTI7QA+TTleOZjiNDfFkiI71a3+L/Gi1b RfptwbpL0CZaa0p/gv0Fb4KWGGu2g8w7BS1DGnpSrUAVi+p4brAkYbFoHUtvY86qgJfC PJjmpcqN5cZcGdGhmkGKbQdN9JyZsyFIHnb3dp3/Rb5F8RkKN8rbzX1a0f15EinnH13c QDk1EPrDrjLg8vs+RgM/q7pVEjF8fb4zIloBFaEs9Gh9AJb3lup817c9240qjHWabhFI Bx0Q== 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 n17-20020aa7c691000000b004bde63cd3adsi2198483edq.115.2023.03.03.01.26.58; Fri, 03 Mar 2023 01:27:21 -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 S230445AbjCCJUs (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbjCCJTz (ORCPT ); Fri, 3 Mar 2023 04:19:55 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2783DBDB; Fri, 3 Mar 2023 01:19:54 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9L1105z4f3jpm; Fri, 3 Mar 2023 17:19:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S13; Fri, 03 Mar 2023 17:19:51 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 11/20] ext4: remove unnecessary check in ext4_mb_new_blocks Date: Sat, 4 Mar 2023 01:21:11 +0800 Message-Id: <20230303172120.3800725-12-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S13 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyrZFW5uw13tFW5GFy3Arb_yoWkXFXEga yvyw18Ca1ft34Ska1kAr40gFs0gFs5tF18XFZrKr43uF15X3yrW34kZrs5Zr1kWay2y3sx ur1rArWvyr4S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 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?1759338185007222859?= X-GMAIL-MSGID: =?utf-8?q?1759338185007222859?= 1. remove unnecessary ac check: We always go to out tag before ac is successfully allocated, then we can move out tag after free of ac and remove NULL check of ac. 2. remove unnecessary *errp check: We always go to errout tag if *errp is non-zero, then we can move errout tag into error handle if *errp is non-zero. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 6eea1296b82a..e53bf9d5a48d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5641,16 +5641,15 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, *errp = -ENOSPC; } -errout: if (*errp) { +errout: ac->ac_b_ex.fe_len = 0; ar->len = 0; ext4_mb_show_ac(ac); } ext4_mb_release_context(ac); + kmem_cache_free(ext4_ac_cachep, ac); out: - if (ac) - kmem_cache_free(ext4_ac_cachep, ac); if (inquota && ar->len < inquota) dquot_free_block(ar->inode, EXT4_C2B(sbi, inquota - ar->len)); if (!ar->len) { From patchwork Fri Mar 3 17:21:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp313114wrd; Fri, 3 Mar 2023 01:30:01 -0800 (PST) X-Google-Smtp-Source: AK7set81NBAkdDTDBGwT2/idewF42vRExS0GIM4jh9/uMXpzRugrfJi+HZD3Uikj9pC6/FHP7jEV X-Received: by 2002:aa7:c642:0:b0:4ae:eb0f:4220 with SMTP id z2-20020aa7c642000000b004aeeb0f4220mr1089177edr.38.1677835801634; Fri, 03 Mar 2023 01:30:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835801; cv=none; d=google.com; s=arc-20160816; b=Ha+tN57U4vQDW5SKQWqV7rsHCwJ3aTCOO8QNOuOHp2GcFxJYOCRjcCeTKv1NFT38KU oW8lA/9JFNh5dXDWBMXKbqbkSPl0m7Wcx2aQUd89HULGJ9bdbOdFxN048rsz31WXLoXp axQs6QSWXRAmFAnt0pbP3zMqWL3AP7ET/xbfcR+i3tWowA2MSEJ8bj/IE02HP0siyjc2 zPZtZq57TLr38clBnckI9382EKZGa5qb6r+le9JS9T0WJdk9Ltpxm4qeznxT6+E6m69G bslJ52izJc4Hi2ix9u4zf3GNQjqoGpFUrUi7kEs+0Zn0BT95N31cn2qpFkUovDuyFE1J oloQ== 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=c9LyKu3PiFZdpRdMTtKX84cYSnX473vdnzqROG+K9t8=; b=qCXZvRL+nYiMfbQ/NaLSvixl3fO/miXsmvvu+NL8D0F8lxfyB4zeX1L8qPVY8svVYh AXYUm25yg1SqQmEcmd/qkjrRkB7Wo8nlnKFRYl3dceGrAwSPpzBDeNpzWQ34hDId6qPZ ojVG2Q/VdKzn25Nd3QxZe3XQWdtSkjYtTiJSIWLmI/dkmRiDVjoeEX72kKoSMknwPKDT VwbnVlthI4l8+MXJk/02hJh4aXGDi+BXgWtUuV7grKD1iciVATIbOI2Hp/ulo+AgPILx t0BSIEaNNklNPACyS+HaJHfX0BEawfG38sablLej0+ueOnvPNxwGzYQvYSdz3+1G6Cxa Pmfw== 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 w4-20020aa7d284000000b004ad02463b96si2012488edq.108.2023.03.03.01.29.39; Fri, 03 Mar 2023 01:30:01 -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 S230048AbjCCJUv (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbjCCJTz (ORCPT ); Fri, 3 Mar 2023 04:19:55 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2C4923DA8; Fri, 3 Mar 2023 01:19:54 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9L2NLlz4f3mJv; Fri, 3 Mar 2023 17:19:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S14; Fri, 03 Mar 2023 17:19:52 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 12/20] ext4: remove dead check in mb_buddy_mark_free Date: Sat, 4 Mar 2023 01:21:12 +0800 Message-Id: <20230303172120.3800725-13-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S14 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr4rJr4xZF45Gr18Gw43trb_yoW3Cwc_KF y3A3y8XrWrtr4Fka48Ar4vgw40g3Z3Cry7X345tr4xWF1UW39xJw1qqrn3Ar1xu3y2yrZ8 Cas5Ga47uF40gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 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?1759338353676155454?= X-GMAIL-MSGID: =?utf-8?q?1759338353676155454?= We always adjust first to even number and adjust last to odd number, so first == last will never happen. Remove this dead check. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index e53bf9d5a48d..16f926675006 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1718,7 +1718,8 @@ static void mb_buddy_mark_free(struct ext4_buddy *e4b, int first, int last) break; order++; - if (first == last || !(buddy2 = mb_find_buddy(e4b, order, &max))) { + buddy2 = mb_find_buddy(e4b, order, &max); + if (!buddy2) { mb_clear_bits(buddy, first, last - first + 1); e4b->bd_info->bb_counters[order - 1] += last - first + 1; break; From patchwork Fri Mar 3 17:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307621wrd; Fri, 3 Mar 2023 01:21:42 -0800 (PST) X-Google-Smtp-Source: AK7set9VKFwgo5xzhu8rhYG3OGvNSI37ACM1hOo4YiS3eEWR/IUBtQphVsstxju0CdB2TpkyJSYw X-Received: by 2002:a17:906:8317:b0:88d:5043:2299 with SMTP id j23-20020a170906831700b0088d50432299mr881212ejx.51.1677835302096; Fri, 03 Mar 2023 01:21:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835302; cv=none; d=google.com; s=arc-20160816; b=1Gd4svrvu2rtoH/S06FxaBjPwoiJ/CSVqmtWHNC8PMBMYqvk/HkM4wE23stx3soPPk lWqoDigaky7O7pSmcTw9I2HEjdQEFNnoR8ICrNfu71wm90q5nh/anWnBYmfAbO5jU326 vlJwbGp0yWNqIK9TE6Ow0GbLpcp7ORqt0/8og216zaw0jnUXEt4H4dqE7CgpL4sjDMfW G1fKMGRhhm8KRSZwRJlwPcbXRHDVKRm0foGaEoifC2vRSkcmFAbjoDdVlNl9PXK7euP2 +aY5cn4hVp8kCBrgmPD2QcE06SY1PZXwqPjVHjqq1bVUdkbpwXxSVLwwMS6duFMDIJFL kMSw== 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=GaxpPrrAuww9XU+nHiQhJUflkX/X5p/2W8ALEaPSOY0=; b=t1qJ45m1RJBbncORkzdETOWlGAOD7BzNs0DSq84oynb1JtSbsy/bT1UFMYHdJEWPpN fW9GhrLgQS9dw7axB7iaWfZAnxYclxP0t+l+q54lWto9fKzukDiPDWsn71/05917yhUd RAoGNQmOZ96xqRiNoDgSRl3hLmK7EiZLZ1p4SMpErd/92o8Yc9IcCO67y4hKzHH4z4EK fNOCPL5BoKJ/MLipG+/aznzpzkgah87JQHw3ubFNKZma6fxvVv4UsFI0Ftn24EfWQGl6 f0Zj3OqRiBz/f65JlZ+IiObrRp82y+BbQfKHuTt+Cr1BimBDd0ALfzD4XcRJ+8MwDbwJ Hjqw== 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 t24-20020aa7d718000000b0049f1fb93929si2342494edq.164.2023.03.03.01.21.19; Fri, 03 Mar 2023 01:21:42 -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 S230421AbjCCJUo (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230078AbjCCJT4 (ORCPT ); Fri, 3 Mar 2023 04:19:56 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E0A441B7F; Fri, 3 Mar 2023 01:19:55 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9L6Jdfz4f3nV9; Fri, 3 Mar 2023 17:19:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S15; Fri, 03 Mar 2023 17:19:52 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 13/20] ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits Date: Sat, 4 Mar 2023 01:21:13 +0800 Message-Id: <20230303172120.3800725-14-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S15 X-Coremail-Antispam: 1UD129KBjvJXoW7KrW5tF1rZrW3CryUCr17Wrg_yoW8Ar1Upa nrCryUG3yxWr1a9wsrK3Z8W3WFkw4fKFyxtryxur1rA3W7X3yqka9xtFyUZF9Fyws3Z3Wf ZFyYvr4UGw4Ika7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU 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?1759337830019852454?= X-GMAIL-MSGID: =?utf-8?q?1759337830019852454?= Only call trace of ext4_mb_check_limits is as following: ext4_mb_complex_scan_group ext4_mb_measure_extent ext4_mb_check_limits(ac, e4b, 0); ext4_mb_check_limits(ac, e4b, 1); If the first ac->ac_found > sbi->s_mb_max_to_scan check in ext4_mb_check_limits is met, we will set ac_status to AC_STATUS_BREAK and call ext4_mb_try_best_found to try to use ac->ac_b_ex. If ext4_mb_try_best_found successes, then block allocation finishs, the removed ac->ac_found > sbi->s_mb_min_to_scan check is not reachable. If ext4_mb_try_best_found fails, then we set EXT4_MB_HINT_FIRST and reset ac->ac_b_ex to retry block allocation. We will use any found free extent in ext4_mb_measure_extent before reach the removed ac->ac_found > sbi->s_mb_min_to_scan check. In summary, the removed ac->ac_found > sbi->s_mb_min_to_scan check is not reachable and we can remove that dead check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 16f926675006..5315c67905f6 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2039,8 +2039,7 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, if (bex->fe_len < gex->fe_len) return; - if ((finish_group || ac->ac_found > sbi->s_mb_min_to_scan) - && bex->fe_group == e4b->bd_group) { + if (finish_group && bex->fe_group == e4b->bd_group) { /* recheck chunk's availability - we don't know * when it was found (within this lock-unlock * period or not) */ From patchwork Fri Mar 3 17:21:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307512wrd; Fri, 3 Mar 2023 01:21:19 -0800 (PST) X-Google-Smtp-Source: AK7set/FI9LZ9tL9zJBWsIKEwht0zdH3itMXl0kvOCvjCf6Kt8/0AYyPZPWGnwJcpyfr0UFfzkYe X-Received: by 2002:a05:6a21:32a2:b0:cb:8d74:112e with SMTP id yt34-20020a056a2132a200b000cb8d74112emr1424714pzb.45.1677835279574; Fri, 03 Mar 2023 01:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835279; cv=none; d=google.com; s=arc-20160816; b=m0GUKJl8gChQGxkbHKJsZzEzxiiDL/JPziC843w0RGgQfgCD4xJ0l7mskRZL+JxfaC YPnRD5pMR+PgY9ttJHsQaVCUABu/ANSw0q/nu94GX3dfppd+UXKnDC+ZPxxAt6/6zk8M QgD/IrxW57zwQ9ZoALAOem54bI6ltc9uPTTw6WzBT7Xuwibse+iWq7w3QUQr4DFwOBHy ZP7HNnz0iyiXLMLsfr/gVrpO07PuHzYD9/11EvQzE1TKLYrLSiYEH6a/3PgiuLQMPYAi XztmpwjMAa0G5D3gHE3/+Z2+qIiTIBu2rdRH/JIGahOctU9zLPCgyvspTa/LWhgSxpdJ Ab/w== 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=u5q2PYQCR0bvgqmqs204Ah0fqnh4dhlzhJfyx6xnt1E=; b=qlGFR4Jv4M9aRd7tKavaOWJ/XJz9wIBiX6BmF3MQH7NZ3YWtVyYRKfXoP5/IfFLkHS xZemwUQ8VNGSvInQqQoDuLksV+QzJYBE5b6o8mCp9hdmt+mOIuEuRCfk6lnSbkxIeE0K 0utJDx2/e6zsO+2tXrmR9djYJKd7ZOCmA7cWHcHF/utdJOYaLG4rWYgs6F2Es0JXj9ZB 5Hk35dc+FG/Gq2PwzbhnLnOXDnyhBZRiAy1zXRVTAkSpmq51degFI4agVGdniyMxOze/ 4847+gBLJ7zMr7noPN26bEWJ+KW/scWILfWliuKj7hbp/jfbDKraxOjurkTHXyqLfR3L WXVw== 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 x5-20020a63cc05000000b004fbd1d7f430si1713854pgf.46.2023.03.03.01.21.07; Fri, 03 Mar 2023 01:21:19 -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 S230478AbjCCJUl (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjCCJT4 (ORCPT ); Fri, 3 Mar 2023 04:19:56 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97DFD3A853; Fri, 3 Mar 2023 01:19:55 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9M1Vnbz4f3nVF; Fri, 3 Mar 2023 17:19:51 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S16; Fri, 03 Mar 2023 17:19:52 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 14/20] ext4: use best found when complex scan of group finishs Date: Sat, 4 Mar 2023 01:21:14 +0800 Message-Id: <20230303172120.3800725-15-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S16 X-Coremail-Antispam: 1UD129KBjvJXoW7WF17WrW5CFyDWF17tr1rtFb_yoW8GFWkpF s3JF1UuryfXrn8uw42ka1aq3WrKw4I9r1IyrWIgw18WFy2v39Y9anrtry09FykJrZ5AF98 Zr1YvF4UGw47Ka7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr1j6F4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr 0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRv JPtUUUUU= 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?1759337806300165433?= X-GMAIL-MSGID: =?utf-8?q?1759337806300165433?= If any bex which meets bex->fe_len >= gex->fe_len is found, then it will always be used when complex scan of group that bex belongs to finishs. So there will not be any lock-unlock period. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5315c67905f6..60b39fba2fce 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2019,8 +2019,6 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_free_extent *bex = &ac->ac_b_ex; struct ext4_free_extent *gex = &ac->ac_g_ex; - struct ext4_free_extent ex; - int max; if (ac->ac_status == AC_STATUS_FOUND) return; @@ -2039,16 +2037,8 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, if (bex->fe_len < gex->fe_len) return; - if (finish_group && bex->fe_group == e4b->bd_group) { - /* recheck chunk's availability - we don't know - * when it was found (within this lock-unlock - * period or not) */ - max = mb_find_extent(e4b, bex->fe_start, gex->fe_len, &ex); - if (max >= gex->fe_len) { - ext4_mb_use_best_found(ac, e4b); - return; - } - } + if (finish_group) + ext4_mb_use_best_found(ac, e4b); } /* From patchwork Fri Mar 3 17:21:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307496wrd; Fri, 3 Mar 2023 01:21:17 -0800 (PST) X-Google-Smtp-Source: AK7set8e2xCUKE2XUyVzPQQp4zasvfm33QZ/BkjGb60HlBlnC3TanwNZdI9AtiAXzqElVSY85s+K X-Received: by 2002:a05:6a20:2a12:b0:cc:e0fb:a835 with SMTP id e18-20020a056a202a1200b000cce0fba835mr1407584pzh.47.1677835277651; Fri, 03 Mar 2023 01:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835277; cv=none; d=google.com; s=arc-20160816; b=SChhsl1gm8RnFoMzBqsD396GHXjN0heu5yLJCdJCDkY7mXCRb91oL4omw/fq4Xfbq1 jnbANYiYOD4uGfuIUDtihBmhsOFt3yvcHOtT3rVRir149a6+61D4ouYKL4mbQLOp73FJ STpjqgnS1kLyUb9NCoOxP0u/kNn8EILH6SPh50h6u4CLHAbAZDrolZdlXjbXxrVE+EFD zzQ+wdVNuK9n6xGsRXeLcQcDUPsjrvvUWD10V9ljo73eKeVa04SZOA/5mB88qy7g9xDb JR5uga0G+01EWhIJIxbGsI/owEppMgrJuYsywDdEy9wViHe36GYt4z2Cn/Rv8UNrCKBn dGOA== 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=hQHDsWnnDD7PzbaFZovxwwByHKvVPqHvxEMZ3NKTfzY=; b=bcHsdc3y8qM6BSQrMaRtMy3fc4vtRgdk9yEmYPhfsPH5JBDBN1ARjP0Njz3KtooOmR A+poPQTYTWGlhSH12mcTlpYX1t78CinNuYEvsHO3Tsj2BpEjPuWXAUJTbQPJoxQInGPN 9ZlLpIq58A/geK59A4o97wYFMM5izgIT6nhuy9xZAxysaUwVlM33j6ADM2W/HsYith6F 4frzfMqCSWBXlDSF6IPt7agyu7GTnhlIDfG51678JEJMxNtHq7ZrXzrh/FQgH+lUTjDX DC1QoiR9KdZVtBzkLpSZXKqJJvy6JjUumbwpWljb/r8oZ9BXLb3gSsTPQcqE06RWmMu2 kdmg== 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 s2-20020a63ff42000000b00502d8370977si1670316pgk.526.2023.03.03.01.21.04; Fri, 03 Mar 2023 01:21:17 -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 S230405AbjCCJUj (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbjCCJT4 (ORCPT ); Fri, 3 Mar 2023 04:19:56 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E52D034301; Fri, 3 Mar 2023 01:19:55 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9M41J7z4f3m7G; Fri, 3 Mar 2023 17:19:51 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S17; Fri, 03 Mar 2023 17:19:53 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 15/20] ext4: remove unnecessary exit_meta_group_info tag Date: Sat, 4 Mar 2023 01:21:15 +0800 Message-Id: <20230303172120.3800725-16-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S17 X-Coremail-Antispam: 1UD129KBjvdXoW7XFWUGrW5WF4rKr45Aw47Jwb_yoWDZwb_Aa y8JF48Wr48Jr1xGa1IgrZxtr48tF4rAr1DXF43t3y3WF1DWr4ru3WkArnxArZruay7Jry5 tr93JryxJF1IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVb yDUUUUU== 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?1759337803873338810?= X-GMAIL-MSGID: =?utf-8?q?1759337803873338810?= We goto exit_meta_group_info only to return -ENOMEM. Return -ENOMEM directly instead of goto to remove this unnecessary tag. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 60b39fba2fce..f05af818c14e 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3069,7 +3069,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group, if (meta_group_info == NULL) { ext4_msg(sb, KERN_ERR, "can't allocate mem " "for a buddy group"); - goto exit_meta_group_info; + return -ENOMEM; } rcu_read_lock(); rcu_dereference(sbi->s_group_info)[idx] = meta_group_info; @@ -3123,7 +3123,6 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group, group_info[idx] = NULL; rcu_read_unlock(); } -exit_meta_group_info: return -ENOMEM; } /* ext4_mb_add_groupinfo */ From patchwork Fri Mar 3 17:21:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp310687wrd; Fri, 3 Mar 2023 01:27:21 -0800 (PST) X-Google-Smtp-Source: AK7set8xA8NEFVbtWVzwz5Yh0/FSRw1SIBnKPwuY8swAdZjBeeF1jCQPmFsHlmyJhWYJd+tdRlBb X-Received: by 2002:a05:6402:5154:b0:4af:8247:273 with SMTP id n20-20020a056402515400b004af82470273mr1203942edd.7.1677835641174; Fri, 03 Mar 2023 01:27:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835641; cv=none; d=google.com; s=arc-20160816; b=DmT1hIhnsL9AWheF31gOrq0M20I553WzcIvWDfRyVZHQ6Dm18tQjiuSXkgHFeaKATR 9ZbYi1ZBWSb2thgyY497YbhA3yAz7O7HuTSRYvVsHDtE0UZA6278yQIr2q2P8ip9XTjF 1JQxu/QH9ZD1ilBCGbwFAUztdzDFETu8r4qHiHgSskpbZUsWFEhLZGQ0US3cA81LbfvO kqSyFT6UKqhNihlk89Cef3IgUcv2QY6iHs0zuYpBOpMRTefRaeEns5lM7ssrdbu7sMIR o6n9bAg7kZ9zTEiF7uHAiQaZaHUFZ9pjgBh17L1R2U2w+rDrOQKvUwyDHC0tfboDmX8m ujCQ== 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=EUBGU5tWiAXXKz4Jeihy1Ef0XVAG4+kABWCP+GKuhJk=; b=UpvhPXR+O9ma94YMj2YNIO9bHhAF2bX23qqF9DhF7z9lFaSKZRTs5PacTsRiuVnZeE gTiPklhH/zBjJvjFMqfqXthyYiej+Dr44mF7syk1VTyjGTvWpofa+uJTqzY94oRkIFmh ayfeGg/bIX1fdQxMSi8Rft+ZWOtZ9qMZU3S1XCq/lNgFSPoM675zQb0m6Skgd3+4iKPP reDAqzRSiAfkDDMuB8E/345yhYqR1uG/XMzuLNNLSBV8zporX7bTEN1K/zqPEOEqY0xC VDH2T6zVaCyqT+scbvE0XnQe29AoSbK91cucR21hcXzUn5CMTscUVRN3QPb/a6rhSN7/ 87/Q== 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 b4-20020aa7c6c4000000b004ad745ab9cdsi2165787eds.530.2023.03.03.01.26.58; Fri, 03 Mar 2023 01:27:21 -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 S230470AbjCCJU4 (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230105AbjCCJT4 (ORCPT ); Fri, 3 Mar 2023 04:19:56 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E48E42BD2; Fri, 3 Mar 2023 01:19:56 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9M4vJQz4f3mJg; Fri, 3 Mar 2023 17:19:51 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S18; Fri, 03 Mar 2023 17:19:53 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 16/20] ext4: remove unnecessary count2 in ext4_free_data_in_buddy Date: Sat, 4 Mar 2023 01:21:16 +0800 Message-Id: <20230303172120.3800725-17-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S18 X-Coremail-Antispam: 1UD129KBjvJXoW7KFWkWFWxAw4ruw18Ww48WFg_yoW8GF1rpa s8Ca4Uurs5Wr1kuanrC3yvqw1Iv3929Fy7try5ur1fXFy3Jr9YqFn3tryruFy8JFZ7Ar1a vFyj9ryUC3W3G3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr1j6F4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr 0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRv JPtUUUUU= 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?1759338185428556355?= X-GMAIL-MSGID: =?utf-8?q?1759338185428556355?= count2 is always 1 in mb_debug, just remove unnecessary count2. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index f05af818c14e..731810d01bbb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3590,7 +3590,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb, { struct ext4_buddy e4b; struct ext4_group_info *db; - int err, count = 0, count2 = 0; + int err, count = 0; mb_debug(sb, "gonna free %u blocks in group %u (0x%p):", entry->efd_count, entry->efd_group, entry); @@ -3606,7 +3606,6 @@ static void ext4_free_data_in_buddy(struct super_block *sb, db = e4b.bd_info; /* there are blocks to put in buddy to make them really free */ count += entry->efd_count; - count2++; ext4_lock_group(sb, entry->efd_group); /* Take it out of per group rb tree */ rb_erase(&entry->efd_node, &(db->bb_free_root)); @@ -3631,8 +3630,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb, ext4_unlock_group(sb, entry->efd_group); ext4_mb_unload_buddy(&e4b); - mb_debug(sb, "freed %d blocks in %d structures\n", count, - count2); + mb_debug(sb, "freed %d blocks in 1 structures\n", count); } /* From patchwork Fri Mar 3 17:21:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp310662wrd; Fri, 3 Mar 2023 01:27:19 -0800 (PST) X-Google-Smtp-Source: AK7set9iBMqDWAQtLOUXICbmT9p/VT2kGY8R3y6O7fu/ALY+lme+g8URPZEqt2vPTrTAdAFspH9F X-Received: by 2002:a17:907:3e07:b0:8b1:2867:380 with SMTP id hp7-20020a1709073e0700b008b128670380mr1164923ejc.22.1677835639288; Fri, 03 Mar 2023 01:27:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835639; cv=none; d=google.com; s=arc-20160816; b=ZZ6ByIX9D0/hIHZkrFVNDVGTRPX5HB1yk5m1r+uyi9wTJybHUFmbg7TO7jaD4/xw1w /XG0ORs4xVX+mlDTpltkoYlgANqlHsR2AZI4sg1nkiwxV68+incgRkjuXauwYfG1yU60 b+lPvKWsEftoqXli8feYEtgXWhqKZsBBycHed/UOyfjkGwEzbCJnI6Ex7PAKfzBHPg+1 TlicQQwZ8/2v5lEX7IS0xA2rzsUjjlkTUqczQqAuYGBmQmUQiIP2+lEzbNj0c3D3vrnX iwEujGbIemM5ieJm63J2rIxq95j5dJwgNS5SgzVcdAfj9vD6myOFYq3HFykK+iZzvjhL Rjlw== 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=hPcjYXqdYR9TfLqr4I6WtkZQm+zZ9cUD/1W+Oz3DFs0=; b=xcJAMKtlfUTI7qagtSkZbo53JgLKdJSjfna1V1z54dqyQ2/GaewYl6FlI0E4ml6Toq ywczTMmhMCVGlRGktcROYhqIG2zAOHWBff9WN7wk3a4+wJGgNI/Fxy1RG7aoeqKWjOFW V6htrIg2UeFoapxBQSAM2I9C/+Jh+rtDFHEjtcraPFbC01Cxoq5OGmrPwIuxES5IfIIf CKU1/2wYNvk0Ve8mJY+HcJ/e75ueJvTuO1y0dk55pwckDQW0Fikx8X7Thu4rDO13W+iV ph89lCqxmNZC4sqHsr7oO9JbZtZSGUJoQK5wSAT+nMXKFvUulodSS/nhfLbZTWhJ9DS8 jykw== 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 w16-20020a1709060a1000b008e0bd541c65si2070598ejf.872.2023.03.03.01.26.56; Fri, 03 Mar 2023 01:27:19 -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 S231130AbjCCJUy (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230139AbjCCJT5 (ORCPT ); Fri, 3 Mar 2023 04:19:57 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD5ABDBDB; Fri, 3 Mar 2023 01:19:56 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9N1Zrhz4f3jZ0; Fri, 3 Mar 2023 17:19:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S19; Fri, 03 Mar 2023 17:19:54 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 17/20] ext4: remove unnecessary goto in ext4_mb_mark_diskspace_used Date: Sat, 4 Mar 2023 01:21:17 +0800 Message-Id: <20230303172120.3800725-18-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S19 X-Coremail-Antispam: 1UD129KBjvdXoWrZrWrKrWrGFy5AF4fXF48tFb_yoW3Krb_Ja 4UAr48ZFWrJF1fuF1kt3WSyr4kKFWFyF4UXrWftrWfZ3WDWay8Ww4kArnYyrZ7W3Way343 tasxCry8XryFvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVb yDUUUUU== 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?1759338183199549745?= X-GMAIL-MSGID: =?utf-8?q?1759338183199549745?= When ext4_read_block_bitmap fails, we can return PTR_ERR(bitmap_bh) to remove unnecessary NULL check of bitmap_bh. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 731810d01bbb..b9e69f3a678f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3739,9 +3739,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, bitmap_bh = ext4_read_block_bitmap(sb, ac->ac_b_ex.fe_group); if (IS_ERR(bitmap_bh)) { - err = PTR_ERR(bitmap_bh); - bitmap_bh = NULL; - goto out_err; + return PTR_ERR(bitmap_bh); } BUFFER_TRACE(bitmap_bh, "getting write access"); From patchwork Fri Mar 3 17:21:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp312497wrd; Fri, 3 Mar 2023 01:29:15 -0800 (PST) X-Google-Smtp-Source: AK7set+m52ZjYiaHHRBW0Ns29ueTE5+fWkDV1v4YI4tYoUFkbZjYOkdYC+IttoQgtdyhX7rDudty X-Received: by 2002:a05:6402:128b:b0:4bf:4b5c:1d66 with SMTP id w11-20020a056402128b00b004bf4b5c1d66mr935737edv.31.1677835755295; Fri, 03 Mar 2023 01:29:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835755; cv=none; d=google.com; s=arc-20160816; b=UWWEgVpVrXAejY+TQFgOkv2cQhj3y+z7utDLDeu1Pkgz4n+9LC8KGTEGwLqT3JO00i gGw8Zc7cefJGVDAWokdAyezshTuwoggHG7Cg00pMu2sDBytn+jPIOeL+FUCVOvNd8iI5 z9n3L0kYJh4uz23dJj7GRtfCR2I1zNxHzV5ntuWsvl8EB/xi+Tkqmv+MJep8nzvT2i5g KrcURSx/OBpD0wnTlV6X9MJK5//d6u0lXYBVOJznOFrhJPGJz5arBV+21TaxWRi6gY51 Kvnn3N99DLxeM5ByfLRAIiVk43Fy81qLs+C8WuiCfrNkQQEgfedZyJC6qXy622yXaqJb NHig== 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=BvXIaYXek+7+MqUq5F1M76RvurdWVhSQ1NzOAa5rGG0=; b=PqspMzAMxvwKjQQ7SDAnpTDLdaQEgNfIyOw/YlcIWrbNTq4chIm2y7y2sGK7GcvTlE Sof+iILU4Q3i1cmgh29AwANClCfZeYkeUK3LQyIBPDgAILKRJJZ+fBif8ohNd/DVZwPc qEmGVvnXr7GMypw95INLnvbIitWTyXj5FlJJOJN4w81yke56b5nvqHHPKNohd6IaOig3 dAz15iMWOzdgZtjzoLt6rYdCZs6slAnR8sO7hrApK086kCPgc6q9sWbzclHvyZ9Pjsh7 gdeKXjrqj80nMuxnW6qoRVTPBJuOrP2SxRzCrMvc9tb/O+C14KHJEaGPkWASa08+RiLt 9mvA== 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 v21-20020a170906565500b008d0045fd1cdsi1637909ejr.223.2023.03.03.01.28.52; Fri, 03 Mar 2023 01:29:15 -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 S230081AbjCCJU6 (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbjCCJT6 (ORCPT ); Fri, 3 Mar 2023 04:19:58 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D05923DA8; Fri, 3 Mar 2023 01:19:57 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PSj9N2h1Xz4f3mKk; Fri, 3 Mar 2023 17:19:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S20; Fri, 03 Mar 2023 17:19:54 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 18/20] ext4: remove repeat assignment to ac_f_ex Date: Sat, 4 Mar 2023 01:21:18 +0800 Message-Id: <20230303172120.3800725-19-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S20 X-Coremail-Antispam: 1UD129KBjvJXoW7tryxGr18Cw1fGF1fGr4UArb_yoW8WF4xp3 ZxtF1Fkw1fXr1DCFZ2g3WDG3WFkw47Gr1UJry0g3WrJFZxKFW7Gw4kta4Iqa9xCrZ3AFnx ZrWxAF1UGrsrK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr1j6F4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr 0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRv JPtUUUUU= 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?1759338304661930024?= X-GMAIL-MSGID: =?utf-8?q?1759338304661930024?= Call trace to assign ac_f_ex: ext4_mb_use_best_found ac->ac_f_ex = ac->ac_b_ex; ext4_mb_new_preallocation ext4_mb_new_group_pa ac->ac_f_ex = ac->ac_b_ex; ext4_mb_new_inode_pa ac->ac_f_ex = ac->ac_b_ex; Actually allocated blocks is already stored in ac_f_ex in ext4_mb_use_best_found, so there is no need to assign ac_f_ex in ext4_mb_new_group_pa and ext4_mb_new_inode_pa. Just remove repeat assignment to ac_f_ex in ext4_mb_new_group_pa and ext4_mb_new_inode_pa. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b9e69f3a678f..d4e226c16baf 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4635,10 +4635,6 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); } - /* preallocation can change ac_b_ex, thus we store actually - * allocated blocks for history */ - ac->ac_f_ex = ac->ac_b_ex; - pa->pa_lstart = ac->ac_b_ex.fe_logical; pa->pa_pstart = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); pa->pa_len = ac->ac_b_ex.fe_len; @@ -4689,10 +4685,6 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; - /* preallocation can change ac_b_ex, thus we store actually - * allocated blocks for history */ - ac->ac_f_ex = ac->ac_b_ex; - pa->pa_pstart = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); pa->pa_lstart = pa->pa_pstart; pa->pa_len = ac->ac_b_ex.fe_len; From patchwork Fri Mar 3 17:21:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp308785wrd; Fri, 3 Mar 2023 01:25:30 -0800 (PST) X-Google-Smtp-Source: AK7set/XRnkSikYrPF+QywEe9IoP1TNDtruZbU7iN5brkprwbBDH48yVc/bNNEtfkGHqfQcvIQgJ X-Received: by 2002:a17:902:7798:b0:19c:bcb1:d8c3 with SMTP id o24-20020a170902779800b0019cbcb1d8c3mr1223368pll.54.1677835530021; Fri, 03 Mar 2023 01:25:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835529; cv=none; d=google.com; s=arc-20160816; b=GdatTfzZ/nqD2YgEznX3H13SGNfnc9bvhh+J1yGkoUUR4bi6kbxpZRnoxfnU/GehG8 nqSyFWqalvW+cvduD7eliblWTbG8+mK5c3lCFvGd6K8uez6bzczknsSD4ahpTCDXGWy4 7FAiYLCl1WN/8IWCzpMAB5JY93/BlqMEIo64XCkLBDwHd0gwNcQbvAJmsauD6jzaF1bT lHW9X1HnFGJPOAT2xAEkKND1WcI9Se8rXfUNjggWUvklm2tDecdjcHkwEhPrzqX9V87M LNrVMvhb1sV6q7OYj7rKdvAM/1YZFZKVGL0Us/nfnpf5JOhgG/bv1MCHhLgDkspgJGsd TbhQ== 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=1x6zwmipgiEENWQFGAjr8uC19/hXdXIcJFfoZIqA2yY=; b=REMDDu8qCvqW1d+wUXD39w4vNVttJSmWBjO57DolQLqTW26hnf5qmKEL6CVVX4louk 7HjnvjBQdLrk8xZmHj+e1aVtCVdw3hg7vnCb7LJGqquxmYogy5UUmkrBhOWtXWaCMZfk Uw28H1ZlSNFvnXH2PZkg0SvF3flyym+EwKaiC2qwvIbAKRAIDpC9xVCAX2jZqFEkfUeO vdzLjA0ysS7JzVMnz50HYH+ssJqG/PATcN6OktsB4mKpQaoDRe1TxUNZITQdHi9LCkc6 kk0kJHyoG8QV/mzWBM8pIcgRZE3IMYnLYnDTAwYdOwKpBTbEhxu4bQVtbUnB9jtyQdtq nznA== 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 kj12-20020a17090306cc00b0019cbce6331asi1682497plb.490.2023.03.03.01.25.17; Fri, 03 Mar 2023 01:25:29 -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 S231150AbjCCJVE (ORCPT + 99 others); Fri, 3 Mar 2023 04:21:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbjCCJT6 (ORCPT ); Fri, 3 Mar 2023 04:19:58 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55C6C34301; Fri, 3 Mar 2023 01:19:57 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9N6qfJz4f3nTZ; Fri, 3 Mar 2023 17:19:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S21; Fri, 03 Mar 2023 17:19:54 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 19/20] ext4: remove comment code ext4_discard_preallocations Date: Sat, 4 Mar 2023 01:21:19 +0800 Message-Id: <20230303172120.3800725-20-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S21 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUO07AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E 6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JF v_Gryl82xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq 3wA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w 1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AK xVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcV AaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0E x4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI 8F5VA0II8E6IAqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_ Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17 CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIev Ja73UjIFyTuYvjTRKfOwUUUUU 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?1759338068953438259?= X-GMAIL-MSGID: =?utf-8?q?1759338068953438259?= Just remove comment code in ext4_discard_preallocations. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d4e226c16baf..1103d35b31cb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4925,7 +4925,6 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed) int err; if (!S_ISREG(inode->i_mode)) { - /*BUG_ON(!list_empty(&ei->i_prealloc_list));*/ return; } From patchwork Fri Mar 3 17:21:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp310808wrd; Fri, 3 Mar 2023 01:27:32 -0800 (PST) X-Google-Smtp-Source: AK7set/85+3fH2IW5xWQBJXx0h3BDbW9ruBzSvbknevresse1BmM04qllZMrWkJCyhf57zyiF+cC X-Received: by 2002:a17:906:6c84:b0:8b1:32b0:2a24 with SMTP id s4-20020a1709066c8400b008b132b02a24mr1177247ejr.47.1677835652605; Fri, 03 Mar 2023 01:27:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835652; cv=none; d=google.com; s=arc-20160816; b=Gcy+LUzT65iHHp/BT+ZCBR8dXI3utqSqGERqVbrnUGSYJocChMs4uQals7wvq25a7A HG5gKtQcGDRQVMqsiUwjOjvmsxQl14HndN6sc1x6XVthvILfMyAWXUhrgTo1E2xrfva/ pqRd03cgakpvh+KsE5b969LN5WIYTVDUVV0Lvc4dzOd95moLps8URHrXA9dZ8SDeU3VY thSoIW9IK4bhiQYXem6Yzy2Wc5d4ic98O7mPm6FSEvq0SmePsHF2VSGtFuzS6VeMiyPj kBvm4c3k6DX0autf2ZvfgLi3i/XAhzie7mVqXCplV6VQw1tEjlpmUokwnyOjxEqQ3CBz htxw== 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=k5QTBViQSVtd2G9rela0IyMMR67efsliP5z96b9oLsM=; b=W7whZ7/AZpw1eASQeICJruGiELUhVRpqPLhBwR1af7G+lscM+KVsta7KxXUmvwbTGk Kq6Tl1e/Hjt63CnQ8uuuh2g75lAhYLPFyana+vmPyTlWAI7cH1Sg5ZVoUhGsbtRPJ0pP e9GpUe+n8qAFnEle5RsWx5lw4LrHV8F1nIaZnJgdRxE05FrVkIMRAbJf9ATkk0Y0biYZ 9d2MqWdiiMcb4YiA8Lk6a+PZC4hzjGNYFXyx99LGwBCBguqWrpJlwowiz1XNZ5uiwjOM VqxZY7FAq2UNSB7HZfbDcpmFF7ef0gAGcfqlsAAdcXnItpq54P5JM7ISrLML7xCwb8ZK 9Adg== 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 b24-20020aa7c6d8000000b004ace582aca8si409499eds.256.2023.03.03.01.27.10; Fri, 03 Mar 2023 01:27:32 -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 S231145AbjCCJVB (ORCPT + 99 others); Fri, 3 Mar 2023 04:21:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbjCCJT6 (ORCPT ); Fri, 3 Mar 2023 04:19:58 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B04A7DBDB; Fri, 3 Mar 2023 01:19:57 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9P2JmNz4f3nVG; Fri, 3 Mar 2023 17:19:53 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S22; Fri, 03 Mar 2023 17:19:55 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 20/20] ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple Date: Sat, 4 Mar 2023 01:21:20 +0800 Message-Id: <20230303172120.3800725-21-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S22 X-Coremail-Antispam: 1UD129KBjvdXoWrtFWDZw4xCw4DKr4UCw4fGrg_yoWfKFc_Ka 4xZr48JFWrJr1fuFn5JrZ8tF47ta1kJr1ruFZ2qryfZF1YvFWxuw1DArZ0yFyDuay5Aas8 Cr9xurW5Kr10vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVb yDUUUUU== 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?1759338197043278083?= X-GMAIL-MSGID: =?utf-8?q?1759338197043278083?= We try to allocate a block from goal in ext4_mb_new_blocks_simple. We only need get blkoff in first group with goal and set blkoff to 0 for the rest groups. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 1103d35b31cb..85d5e219933f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5772,9 +5772,6 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, return 0; } - ext4_get_group_no_and_offset(sb, - max(ext4_group_first_block_no(sb, group), goal), - NULL, &blkoff); while (1) { i = mb_find_next_zero_bit(bitmap_bh->b_data, max, blkoff); @@ -5789,6 +5786,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, brelse(bitmap_bh); if (i < max) break; + + blkoff = 0; } if (group >= ext4_get_groups_count(sb) || i >= max) {