From patchwork Tue Feb 28 11:42:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62239 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791231wrd; Mon, 27 Feb 2023 19:42:49 -0800 (PST) X-Google-Smtp-Source: AK7set9sUAVFCrg2UxiAri8GO4Nbcl8K/yti3IKpROd4LCG9C9B8lQ5nEzE2ezsgLSML4OU4MKzM X-Received: by 2002:a17:906:a16:b0:8b1:78b6:4b3c with SMTP id w22-20020a1709060a1600b008b178b64b3cmr1124749ejf.73.1677555769746; Mon, 27 Feb 2023 19:42:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555769; cv=none; d=google.com; s=arc-20160816; b=V1i+WWuPDQdqLxaoszTrnd1iAzYspJHLprO4sXbBlMEffEtGs1inB7dJfWRVsJZpSW hYRSbmkYP5uxEWQ0HRB4K2hcfhaYDvbaUMxRdPsWK2jHbHz2ot94kGs7XDTtLyd+BfVA xvYmJI7R7CY0T67EYN70WE+CX86Nn4alKZMvs4qfrZrX9ldoNNbx+bhso+Fthu0wS/TD qsJ33GomzQ47IkkeZso+QDOrbuRzQ3SCWL+bvgahX5PVmLHUsehYM0/n6mMBL4rFEfzI US3JzU6V1IYe1/ZybEgtkE0+cGhbSvoMIW33PTFInIAtWypBXhneQOk5BcgyyMYCxKSq jP/Q== 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=/ISNCQLoK3D6C/+EuVVVrKMYpLQVOk4ipUdnWLkihCI=; b=yGJt5wM3jWYSIwKRzEi11cGQbL5njI5qMcX9NhAuifg2hAbTJ48sdgw2wRhLbpHTln ETlO+1jG2+LS1ZWed8PnZXN1DFHWkJuMkKgf+fQCaDSYso3a84Yb2LQFJKNBtKui1IOP 08IGjJnYFXLHgNqQoVwQTh2opAMF2rs2w/kxq90p+oAu12STFHBlZeJuAj82ovM88xf5 0YvDISt76fn/KQSrweBRaUAse8xXUIzzJomjo2zQKgZOX6oWzjX4rAZGyC815ihKqQZ1 tOjXQb7oqP1nRsaS6ut9DvIBQAIxbKONRZbgF9hbf8filqhqa9IyNy2A5K7wdbA6PNWM 5cmw== 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 dr6-20020a170907720600b008b1810ef12esi13037479ejc.65.2023.02.27.19.42.27; Mon, 27 Feb 2023 19:42:49 -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 S230183AbjB1Dll (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229492AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62C42241C1; Mon, 27 Feb 2023 19:41:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpJ4bXDz4f41Th; Tue, 28 Feb 2023 11:41:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S3; Tue, 28 Feb 2023 11:41:30 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 01/20] ext4: set goal start correctly in ext4_mb_normalize_request Date: Tue, 28 Feb 2023 19:42:47 +0800 Message-Id: <20230228114306.3328235-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S3 X-Coremail-Antispam: 1UD129KBjvdXoWrtFyrAF15Cw1DXw4xGrW5GFg_yoWktFg_Ca 45ur18GFW5Jr1fCa1Syw1rtrs7KF48Xr17XrZrJ3WUX3WUuw40k3Z0vr4xZa48Way2qay3 KrsIkr1xGa1S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRE2NtUUUUUU= = 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?1759044718910977430?= X-GMAIL-MSGID: =?utf-8?q?1759044718910977430?= 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. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- 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 5b2ae37a8b80..0650a1dc870e 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4191,15 +4191,15 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, if (ar->pright && (ar->lright == (start + size))) { /* 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)) { /* 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 Tue Feb 28 11:42:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791456wrd; Mon, 27 Feb 2023 19:43:38 -0800 (PST) X-Google-Smtp-Source: AK7set+9rCfCcj7q0oUEGfC2wpm8YalFZ/qpIRmRLQRfoeuWSuxrMvOdlka0gIUTQfmirxFVl49b X-Received: by 2002:a05:6a20:9389:b0:bc:f336:98ed with SMTP id x9-20020a056a20938900b000bcf33698edmr2212605pzh.45.1677555817883; Mon, 27 Feb 2023 19:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555817; cv=none; d=google.com; s=arc-20160816; b=t9POIGmKmm6pAa/Wf2mS47nm2D5jHCY/SluvITrWuXj7f8nh2m8R13FXrwymBUVBan Aa2DaFNL7wEX7HQP1kQPViA0mc8jDNxSl4Wn/YU+WB4M9iTWjjreUGj2PNnpivUWtCzA HlL4lWsKwOZ427EODg1XO0NoCKoSayYMEp+RlWkKiNPJSWuiwWia8/18gzGmxyLbDScG s7LFm02cy6GcakrfpzKOFY8nkRxJ05XT8jImwDJ1j1KIEs9EwXpoPvyuL8gB2YOROYlS BJJXlYorrlXYM6KR5ktTZI+tqbtVvR80myK7Pc5FY02Rk66r/Q0ucPjN9TcdnxxXfLVD 5SLw== 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=SYPAfTpCP6Ti1pgu0PaQXk3MG7NTFufMYfMVERwIzkI=; b=FiyGi02KxkadenUWIa/XowSIb1/juf5Dc16SIf2SEykzEnzMrkyzdT6M6odFpvTVqc 8ANHuEVyJgrcG2e0b4f8bG7/UkvHAJdhuZ0lHXSmOfbyG5iqGWivPV55kcD1bm2J24Fk hdyTLZ0QfJtrjVIVeC7rylMzAnb+pRSLo6KaiRH9DuRXFIhGZm4WbnoF8zmJGRE86/md wiIIVwSKd6bObNwv2EfTCkZqFC978f37FQDv+sY9nd85ZAxI7oyNeqQfhDCq4nnxzNmp goMIW0P25TgXHH5Urmr0xo5xZl/OBHTTmDhf2pY3UC7RZL3s4b9mi26LQT3ap/y515ZK 4aJg== 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 e10-20020a63e00a000000b00476e640ddfesi8605750pgh.80.2023.02.27.19.43.23; Mon, 27 Feb 2023 19:43:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230208AbjB1Dlo (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229775AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D0D5241E6; Mon, 27 Feb 2023 19:41:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpK1BFbz4f3p0y; Tue, 28 Feb 2023 11:41:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S4; Tue, 28 Feb 2023 11:41:30 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 02/20] ext4: allow to find by goal if EXT4_MB_HINT_GOAL_ONLY is set Date: Tue, 28 Feb 2023 19:42:48 +0800 Message-Id: <20230228114306.3328235-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S4 X-Coremail-Antispam: 1UD129KBjvdXoWrury7ur4xtw1kZr4DtFW7twb_yoWDKFcE9F yUAr1xZan5Jw1fu3Z5AayFkF1vgF4Fqr4rWF4rXrZxXF4UXw1Iya4qyr4fZwn2kw17Z343 u34YgFyxJr4IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR QNVDUUUUU 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?1759044769272951642?= X-GMAIL-MSGID: =?utf-8?q?1759044769272951642?= 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 0650a1dc870e..375d9655b525 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 Tue Feb 28 11:42:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791363wrd; Mon, 27 Feb 2023 19:43:16 -0800 (PST) X-Google-Smtp-Source: AK7set9ldX7iNZXg/K69NES9vQap2L5LS05dLxSeu4EWWRUHxurVEIXfBCBjR5xSTd30fN0LSs1P X-Received: by 2002:aa7:cb99:0:b0:4ab:178d:3d9f with SMTP id r25-20020aa7cb99000000b004ab178d3d9fmr1690537edt.28.1677555796832; Mon, 27 Feb 2023 19:43:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555796; cv=none; d=google.com; s=arc-20160816; b=t9Fc9ur7pzHsB4NIoFObLe9SgE5187yk397N1pH0mU1tsXSzcQopiod0EpfJH0ZxQF ckJ7TG5ia2LUhBNx02gKqbpBHR5Zo6iK4nTEf2Bzx+uCFsbpSB5A/X+dWRTkvQgmu6Ts WR4UCw5d8HRdARioA0p6Aqc/mSsFYPWBk2PP4f+pjNzUwIq3sXqEzJPNAMKAXAOM+SIY M6ZrvFMl1KYshC33xtK4oIpjY9ergZcmG9dn8d/sPE22L84h4qbXJk00rS0TlGjDO60F VVTfwV24S4ReGBCF/GOHf8hZjEek0mZ0BeBc7qXOBuC+NG31MfHoXIloWjO1cgatSoOD mbGQ== 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=80vkDvXxFQXbjrc0JAIC7Gxuo7/MktSV/NVV/jzDgpE=; b=JF7HOaY4jmRm7fbH1ySKEirZyAwZ/A8zTnWhuKpMg1XC9FVS4l0QUL2d3nE3mBYSIi PIBli+5LIqnmqmTmLEhNt+8rv9XvyGPipB23mJRytIXsIOrZGdzdii5fedwvBeMpC/Eu OXU102k29D1kad9cIUqv/jMwTau6swvCzPX/NXv41x3389hL5Qm14niJbXokCUxSpIk3 E8neu03x6yakB6F5fCCxiZysPD7IW+ezWUXO0XO6IHfhuo05qaBkjibtjM6uxHIW0d1F l4Krj1Rpk4Nt1ozxt1KzcLzEJftbeefbrP/3ifDWBkzq+nYmusWrJwMeZPPqDuuD8GrG AY3A== 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 v23-20020aa7d817000000b004af6a174397si11038189edq.231.2023.02.27.19.42.54; Mon, 27 Feb 2023 19:43:16 -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 S229470AbjB1Dl7 (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED69524497; Mon, 27 Feb 2023 19:41:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PQjpK230mz4f3lc7; Tue, 28 Feb 2023 11:41:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S5; Tue, 28 Feb 2023 11:41:31 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 03/20] ext4: get correct ext4_group_info in ext4_mb_prefetch_fini Date: Tue, 28 Feb 2023 19:42:49 +0800 Message-Id: <20230228114306.3328235-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tFW5Jw1fAr4kGrykCr45KFg_yoW8JFWxp3 ZxCF1Uur4rWr1DCr40k3y0q3WxKw1Igry8XryfWw1UurWxJrykXF13KF18AF18JFZa9r13 Zw1YvF13Cr12k3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 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?1759044747130642682?= X-GMAIL-MSGID: =?utf-8?q?1759044747130642682?= 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 375d9655b525..b94c9f331a3c 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 Tue Feb 28 11:42:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791457wrd; Mon, 27 Feb 2023 19:43:38 -0800 (PST) X-Google-Smtp-Source: AK7set+KnYiRZLILf/8/CYsXsIjpdJjEVzcqqg+hafrc07rStAaSI8ixWoBXW7n9VOfhRZEY1vHi X-Received: by 2002:a05:6a20:1588:b0:cd:9da2:fdb8 with SMTP id h8-20020a056a20158800b000cd9da2fdb8mr1962881pzj.34.1677555817951; Mon, 27 Feb 2023 19:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555817; cv=none; d=google.com; s=arc-20160816; b=aoLua9A8xBoy3QCRcvX3PwCgXJVM0W2AZd6pVoyEVN1TpSYpLIgPJxusK+uP/zhk3L RJ+prJVFm2laXVpKvkt6TOuDo/j8SxDnO/S877L0QXy12tkDy+1GxL4YIwhKvFlUjWNF hPtosAmmW3JOtnfHPBdVqhuQ7MY/oGl9kA44571ot/fEpAbe5nNqICp0E6iauZsZUakf u7ycCVwM6VQW/khZO62VezjcjXR1NQCQdZ0wLYbFQuOeghicVfBX8J+0q6JuFyIOe52s cSxHDWVEwiSlOpD2Ezze1lOOF0dwm1efzWmqMc+5AOutqeWC76zoYXqh2Cywl3EyThEr a4mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2JaXu6Ev8VZTPaXWSiKx/nxvgV5XZOdlTALwaE+OgXU=; b=Qgz9RfAPr5RFC9+I6glEqw73PIArxGbUxHyM3r/Tw+JLc/HAgh+Dzis5C6sGKdAGbh oHdcWfgsGNigEgMhjVtcTbP+nOqD70SXGhYGpChl/Om0uljJUbgm2rPGxES+vNTyfG5z KUB7EWtejotlbkB7x1D0XMhIEKbkCu0uZadn+9pQqGjHarn8Shj48pUHT2JlcM8pxDe7 eMbuk6MH6R5rsfB0oF/BCD/AGpSxwEzWJVQL/aJb5gHebel+tj1S+nJqSkQM5apH/aAz V+RkAWhD4awipPzGJ7TjJ4oCxyiPDwmkaLGktK+Wv64dg6u9xJtQO1nrxP1Fp7XOIxiC TXZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m29-20020a637d5d000000b004ccd057d472si9607094pgn.815.2023.02.27.19.43.23; Mon, 27 Feb 2023 19:43:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230225AbjB1Dlr (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43322244A6; Mon, 27 Feb 2023 19:41:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpK5vq3z4f41V1; Tue, 28 Feb 2023 11:41:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S6; Tue, 28 Feb 2023 11:41:31 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 04/20] ext4: correct calculation of s_mb_preallocated Date: Tue, 28 Feb 2023 19:42:50 +0800 Message-Id: <20230228114306.3328235-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFWDCFykAw4DKryrWFW8Crg_yoW8Gr15pa nxKr1UGwn3ur15Cayvgwn8Ww1xKa1xKr4UWryIgr4xZFZrJryaka1DtrW0gF93Zr4kZFnI vFW29r1UCrWI937anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759044769228837915?= X-GMAIL-MSGID: =?utf-8?q?1759044769228837915?= We will add pa_free to s_mb_preallocated when new ext4_prealloc_space is created. In ext4_mb_new_inode_pa, we will call ext4_mb_use_inode_pa before adding pa_free to s_mb_preallocated. However, ext4_mb_use_inode_pa will consume pa_free for block allocation which triggerred the creation of ext4_prealloc_space. Add pa_free to s_mb_preallocated before ext4_mb_use_inode_pa to correct calculation of s_mb_preallocated. There is no such problem in ext4_mb_new_group_pa as pa_free of group pa is consumed in ext4_mb_release_context instead of ext4_mb_use_group_pa. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b94c9f331a3c..90f765a350ea 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4667,8 +4667,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa->pa_len, pa->pa_lstart); trace_ext4_mb_new_inode_pa(ac, pa); - ext4_mb_use_inode_pa(ac, pa); atomic_add(pa->pa_free, &sbi->s_mb_preallocated); + ext4_mb_use_inode_pa(ac, pa); ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); From patchwork Tue Feb 28 11:42:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791304wrd; Mon, 27 Feb 2023 19:43:02 -0800 (PST) X-Google-Smtp-Source: AK7set/o9tQmd3eUvLkqNG8wj5AOec52fLmkRDzTPIjjtFgNiMopIaBpMBBD4HYNCo4oEoMppDaL X-Received: by 2002:aa7:db4b:0:b0:4ac:89b:b605 with SMTP id n11-20020aa7db4b000000b004ac089bb605mr1754964edt.22.1677555782413; Mon, 27 Feb 2023 19:43:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555782; cv=none; d=google.com; s=arc-20160816; b=tDjtdhtYFgQSR/CPb1PwP2vaSQNhMfInUMK40MkAZS1ALX7RzFggdbssWFUn3IOYA5 jb3FWR+LXP789yjcr8JPV8strOHgpG7xrK9GTbV+1R3kU3Jq66UDV1qDzWtgmjRTy0jj fq4bz/MebZ666P8Xe1SwKrYEO/MP1LccCxI9cTyZbvjXtcVaZMrjLruG9bg1ZvkkzKCb IPNb/0DJRGwpqs/QW+A3X/yxAZvSlOrda3pF/JjxF/wQhCo7by8eB8QRODIRd1GqZux9 axe4XPgZ73el+BOwAz59Optu6cHnjeIA79B/5LVLZqWwql4/n1SukO8nfJU8pzzTR9/D XZ+A== 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=RMIpSFYEco15TrLL4DgICRXMbUAu/HR+WdlewsGXI+g=; b=SLI0G+QxZ4+ZoUNmmfO0Nl7muSDgcbjABeam7CsdJlSm1dMhQ4FPd5T4RRngauCusE xNL1w4uJ/MfJKecAw/nTKwFRHeZl9c1hAmMg6i9tH0zXJZCeeOFjtvBrJEGvjMtCGv93 UT/kRctTO6RetNbOFDFRqkb3Zw7GMRFZCRW3MFcOrFUTMgb1wSxJctHifoTvmVBOH0XY o07BXHSogCMHfQDeN6KzN4j4w2DKMx49UEsdal3EJMfyzoa1o1QrMrAel/wX4MOgbEan tbuxAeappNnIFwrYGDlszQBXNbp8NPPlIWnqkrOU1G1S/tkYQUyDpcVl3KmKiTms54LM Xlng== 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 f19-20020aa7d853000000b004af633000a2si10347433eds.1.2023.02.27.19.42.40; Mon, 27 Feb 2023 19:43:02 -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 S229982AbjB1Dlu (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB940244AB; Mon, 27 Feb 2023 19:41:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpL1cPYz4f3mWY; Tue, 28 Feb 2023 11:41:30 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S7; Tue, 28 Feb 2023 11:41:32 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 05/20] ext4: correct start of used group pa for debug in ext4_mb_use_group_pa Date: Tue, 28 Feb 2023 19:42:51 +0800 Message-Id: <20230228114306.3328235-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S7 X-Coremail-Antispam: 1UD129KBjvdXoWrZF17Jr4UAFy3Cr4xZw4kXrb_yoW3GFb_Ka 40yrWkWFWrJ3sa93ZYyr4SqanFgFs5AF1UXFs8Jr1ru3WUWF48Kw1DWrs5XrW5WrW7Zry3 JasxuryUJFyFvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044732336307951?= X-GMAIL-MSGID: =?utf-8?q?1759044732336307951?= 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 90f765a350ea..31cb6ac1bc47 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4319,7 +4319,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 Tue Feb 28 11:42:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791412wrd; Mon, 27 Feb 2023 19:43:27 -0800 (PST) X-Google-Smtp-Source: AK7set8s1ce2NtNsN/WHOjb4g0aTjTqUzHIYJYjvVh+Cbsa1ijjwDj/7aqqUiTkb8TwtqsMzBeSb X-Received: by 2002:a05:6402:1e8e:b0:4b6:821e:185e with SMTP id f14-20020a0564021e8e00b004b6821e185emr2187832edf.19.1677555786810; Mon, 27 Feb 2023 19:43:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555786; cv=none; d=google.com; s=arc-20160816; b=U444yhg8NCQwAKvZpIWV6/TSZcozy9dfsM4/b4xHWxmvF3wr/XeoTEVy6Q1Hh2efMs 0Nj++UXC8PvXLgPXWAnC6G9hGuD6mCHpou/SAQq4IzkMZ9H2HHWFtXgmNow4nwNvd2az pHkTY5NVvedYQdI9L3Lx3H0RI4kGu24loR1y6Ur1pScZAOvTqWAnaChbuplcHpu0DN9m fxEoLzgMl0V6/G3lOpi+i3LQZ7YcKuqA7q1DC2o4T9rPBnaDSbQdQ/9J1zIRAdHCU92f IfXwo1bGYuJYwNqeeMfhF67PH2QX2+fPNHB8TCoK7UZ+2XCY9ByWRawn4u1vBA2AWICp rGow== 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=jJoI712qQTYXbiSNdWldmzLvIR45Ug6i0JbTEyfTuh0=; b=CavsUNt1PfmLJg6v0Ki8qU4VV75VbXCxpPnJD+ux/tg54kh4EOI9G3aVwDyDwNGEyg gj342zZ//GF7PLFzhRje7dhzcduabM3ZiqvYrr9wRaAePLKqT3hh7TRea52Pugg+A2ev Px09NQXsSEoQP25LAavq5iQ5HvhDkiVgOeW+F7NynH9Y9wA32gl9ti5Z5vP8TwogXKDE QYMcLnZ6Iyxim2CU5IdgqRHEc5DOsNgk38cWz9Iry4kFOg3zBkb/oQ8dzWVu6fDC7PRF s7Ey0q168DYPgWDzELBKSduDlAFFjmmkUH06viTCEqShEfM+FzFrJ7M2JS1VeNbYNWjo T9TQ== 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 fx1-20020a170906b74100b008cb405fa59csi9099178ejb.73.2023.02.27.19.42.44; Mon, 27 Feb 2023 19:43: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 S230187AbjB1Dly (ORCPT + 99 others); Mon, 27 Feb 2023 22:41:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbjB1Dlh (ORCPT ); Mon, 27 Feb 2023 22:41:37 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0993A24C87; Mon, 27 Feb 2023 19:41:35 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PQjpL3MGZz4f3mL0; Tue, 28 Feb 2023 11:41:30 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S8; Tue, 28 Feb 2023 11:41:32 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 06/20] ext4: protect pa->pa_free in ext4_discard_allocated_blocks Date: Tue, 28 Feb 2023 19:42:52 +0800 Message-Id: <20230228114306.3328235-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S8 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1UGF18KFyfKw1fXF1rCrg_yoW3KrbE9a 48AF4xJFW5J34xu3W8t3yFqrs5KFsYyr4UXFWrKr1fu3WrWFWfG3WDXr1rAr9rWF42y343 Cr98uFy7GF4vgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044736957036549?= X-GMAIL-MSGID: =?utf-8?q?1759044736957036549?= 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 31cb6ac1bc47..aec4a7b7af20 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4263,8 +4263,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 Tue Feb 28 11:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791963wrd; Mon, 27 Feb 2023 19:45:27 -0800 (PST) X-Google-Smtp-Source: AK7set+iYpUeI5f9t726cUtI7FIZPFx3ELrfhxLJgeilW3UsAO3oQDkMl99w89OgxI6GwtydKzMS X-Received: by 2002:a17:90b:4ad1:b0:230:af67:b847 with SMTP id mh17-20020a17090b4ad100b00230af67b847mr1619903pjb.31.1677555926959; Mon, 27 Feb 2023 19:45:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555926; cv=none; d=google.com; s=arc-20160816; b=cRDbKU3pu31GlsXuBpYa18HDn7W3vVAlZuD7SQVl5n+zE+c7vhdWGiaSMG124g9umu ArKipN2NC+zuIiWCXTKjYhliZ+17JCGGzGhIfUbuS9Aa9J93UfN/yZGkZ59E/9ezTXwm cKcHPNmxdFrBv2XXa+uqmqfFpWIex9ZR/7KMwYnssWhkg5h5601wmzSfFmpM1luNbx0p GUxAYf4aXj77kYumnu2NXbdVewHu6Esxl/h51E6ZVmcV+Zyf2/o4aX7rxU72NZz2VPSW KkTA4APtJcnZMx4qeUbEyENIkiKx8/BGmKMHKM4HR5P77/ABezBkVe5FetfmJVvSL6DU fSEQ== 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=BY/WPkUKrXJKx05PLESD+IEcLwllrhIX/sTGjSo3MGc=; b=0Gjz4cnqj/LjsjmbKXdgaHmgKIX38wCV572jl6z2eqLCEM2CxXU7w1obCf36QLJ8HF lAZoHO6yewhilR/CF+HzAtffg1t7dELGgfcLInXbFN/coAtBKhnuraJmXl6B4qY9zolU Cj2ZKUP79NjFmckF3Jxcf0soVJhHTub0wBy8rKmfAyA7WOkz+zkjQfB3X8lL9PHNa9o/ n37NfwFB7KeiDEzROH+OFQQLlwdw4AS6vCvUrYo7xpu59zFowUnSiGFRriOtWFjqcaQW tHrkht+qh8J0SNfRwK76zW4cP+OZxSvkGepBa84oPgaLN7wn3SXbtSQxFjKo17eFCxo8 0wIw== 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 mr11-20020a17090b238b00b00233e889b984si12393987pjb.166.2023.02.27.19.45.13; Mon, 27 Feb 2023 19:45:26 -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 S230260AbjB1DmI (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7005324CA8; Mon, 27 Feb 2023 19:41:35 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpM0M2Gz4f3vfN; Tue, 28 Feb 2023 11:41:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S9; Tue, 28 Feb 2023 11:41:32 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 07/20] ext4: add missed brelse in ext4_free_blocks_simple Date: Tue, 28 Feb 2023 19:42:53 +0800 Message-Id: <20230228114306.3328235-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4kXF15Gr4Duw47Zr1DZFb_yoW8Wry3pr 4qkF4UGFn5Gr1DWF4xX34UX3W8twn7W3WUGFyrGwnrCrWayr9aqFs7KF1F93WYkFWfZanI vFn09r4rJF4jgFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759044883625005555?= X-GMAIL-MSGID: =?utf-8?q?1759044883625005555?= 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 aec4a7b7af20..c26421170406 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5845,13 +5845,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)) @@ -5860,7 +5859,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); @@ -5869,6 +5868,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 Tue Feb 28 11:42:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791426wrd; Mon, 27 Feb 2023 19:43:29 -0800 (PST) X-Google-Smtp-Source: AK7set8lrkoJydPBTCg1QPttri4+Vn18tCZzJGJqY1s7A31KKQEStVFPJi0I6DOwaByjKP5plD7F X-Received: by 2002:a17:906:409b:b0:8b1:bab0:aa3d with SMTP id u27-20020a170906409b00b008b1bab0aa3dmr1052136ejj.8.1677555808859; Mon, 27 Feb 2023 19:43:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555808; cv=none; d=google.com; s=arc-20160816; b=s72ixLc27hKonixhsMS5+cHL8bdMFI7fijfHQ+o8zDWHxr2XanuW7nxqXycUMlBFpj TffegpNk4SNqxesoIVqJwlVn1W/BCUfvpHI5y1EfKJ3mQP+UMUXFXCsY7o3PiX2U4Tlj 0YUXZQcgnx8w9aE/xIWHmRVKS5oD4Zzrdr182fu2/Cs+lM2ZHLsKNO5mTr24i9G+9hhY 6pGjiPq+vsdG3uODurCZftbYyb4/dD9Ll69vtU8d6FlNuFiuO55Cprv3dYsh7xhNesvA OWQW7PsUCz2kAMaW0st3uRuFptV/K7dE3EHZLvjutnK0wcGEVnoDSd+Qk08XwiqQUl9T iN1g== 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=H8qlXJ5ZVyBBsGzlWh+L810rbMiOeabjup1z/9sp/8c=; b=m4G1qg6h8dy4ZcooDnrH6uFoP7i4V4qs4Kj1HfrUHVK2YHSj7rHdzCz1lgDufKqWig Wf7ZjBq63jDPTIUv/OnBd6lsJiXBjRzJ2JwLUgDIVRxzz5oBaPTElLceoAITfs9Hb/Z/ MpUpXy03/1Yksn4IihfG4HSrdW5mkGGtblodr2g5opcY9Y39Jg4yhc/wzhBLR9kd/cLY /ETyXB8oIkkPe7SqMZ8RLMZC4JpuJN9sHNOF3VOFIdVeCAvkyA1HyLfgCDLlbCtgaHat /InlYa02+Ta6PUTzk5v95gUnbxal4Zxt9v3/RKX9HDqMdPlWBC/wwiLYs6bS52FH/kj5 cJEg== 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 a24-20020a17090640d800b008ce03a3825esi9558824ejk.138.2023.02.27.19.43.06; Mon, 27 Feb 2023 19:43:28 -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 S230246AbjB1DmF (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230031AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6A3125286; Mon, 27 Feb 2023 19:41:35 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PQjpM1Gqhz4f3lwh; Tue, 28 Feb 2023 11:41:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S10; Tue, 28 Feb 2023 11:41:33 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 08/20] ext4: remove unused return value of ext4_mb_try_best_found and ext4_mb_free_metadata Date: Tue, 28 Feb 2023 19:42:54 +0800 Message-Id: <20230228114306.3328235-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S10 X-Coremail-Antispam: 1UD129KBjvJXoWxJrWUZFWxZFW8tF18XF48tFb_yoW8tr47pF sxGFy8CryxXr1kuFZrua15W3WF9w4xua4UGryIgw1rCF13ZrWDKF47t3W0vFyFqrWkWFnx AFWDZr15GrsrK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759044760184348925?= X-GMAIL-MSGID: =?utf-8?q?1759044760184348925?= 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 c26421170406..0a34211bb507 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 @@ -5696,7 +5694,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) { @@ -5739,7 +5737,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; } } @@ -5765,7 +5763,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 Tue Feb 28 11:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791530wrd; Mon, 27 Feb 2023 19:43:54 -0800 (PST) X-Google-Smtp-Source: AK7set/tZwU9ScXR8/bqv3bmGR7BiYTqkpCu1ag4MdMTaVDuMS62HMP6kaa2BNXmCI4Tp5JINPeb X-Received: by 2002:a05:6a20:3caa:b0:cc:6e9b:c69b with SMTP id b42-20020a056a203caa00b000cc6e9bc69bmr2277662pzj.55.1677555834637; Mon, 27 Feb 2023 19:43:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555834; cv=none; d=google.com; s=arc-20160816; b=yVB3EOJwM16g8NIk4fOFfmVuoH35+qyL1tqdb+dqc5NmbFd4h21mNVhBnZdjKNDFzH 9dpyTpB7Jr9PuyXZf0tTngB6MJZ4zvlgX9RldMadL/Upni5m8TOTJcS/2BDTfYuGuxxG C4ourX60ZIWZ6VhRCqYeoV3iaWKFTtxFHgLD0NkLYSPL6kUCF49DniZN1u9Briz0VCMU ypIqs13lQKC5EMEi6p+HxoWnP2foYPPwA+neonz34Wj9QAgD9WwS35YThTElgAC04isP J4fyt4XUc4otZSVa0/UVEPGuaBWfk2gASiCtT0/FnP9WngrPX6Le9DXs34Ur5pJs084J 3CGg== 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=v0N3R2K73pSy3yZM8W4KT0XVExLORk6FOKUnFFZuZag=; b=zq7/p2VCFau4eN1KlfUKsG4PaqF93Prlr+vEe1alKbdwBE/pOKTBrq3yfW9vrYMSVJ dQT+PyasfeuefLhWjgHXpEmbbPgl5hzktB6Mwj2Vj9g7MgT5okdlj16TiGJ2LxTl0QTu 2uhiQLz5lWeczlb4aoOh9eUedo32j9/e4Gq+Eg31OeY4VLlTmDI6z5aYXx55qTmV4Sx/ FneMK0qbL+4RsWrxe9dBGLQzeiRIMOXJjciEmIWfXBWdW6BwllY7Vkij+mJsDQ7OuowU 1AaszTEh5mZBHi+zWTMctJH55fWmZZSWjqhqHCUbNQ9mi9yG2kqxafklgFTHkhc+MocQ ia8A== 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 a20-20020a63d214000000b00502ecb30cf3si8545258pgg.803.2023.02.27.19.43.41; Mon, 27 Feb 2023 19:43:54 -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 S230293AbjB1DmM (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230048AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BFF025291; Mon, 27 Feb 2023 19:41:36 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpM56Whz4f41VF; Tue, 28 Feb 2023 11:41:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S11; Tue, 28 Feb 2023 11:41:33 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 09/20] ext4: Remove unnecessary release when memory allocation failed in ext4_mb_init_cache Date: Tue, 28 Feb 2023 19:42:55 +0800 Message-Id: <20230228114306.3328235-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S11 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw1rKw1DWrWUWF4DAr4UXFb_yoW3ArcEga 4vvr48X3yfJ3Z7t3WkCw1SyF90qan5AFn5XrZxtFs3uF1Ygw4fu3WkJrs5ZwsrW3Wavr98 ur93AryrtF10kjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044787065342024?= X-GMAIL-MSGID: =?utf-8?q?1759044787065342024?= 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 0a34211bb507..64a889b357d2 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 Tue Feb 28 11:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62252 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792038wrd; Mon, 27 Feb 2023 19:45:42 -0800 (PST) X-Google-Smtp-Source: AK7set/vDDAWtPOrnxAzbW2UzFdetnd3LtEuMUThom5p334yGJ5qD7Tje0gvowpBh2RRwrMwX1bk X-Received: by 2002:a17:906:ae8a:b0:8b1:3422:ddb6 with SMTP id md10-20020a170906ae8a00b008b13422ddb6mr870371ejb.69.1677555942092; Mon, 27 Feb 2023 19:45:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555942; cv=none; d=google.com; s=arc-20160816; b=eESE/qt110tGPE6JhW2nkQquCR5/gJ5M34uzOR4Xzr2g6D0RnI3qM9Z9KjgCIHttme PNGMU+zZAFlE22a3fXf56fs+fVlVRMeCqgjaYrEQf1vNVnnVKwmWYIbttmW4XUZP2PJB Rn7dVcYWJKpN5EIuZwH+Ym2k4xYod+wnXxvgo6NfPP7KuiVZRcijst2mOKJHOthdbHx6 5wAj9iTYtM/ldwHFTdVUB+b2VMNY5J18yiMGsWapqhmMyA/4Z9+3E2JJ77Dl1bkEuwVZ smzHlLjTj9qRXkjLTzTm5/6fEMNldbTAbZxkX7LepqmJB2xOFsdRgJCSdeUeyBs0ZNSp zJQg== 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=MWYlZAghNrWwIlI+MLKvtuo0zfTZ0Afb8RV/LPUDRl8=; b=GCKvVCvxJK4sy1C12LIF211etxi51sROWvHQvxE1tVXAooI/7/L49fmJG4CY6xd66h 36B/tjYHjHRaDsQ4Eq8E3N3+nF22unDwLfjeYP/ZoAqwKgY8EOMzWBRHD4+ZnGx6YBRB epio1Il3pzzQUObfnMZf1dRvWCgxFOeU8R/rarlV1j+VEZwxvwwM5pVWRx42FIU97we2 FyYkJClGDY39covZYNY3GL6QZxromcbFEjqdoQdWbKnyRUR6KVMIyWfO5tzw2zgIjlLD NQEffDZkjow1nIMGzFGW/7g/qOsQEN/RPqZBlT84owuYUeuA7/lUeYpUkTYnvNtGyagl N4QA== 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 mm7-20020a170906cc4700b008c4de1a4c2dsi8484830ejb.841.2023.02.27.19.45.20; Mon, 27 Feb 2023 19:45: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 S230295AbjB1DmO (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230054AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0F57252A2; Mon, 27 Feb 2023 19:41:36 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpN1PYrz4f3vfb; Tue, 28 Feb 2023 11:41:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S12; Tue, 28 Feb 2023 11:41:33 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 10/20] ext4: remove unnecessary e4b->bd_buddy_page check in ext4_mb_load_buddy_gfp Date: Tue, 28 Feb 2023 19:42:56 +0800 Message-Id: <20230228114306.3328235-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S12 X-Coremail-Antispam: 1UD129KBjvdXoWrZr1rGF1UuF45Ar1rZry5Arb_yoW3twb_KF yIkr48tr4rJr9FkFn7ZwsIyws8Kan5urW8XFZ3tryUZFyUZrWDZw1kur1Fya1xuFyj9rW5 Cr13ZF97JFW0vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044899672610718?= X-GMAIL-MSGID: =?utf-8?q?1759044899672610718?= 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 64a889b357d2..30d5a0882ebc 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 Tue Feb 28 11:42:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791493wrd; Mon, 27 Feb 2023 19:43:48 -0800 (PST) X-Google-Smtp-Source: AK7set+ThrVeqEjPTAUbefSNjG6mXG+zaIipbL1TiLASMAAGI6PQtKhQx0xEoVTD5eeBsFpVSLyd X-Received: by 2002:a17:907:2d1f:b0:88f:8a5:b4cd with SMTP id gs31-20020a1709072d1f00b0088f08a5b4cdmr1309139ejc.1.1677555827906; Mon, 27 Feb 2023 19:43:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555827; cv=none; d=google.com; s=arc-20160816; b=blGBuxjx81INnYJALNamQGgs2vEns8LJk8ub0vnSS71KdBBWPvt27I9tIAFxplP8xg SDMmjBCbiyXRC2PsjoM77yOcvU9kENP9yueUFiDDNnQ9ptvjiEwRVxX7Rc1pKIKGc4Jo HrrALd+mgzxJ9Vfg2dyO3raJbKZZcmNkI/hUFSNQkpSwoXTA/94AWFFteSsU54AHOyfm cYjZFa28megL11qo8IFbfZgBogXKNDOqKf8p/b1X/giZ42SA8c/Y3RISZLc7ao0agbok ezp/mkbxoipJtVZQmpSDlKAEeEIwHji395FjKmr56hAy4g96moAtM5VCoiYITr9HS0Hu pmiQ== 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=AGG6OT+PuRgBZwiOlUyzTl4fgQdgWaRs+2LiTWQx0+g=; b=pPIhpuGJXYNLYhYYSi1d94IyBGLX6SBedOnL0qWV1lzYUy/htxK+nCiPIkO8fwXbXn qbxYnL41LHIhCe1IBacHw07KInLrsjB5qC1nQ+aPwDa/4UZ71YLCeBtw7e0v1bw1CKdg 10fbkRYodgfoP+Euilp9kKI29GyOynv2S35zXwvfI7gn/3qXTgtjpAirEOlbWR2A1z6H I0brmIJqExcpQi4yIwWWdVH5elKeO3VplG+D7lmzVw0Jh8CuzIvb9kIufHnFCzWrRjOz NvkTGWFY5qAbdcCMdZCWmMb47dMPaubkyyLvlZO3iLRlHCIERQKmsYMQwbU642+08FkD GXnQ== 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 o2-20020a170906860200b008d46bf1a667si843650ejx.472.2023.02.27.19.43.24; Mon, 27 Feb 2023 19:43: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 S230300AbjB1DmR (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 003A6252B2; Mon, 27 Feb 2023 19:41:36 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpN49C3z4f3wQp; Tue, 28 Feb 2023 11:41:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S13; Tue, 28 Feb 2023 11:41:34 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 11/20] ext4: remove unnecessary check in ext4_mb_new_blocks Date: Tue, 28 Feb 2023 19:42:57 +0800 Message-Id: <20230228114306.3328235-12-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S13 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyrZFW5uw13tFW5GFy3Arb_yoWkXFX_KF Wvy348Ca1ft34Ska1kAr40qFsYgFZYyF18XFZrKr43ZF15Xw4ru34kArs5Zr1kWa12y3sx ur1rAFy0yr4F9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044780010881373?= X-GMAIL-MSGID: =?utf-8?q?1759044780010881373?= 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 30d5a0882ebc..fea835d8d241 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5638,16 +5638,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 Tue Feb 28 11:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791501wrd; Mon, 27 Feb 2023 19:43:49 -0800 (PST) X-Google-Smtp-Source: AK7set9Bhi4gMEmRv15HTBDYqdIQXiv6Dzv/ngEeE2iRD04ydJS/JlwMVt82FXpjQo9G+TkbIv3e X-Received: by 2002:a17:906:7143:b0:8af:4969:1bb4 with SMTP id z3-20020a170906714300b008af49691bb4mr1168025ejj.53.1677555828816; Mon, 27 Feb 2023 19:43:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555828; cv=none; d=google.com; s=arc-20160816; b=hPcuTimkbi8SWRrrjBdP6Ls7pHrvx/GMLOd4snr3ffs64U0FhorWBEZ1wwo42W8cus 46H+4IGayTa5XQzwgefhzM17S/a9LqV0USw3oS6gHwUvv4KHqhFclpXZIYudH4/OY/14 z3DARHndmYqvpSHSF32EyZeduNlInxiEnHzTnoiQ9k9IYVg6z3+sAjTiH1ioJgvgn3bI 8jEk3jsA9qpn7IfrcfzOLoMYKG92g3WEAHfgasukVr6v+S1mg9cUnGRv9+ejVLWn3Cxw 2MyfERupYFZeZhZxep7JTXSueVLB5cddBVo1xwUv7xUopVjOARDgNUoJxrMEGwELad8U PpLA== 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=n8ARxtE/cWbeIv6CT79ZaWncjnAp7bHxe9ZWXeU2gfo=; b=hVKoxodkuh0oir1+hW4l0EhLy4ujS7TtXncHPZ0jbRGcoCI4DwLhEVvxCcVq2rNyM5 WfhY8KvdgepwtCUZ8egzNlwP/LF7tknEN/LrUNEsxHIeb2AO0mCzki9z7K+5lW2RFfnW 4jmfNWbqQm6zgcLlypxkGXAX4jf/IOKVE+IWdihCBdMuA7g4iSMX/B4lRcx0+Ril4SQ4 oLqgLDS430ogZiPZGJc58SswQa28f1puY0Mwjv1Qcw9XBSc4uZMbXlJRWI9+YU7KflHM XAjzVTCyVKtTh3ay+l4HUpvZlOAKOpVm6kDeJ2tt9TYbiNkZLbzU1mem7U4bX/hzY00D AYFg== 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 l24-20020aa7d958000000b004acede4b48fsi9485803eds.44.2023.02.27.19.43.25; Mon, 27 Feb 2023 19:43:48 -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 S230305AbjB1DmU (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230079AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6760A24129; Mon, 27 Feb 2023 19:41:37 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpN6xlDz4f3wQs; Tue, 28 Feb 2023 11:41:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S14; Tue, 28 Feb 2023 11:41:34 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 12/20] ext4: remove dead check in mb_buddy_mark_free Date: Tue, 28 Feb 2023 19:42:58 +0800 Message-Id: <20230228114306.3328235-13-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S14 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr4rJr4xZF45Gr18Gw43trb_yoW3Cwc_KF y3A3y8JrWftr4Fka48Ar4vgr48K3Z5CrW7X3y5tr4xWF1UW393W34DJrn3Ar1xu3y2yrWD CFn5Ga4xuF40gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044780808697263?= X-GMAIL-MSGID: =?utf-8?q?1759044780808697263?= 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 fea835d8d241..f40af7430fca 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 Tue Feb 28 11:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792187wrd; Mon, 27 Feb 2023 19:46:08 -0800 (PST) X-Google-Smtp-Source: AK7set8bHKlqNnBCHTMIvEGdNjcFNhjkM5zeD2mmXwb8siM6W6nIFs/f6/vkpyovRaKchqnXE7GP X-Received: by 2002:a17:906:bea:b0:8fa:43fc:1118 with SMTP id z10-20020a1709060bea00b008fa43fc1118mr894701ejg.41.1677555968751; Mon, 27 Feb 2023 19:46:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555968; cv=none; d=google.com; s=arc-20160816; b=ZESiRiW5wOOc851PzQTwZzC5OicOrpQpJ8LbAuxPy+I2JM//f06fvhoOCfFVbh9vhw BDeZw2Z8wkwbmHwkAD/bakTjorB5afZvU3se9j6A7Dx3BcFBL6K/kUIK5ZSRRoJ8/RAD 37EV5eNxaxMAnfa4wBC/26aN6AuqtpExCwmvbwemMZh9W/qvtGfAKEdZN0tMjAxZHSLB ljiLHeAoN+b+Nl3Eet0FAhtRPj1MUxdBNFUI94eX6JhGIP9Hj93IE3ZX8QcZszG4em4z xYCUhg0tCWGPSwj2zLyGLHpFj8hOvzrtjm1RvqL2BpHNYCYbMlMPY6NMUpHN6KUN1v7P 74KQ== 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=ky/SguRrqOj902A/sbm38vCLn9Zg64z9Y4ZN4XxgQr0=; b=z56dEr9Ng04tiH8bnP+mFB1PyWeW+Vp37yI6b3Cb8ZtLfFJ6GPcUTaRDK9PAEr59+r 6hej44nRpJgK53giIqwZ1PV9iQ8ml7BTH0gqrZyeZgHF/F6feqJxBy2ZhiFmkjPilvWY Qv3h7jBcoftbjv5dyjaRm4SoY5tbpq766EY9dDBTYsV9VOxSvhjh63AGBIoLtOu1zubs PeCLpl15q267WdaOiPi/Wj2aANlCtzBL0IEEzSb+ClIszGf2huPRqokjboGAeB3NAOyc zgXJp2WowRTmAF+1XYZxQ5cqMuGpFilFVwPm1Mo0s3WJT5BM0K3alJAdqnbQq1d9XfsU px2Q== 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 v23-20020a1709064e9700b008b17ae97330si9604489eju.880.2023.02.27.19.45.46; Mon, 27 Feb 2023 19:46:08 -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 S230310AbjB1DmY (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1037241C1; Mon, 27 Feb 2023 19:41:37 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpP1px5z4f3pBh; Tue, 28 Feb 2023 11:41:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S15; Tue, 28 Feb 2023 11:41:35 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 13/20] ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits Date: Tue, 28 Feb 2023 19:42:59 +0800 Message-Id: <20230228114306.3328235-14-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S15 X-Coremail-Antispam: 1UD129KBjvJXoW7KrW5tF1rZrW3CryUCr17Wrg_yoW8Ar1Upa nrCryUC34xWr1a9wsrK3Z8W3WFkw4fKFyxtryfur1rA3ZrX3yqka9xtFy8ZF9Fyrs3Z3Wf ZF1Yvr4UGw4Ika7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759044927771969770?= X-GMAIL-MSGID: =?utf-8?q?1759044927771969770?= 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 f40af7430fca..07a840e8543c 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 Tue Feb 28 11:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791662wrd; Mon, 27 Feb 2023 19:44:27 -0800 (PST) X-Google-Smtp-Source: AK7set+pgbQRJFAr0rWo6dPrIgfrALUK/lB487oY8ChRqP3n1C9EzbZqXyRaaABC5pkYwd18OWSC X-Received: by 2002:a17:907:cb81:b0:8b1:7eb1:590e with SMTP id un1-20020a170907cb8100b008b17eb1590emr1336426ejc.20.1677555867023; Mon, 27 Feb 2023 19:44:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555867; cv=none; d=google.com; s=arc-20160816; b=Ye98PREfq/JHGkstZ4lQqMdga7t/qXKlKmo7wMUy0Aa0vqvrfJrM+eGqfRk0IWaJvN VUMjL8FHtWLut9G6VbpL7/Is/KFTXd1M1N6mWaQZVAZpEAU/1X8nxGsb5fUpWvlwtL6R 6h61QBE1Ltb0snXvBsGrNZ9eWSxV3clz2KPRj/Qh2hsFvnYAMV8OnJghFkwBYHN9Fva6 pK6kylixbyDNLZIpxMhWQ0nCNCL6hD5bVHGWBkTEqQhqTXWXoCLJH1QlkMjgVgVpvehz 6XDPE7ipIAaolOJy+QzCRs9u4vS7nzSEdV451ZTUtYeRg96JR3LcTbQtgXbqipid2eZd VinA== 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=zaXC1iDXk9YlSxs0PgYVOgjOmrQbswi2jfS5L4pQhm8=; b=JXQRlx3PdU1dtJT4oBVlhtg4RCbwkPpxdh+3f2XKJDlCzraaEkNudLvEMWdpe4U0g/ K+0tonAAliruVMUGGi/6WEpMgovLsh2dsKc7vyVcIoSz9nVPdKbpwZNg8faLmRZEsFZN qRMoiGWMN/VZu07S+KJM4xsw0ZiiqTXXJx3mZL89Xl8v25gIg9gHxJg2XiAbmuaeE/Jb 3+aiAKAp+1+hWypXUZwnPT9pbHezzm7pOIeTek0z5nwEehCFlhG8yh5ZFpsXER1bXCZb u/QxPEkoNgepXiCUbYafceqaIMMHGADAgTO3rwwiT/2ZHFN7N0eWqmuDuuKg+Abfbq+b KTtA== 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 z14-20020a1709067e4e00b008c8f5756068si8281292ejr.766.2023.02.27.19.44.05; Mon, 27 Feb 2023 19:44:27 -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 S230334AbjB1Dm3 (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229799AbjB1Dlj (ORCPT ); Mon, 27 Feb 2023 22:41:39 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A720724497; Mon, 27 Feb 2023 19:41:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpP4sgcz4f3w1F; Tue, 28 Feb 2023 11:41:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S16; Tue, 28 Feb 2023 11:41:35 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 14/20] ext4: use best found when complex scan of group finishs Date: Tue, 28 Feb 2023 19:43:00 +0800 Message-Id: <20230228114306.3328235-15-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S16 X-Coremail-Antispam: 1UD129KBjvJXoW7WF17WrW5CFyDWF17tr1rtFb_yoW8GFWkpF s3JF4UuryfXr1Du3y2ka1aq3WrK3yI9r10yrWIgw18WFW2v39Y9an7try09FykJrZ5AF9x Zr4YvF47Gw47Ka7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759044820911591902?= X-GMAIL-MSGID: =?utf-8?q?1759044820911591902?= 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 07a840e8543c..c637d0a89e2e 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 Tue Feb 28 11:43: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: 62249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791592wrd; Mon, 27 Feb 2023 19:44:12 -0800 (PST) X-Google-Smtp-Source: AK7set/mQJzGpZKAOi42ML+i+zf8B7KaBfzFMKQeSrgqIrzCRUHxJG22Sb6Bmp8JhKIByr0PZHhV X-Received: by 2002:a05:6402:500b:b0:4af:62ad:60a2 with SMTP id p11-20020a056402500b00b004af62ad60a2mr2027203eda.0.1677555852101; Mon, 27 Feb 2023 19:44:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555852; cv=none; d=google.com; s=arc-20160816; b=KYlB77AlsXqneg8/acfZFRHZiCxulrA4N8jSaQsdWu1RHhiTB/4wsa8KLzuSz+3SWW 957MEs9XTuZjraZOB3H1yoEPMMy1mE2KPWQe+nzoH7i7mvFqkQRPimDMHdGpb++zJLWX FXrD+fEDG28RQO1rkyHh5Eqe98fyv2GrbcX9d9u1Jtp5xykeC0qDWLCjjGfpP7skeVTX IZS+tdsElaKpybJGvU6dZPSYQruVJg8AUGlZ2hFJ6VeavLpDQ8kiyOnZUhdCFYs1u8X2 6+mfyUJTrXMVdzb97VHE47vieHjbeNXHAu+kMVCnPEZo6fLTYQrN8Sj+XUCjqp696dRi v+rw== 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=ulkPseg6nUOHD8UcQ/QCQ3CsypGqjnYVoYPydNZDjf0=; b=r2iqnPfN9jpqm8LErYkPUoA3FU1IJpTlNXcQMODbMOZa48SvWLzKLnjrLzuSl+EqP5 IWP3SHN5VKhZzdxidI9WqsSCjrsXCLX7wQ6dvRDKbp5GTH0OLEQc/B//GTZD8jir49a7 VAo/EQrQwlgDYWaAuLNGKm4zdgfzweqP9oxGhvZar19wEp718312/cJXnU0B6Jjp5uTy c2F+mxNgm4lPF9xaGUyJTgl8fKCwZTQxRrBttz5YLN+uA9F9Lg7Fx+mCtijrzvpxkE3t 3HkHPoY+HkPlD8h8tbDEgizhSpITn0y3aohyzIT6QDy1bcsN+JJqioBZwnJFTHp+tOpJ 94lQ== 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 bf3-20020a0564021a4300b004a0a7d851f5si10606189edb.634.2023.02.27.19.43.49; Mon, 27 Feb 2023 19:44: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 S230283AbjB1Dm1 (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230169AbjB1Dlj (ORCPT ); Mon, 27 Feb 2023 22:41:39 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 659C4241E6; Mon, 27 Feb 2023 19:41:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpQ02wxz4f3pBq; Tue, 28 Feb 2023 11:41:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S17; Tue, 28 Feb 2023 11:41:35 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 15/20] ext4: remove unnecessary exit_meta_group_info tag Date: Tue, 28 Feb 2023 19:43:01 +0800 Message-Id: <20230228114306.3328235-16-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S17 X-Coremail-Antispam: 1UD129KBjvdXoW7XFWUGrW5WF4rKr45Aw47Jwb_yoWDZwbEya yxJF48Wr48Jr1fJa10g39xtr48tF4rAr1DXF43t3y3XF1DWrs5u3WkArnxZrZruay7AFyY yr93JryxJF1IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044804962841018?= X-GMAIL-MSGID: =?utf-8?q?1759044804962841018?= 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 c637d0a89e2e..1175c81f8e2d 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 Tue Feb 28 11:43: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: 62258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2793124wrd; Mon, 27 Feb 2023 19:49:01 -0800 (PST) X-Google-Smtp-Source: AK7set+7Nia0HZS4vXIzruzACO3peDSEbIzHj5KeryUbkjIU8r68Yu4Z6wuF/qh9Pyuv8fRgKKxu X-Received: by 2002:aa7:d383:0:b0:4ac:d2bc:32f9 with SMTP id x3-20020aa7d383000000b004acd2bc32f9mr2066031edq.4.1677556140802; Mon, 27 Feb 2023 19:49:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677556140; cv=none; d=google.com; s=arc-20160816; b=MoIkNz10rdeuT+b1SqFOYC/tM2ZmRAoTAhiQl7fb87YZvW9kintq957QRkNGeEBnD2 ofa+oQLZf0At9O4G2XJeLK2F+X+1I23at0Iu5YLunOt1JKx+Gy/LaqQjX/PIABnc3mqt bj1sC9pnJcGiM/A8fuF8qguTk4whN611b3chtk4gyo9Y/zRyovZ+aOD8An4/sl3YmAb/ bEsRAX1VvP5eQf71tvL0EVeRqMqw0W2IBNtWVfWJgiaYVeAgGrDD/KVQolJ28SA7zqa6 TVsGht/eYs61RlIURhPo9+Bnja2XW5ywivVcA7q3E8GBNTPeUkPyJutlj3fNV9Pfqqb3 E6Hg== 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=YKpxGSVyZgHVpF8W7kHmGza3q4GMUWsMr0pryxFNjAI=; b=WrpaAAuPTP0OEWA5BpMnDDzvNdh4yvB1E6zOzvqjcsJkT+O94E0y5Mf3O47t9wUgzh bOddL4Xx2etkr7Z1u6ERiIg1EKUs9MAcEqNXMq+Q3kkIiBP2UVXDhyJHn+33ga0Pkvs1 STkNuEX4Wumv9BTE8n2DnpgtO9UPxvPWe01Yh55h/r/OEd8Q0WygIKeIpd3jIkruP4Dx VqUAcGChR8ir+B3BDyoad5NR3AVJd7r+Q1sc8gHKlWONV5gUAdUAROMwJU0R4JiqaVmx m+3MV6/LKScg3CJaYk/Lf7cC89p71aS2GKUJIzfOTbmFlXKTt9L04fDeFYlCvE8X5M1P egpA== 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 mm7-20020a170906cc4700b008c4de1a4c2dsi8484830ejb.841.2023.02.27.19.48.37; Mon, 27 Feb 2023 19:49:00 -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 S230373AbjB1Dmk (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjB1Dlj (ORCPT ); Mon, 27 Feb 2023 22:41:39 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEF9D2449A; Mon, 27 Feb 2023 19:41:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpQ3MWnz4f3wQk; Tue, 28 Feb 2023 11:41:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S18; Tue, 28 Feb 2023 11:41:36 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 16/20] ext4: remove unnecessary count2 in ext4_free_data_in_buddy Date: Tue, 28 Feb 2023 19:43:02 +0800 Message-Id: <20230228114306.3328235-17-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S18 X-Coremail-Antispam: 1UD129KBjvJXoW7KFWkWFW8JFWrJr1rXr1UJrb_yoW8GF1rpa s8Ca4Uurs5Wr1kuanrCayvqw1Iq3929Fy7try5ur1fJFy3Jr9YqFn3tryruFy8tFZ2yr1a vFWj9ryUC3W3G3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759045108109814912?= X-GMAIL-MSGID: =?utf-8?q?1759045108109814912?= 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 1175c81f8e2d..977f89856aed 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 Tue Feb 28 11:43: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: 62255 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792359wrd; Mon, 27 Feb 2023 19:46:36 -0800 (PST) X-Google-Smtp-Source: AK7set/W7ByI9YCAQtmlanhgznvUJAgxcS0Hgs1KqTkDPiSbK8lK2mf6U51CcxKNRZJFKXRlgKPB X-Received: by 2002:a17:907:7e82:b0:8ab:4c4:d0f6 with SMTP id qb2-20020a1709077e8200b008ab04c4d0f6mr1413260ejc.56.1677555996169; Mon, 27 Feb 2023 19:46:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555996; cv=none; d=google.com; s=arc-20160816; b=XnqgaiXIHertFT9+8aBAD/q+VFLL+eJxRX8pJIXnT6TDDia0TLl3FN2Lx/cigHELX8 ERXSls4ycmmvNpq6rUdqbrwttRZdxpE/z6ga6c6jjywR1dlb0HdI/kiYu0NzJA6b6je/ qjTSbQ2/w1IeMiQUySDvkct8H7TWWC4Cj8cM9TVvp51e5bul/4CWjfULZisV4595f6Ru JGPN2fA6s7KSVMWxx+/DnBaA8VCwylSTyYN7HOnDclpjoSIWUgiR3RQxVXPdVCGDbpXQ yFXoJn6B3OosJbpC0URG1ynNUKECvZkouaNiYU//AlKVOMt0/uOXEN/HdRsdbHRh1m7+ tboQ== 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=i2WvkgX1l8pPX4Zlgsz3pi2q+Xql803yfwp6E867wWY=; b=RtS/nrYqOg63vOstOz63psykx+IAW9lsj5oSlaWYyUhrecvxaMrKpq4nNxgEgSiVY4 aQ7S5i1WjGVH241a32eVhpuary30jLKLojCHQmyi/ctnd+zRVkBPEDz1FtsqazaIrQHP sG+EaNyTYx5yXte79KQqyvHPyzuQ/sRN+KqTtVIehAXfPweckG1AhgLMu0E2vJy25ZsG V64fdO6QH2JDqqez2SOeIaoMrghYRNAeqQlC7RVPiNHTjqItvC2pvsfvNMDl+xWC01v2 DGU4EaRc9jFi1ghycpPuhl3PEgX2+IpBP9SOxer+J3RMQo5Ir20fl3o3i3NJ4LDqJPFh 4nDA== 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-20020aa7d498000000b004ad4c4b5ab2si10161858edr.392.2023.02.27.19.46.14; Mon, 27 Feb 2023 19:46:36 -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 S230343AbjB1Dmb (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbjB1Dlk (ORCPT ); Mon, 27 Feb 2023 22:41:40 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B945244AB; Mon, 27 Feb 2023 19:41:39 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpQ5c8xz4f3pBs; Tue, 28 Feb 2023 11:41:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S19; Tue, 28 Feb 2023 11:41:36 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 17/20] ext4: remove unnecessary goto in ext4_mb_mark_diskspace_used Date: Tue, 28 Feb 2023 19:43:03 +0800 Message-Id: <20230228114306.3328235-18-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S19 X-Coremail-Antispam: 1UD129KBjvdXoWrZrWrKrWrGFy5AF43KFy5CFg_yoW3Krb_Ja 4UAr48ZFWrJF1fuF1vvF1ayr4kKayFyF4UZFWftrWfZ3WDXay8Cw4kArnay397W3Way343 KasxCryUZryFvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 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?1759044956058553398?= X-GMAIL-MSGID: =?utf-8?q?1759044956058553398?= 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 977f89856aed..f7fa081bece9 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 Tue Feb 28 11:43: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: 62253 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792064wrd; Mon, 27 Feb 2023 19:45:46 -0800 (PST) X-Google-Smtp-Source: AK7set8k5r2TzVIKky1oc9WgkXdTCAMT2OUrY0dEbekkjiK306T5qGgCx2EpfeCDpomTc5PagOew X-Received: by 2002:a17:90b:1c88:b0:233:ebd4:301c with SMTP id oo8-20020a17090b1c8800b00233ebd4301cmr1672905pjb.1.1677555946357; Mon, 27 Feb 2023 19:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555946; cv=none; d=google.com; s=arc-20160816; b=HzGkbYSbuD6M9mPlUfvbu/mg7vUCMBQ+L4l6fKqob/0txSJ+6KMIibu3wZifM16CA6 ohm9yjQpY/uhWcnl+QxJKRpXJXRMgnL/uO5kxSpW1aZ0+NyInJu1cSiXU14svZC2zMwE 4arrzyjGV2CcxUJDP0aT7yh7QSmFo5hdpqLVFoegSYZ3cFk/cKUt1R2WZpQtCxJQOR3x JgOkDmfkqxHxsYo8BVDQhXc0+ebyQhZn+rVNygaKcpw5sw8MJf8a3KFVUxr0CPJNd43Y gvnJ1oDBTFocVBR22SmV1p5u/rhcrfTc0iEimYzwqz6dJZBS2QkuEuGQcp5PUwTdP8ma /mig== 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=VWKs5SUpAF8Dey+Cg2EFH3a/q+bpj4lE4OXUihseE04=; b=LrkjYyFe/qcV9NhxUPzAvYch2T/o0KNfdlI8TetcEvLmDXcuDP9hRiFRMNKerWswP/ B6jcQK2wWHyFoD5yE4cnf3GvHwnkPcg3f5fq+RBbxycb7fIHqTTBVV0j96PvplC8SoTj ebd6UKe75vvMPm+kI1lMYf3Q/RQ/p1yOqSsgYL0n1a/s3OwsSoqzpQ/31dDtEXUN8Jp5 eDjH4QoVl3d8Mf1cUrNcXR+17dpLlQ5M2OuPtz7J+VwWRNUbTkoHh2RgiII3+w4RXXed VQDSpCwZlwPvD4Ryxbp1IqlOiLg/iDSGTQA0mbYfpS/QcabAiz3BUBH2l5LdLDkfZ1UA 8ubg== 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 pi12-20020a17090b1e4c00b002342e691837si5164415pjb.21.2023.02.27.19.45.33; Mon, 27 Feb 2023 19:45:46 -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 S230353AbjB1Dmg (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbjB1Dlk (ORCPT ); Mon, 27 Feb 2023 22:41:40 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88A6E25B85; Mon, 27 Feb 2023 19:41:39 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpR10tyz4f3pCB; Tue, 28 Feb 2023 11:41:35 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S20; Tue, 28 Feb 2023 11:41:37 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 18/20] ext4: remove repeat assignment to ac_f_ex Date: Tue, 28 Feb 2023 19:43:04 +0800 Message-Id: <20230228114306.3328235-19-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S20 X-Coremail-Antispam: 1UD129KBjvJXoW7tryxGr18Cw1fGF1fGr4UArb_yoW8WF4xp3 ZxtF1Skw1fXr1DCFZ2g3Z8J3WFkw47Gr1UJry0gw1rJFZxKFW7Cw4kta4IqFZxCrZ3AFnx ZrWIyF1UGrsrG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx 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?1759044903860930474?= X-GMAIL-MSGID: =?utf-8?q?1759044903860930474?= 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 f7fa081bece9..8c5ad44f71f4 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4632,10 +4632,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; @@ -4686,10 +4682,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 Tue Feb 28 11:43: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: 62257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792580wrd; Mon, 27 Feb 2023 19:47:20 -0800 (PST) X-Google-Smtp-Source: AK7set9UhgDHiw0djqZe469z4bvjBCPgpjn2uAUvF6WQf9u7QKAeCU1jc3xtKGDblEzveLzqY2zy X-Received: by 2002:a17:903:41c2:b0:19c:171a:d342 with SMTP id u2-20020a17090341c200b0019c171ad342mr1639518ple.37.1677556040541; Mon, 27 Feb 2023 19:47:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677556040; cv=none; d=google.com; s=arc-20160816; b=yzeLuq2xZBapNPlbFBIkS5B8DHxnFITqgNJjwAIf/EHYrNFM2k3XHKkHMaC8Mfnkx5 kKlbi1PNOcMvVUgFJpofPChjYB/FNlmX2VoA60YKmIXEiS/BaxNLvcNSIiEZRDfdT6Eo ZVs+mr9Grzf9T176zvuR6d3uAS0OAep5tVDE+8EISJvJ0WPDQ0qfSShgaxcS7eB2wwdn YFmD43eVKFstRRtxCxg5ZUq5x02yDU+1ZvPvI+e0nXDU7biqurq4GRxHwhPtdqcGgKNj ibnZsXaHgI4+SsPRfOqwmUs0s0omzns7nnolvMddZPh42xuIJN5wTSTXU2nT7B0/eC44 CrvA== 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=j/Hmo2RRd/QbjCmCkkcH57LYGAtApP+So+nSzNzLhXM=; b=a1lZR0Giqox7n/czpAbPLaCBI2GnLfvTM59WqLZdzMkWn/HOkjaMR4mCzyJOk0S5PG deAlRz96DFt5Xu6uCxh3TSa9aKGDM67ypPyuKGUjfUieU2ztqmK82/pkKpuGpqnlE6c0 3ttQe7ziExAhQbLD/6y8uTw83+d46APgypiSzVzF1EJwUAk7ZbTtH+Wb4bIEBwFZwSOS XqPOfR4cZHo8oVKSg8//EQHf92BN9zMWsbd8KMgjyMRptV7ef5VbgJ1sQBQBBLaY4gaa LbpHorzSIf1LueQxrW3hVHB7ZU6FjMBG8aruSqTu2rGbpSOQ1No6DiUmFf6SBi4K9xDw QJcw== 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 v11-20020a1709029a0b00b0019aca521890si8673876plp.10.2023.02.27.19.47.07; Mon, 27 Feb 2023 19:47:20 -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 S230205AbjB1Dmi (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230176AbjB1Dlk (ORCPT ); Mon, 27 Feb 2023 22:41:40 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE6BA25BB7; Mon, 27 Feb 2023 19:41:39 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpR3ndVz4f3pCV; Tue, 28 Feb 2023 11:41:35 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S21; Tue, 28 Feb 2023 11:41:37 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 19/20] ext4: remove comment code ext4_discard_preallocations Date: Tue, 28 Feb 2023 19:43:05 +0800 Message-Id: <20230228114306.3328235-20-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S21 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 CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_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?1759045002666476016?= X-GMAIL-MSGID: =?utf-8?q?1759045002666476016?= 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 8c5ad44f71f4..f65894bfaff2 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4922,7 +4922,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 Tue Feb 28 11:43: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: 62256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2792411wrd; Mon, 27 Feb 2023 19:46:46 -0800 (PST) X-Google-Smtp-Source: AK7set8cdOxx0jKULB2QPqzKbDeiMXUQjyqucLN/qu0hFG1EfTUUkVr9s1BgouapzDkBPLd/N7N2 X-Received: by 2002:a17:907:2059:b0:878:7c18:8fd9 with SMTP id pg25-20020a170907205900b008787c188fd9mr939342ejb.44.1677556006806; Mon, 27 Feb 2023 19:46:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677556006; cv=none; d=google.com; s=arc-20160816; b=ldH5Tyqnj3EEsG5DUqa++btfokLUx7v+o+ZwfIG41mPiYI5BbDRCwaN78pNeJKF81P W6Y3xOavp9wy5JFmn/HKzwtIPPTKfmxCJiSIEciUpRxWLiRv/062WmYiNgudbxLzP285 wBPgsjad4jEbC7kN9jwAScMGxg9J1Pcw9AwpvwZd5SQWAz21tVH5ftREjuOPrVXEvvqJ mjva29JxTWKgyBgv9nu6DZcPQxSZJeZm9iUjvXM3ir+UaJRIBvX14bBv/yPfWuUdzzOA 4D6h/PNjxN+8T2M2jqBCsMVp20EKGBImqdsACHO+9sRjFz2eqnl501bxzLZBVv6Qyx6D ptYA== 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=ShcfV5IadRlX2Eh0wFWiqlfm+qsa3FakrLJLMzrvvZc=; b=W95V3o6rOuxEL9vXC0fH7LqicrEY3VOBbKQuOW2zgCxl/8H1NnsDlHk9aWfxjXWHZ2 uTz/AFXod8cEWCP+ohXGJ/MmbjF82oeXeYraijIieDtq7ZozUxWBFlWo2TN6FEKMCMgA a9KmZTnKquMHxjoMw5igNlPdWh5y6tn3igQBATuDNpZlwdp20EA4sRa5xF7qm0j7tZm4 dLmcCZ3QGa9jE7ORlwY7lvPr6/U4F10p7MXA/Sf/f09EoxBiqE4BAutg3FokqMOsRif3 vEBzf0RmkxV/FzVipNhtMv9jJBvA2/vHC1EizP+lrqgZADL98PhyyDNrFbyVFgwl6Sfk aZkA== 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 x21-20020aa7d6d5000000b004acb5b5b339si2094914edr.219.2023.02.27.19.46.24; Mon, 27 Feb 2023 19:46:46 -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 S230349AbjB1Dme (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230179AbjB1Dll (ORCPT ); Mon, 27 Feb 2023 22:41:41 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB7325E22; Mon, 27 Feb 2023 19:41:40 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpR6LJxz4f41Tm; Tue, 28 Feb 2023 11:41:35 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S22; Tue, 28 Feb 2023 11:41:37 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 20/20] ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple Date: Tue, 28 Feb 2023 19:43:06 +0800 Message-Id: <20230228114306.3328235-21-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S22 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4kWFW3Aw45ZFWrWr4rXwb_yoW8XrW3pw s0kFy8Gr13Wr1UuF47u340qw1ftw1kWr1UuFW3G34rCry7XryfKFyDKF4rtFy3tFW3JF9a qF45Z3yfZw1jka7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAF 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?1759044967118440159?= X-GMAIL-MSGID: =?utf-8?q?1759044967118440159?= We calculate blkoff for groups as following: ext4_get_group_no_and_offset(sb, max(ext4_group_first_block_no(sb, group), goal), NULL, &blkoff); For first group, the blkoff is already calculated before loop, so this is redundant. For groups after first group which contains goal, the result of max(...) above is always ext4_group_first_block_no(sb, group). The blkoff of first block in group is always 0, so blkoff of groups after the first group which contains goal is always 0. So we can clean blkoff calculation as following: 1. Remove blkoff calculation above to remove repeat calculation of first group. 2. Set blkoff to 0 to set blkoff for groups after first group. 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 f65894bfaff2..2cc655de1853 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5769,9 +5769,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); @@ -5786,6 +5783,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) {