From patchwork Tue Aug 1 14:31: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: 129029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2484011vqg; Mon, 31 Jul 2023 23:48:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlEm6VaoTodJdBTlPCsCCIG/Lzb1XU8l6u/0LnwzyOdcfuqrtfts0sfxf/yi4VmUtPe9O3Il X-Received: by 2002:a05:6a20:1615:b0:137:53d1:3e2 with SMTP id l21-20020a056a20161500b0013753d103e2mr13310784pzj.41.1690872483501; Mon, 31 Jul 2023 23:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872483; cv=none; d=google.com; s=arc-20160816; b=lXvqYfDCSEKG6V3aXtai6QP9rsSl00koU+94+IheAJHN4LsF4OyI1uTGT7hqMZGPc5 e3lQ67OSGEcz3E1jtsNd/hhgyzcntkU/COE+70rCsfqeYFoxCcjBT6+tQRgbXs6zqRPD kdiTtgaGDv5TzLTQmY6q3Sc7UOe3jpGh5lqKcfmh4rtnbNIa40CIWa5r7OwC0O5LAI0z QfcFxKal5xFW2KmlRHLzxSKTsnjp+D2HHt/aT0J9axnIHV/J00k64vdqHXAVkpK7RV2X 6uCYn7Yzdt99S7el+Qnh16JZlIcfZ8wEb5CnHa2FOGBYqCxUNxz5cPPrXfRtaHIC8wJF yeJQ== 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=WkETvhtN2YRfpYlI6QS+rvvBFzLyLo67inxsZd9B09I=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=GgF1Hug18EDz75GDID+yHlN4HpfBQn1rNMGdxfE2zP6FmAJp3e4mtMiu/QS1hl8uXH 6Oe6+Ak+nGRtPkrtoFOfZmJmrZCB+WCQkok6+823EYouEd80SqFxxq8Ux3iFik673+th NiHvWdW3mOdok8XYhmRiJMFRpfuEp5QnXyNG+O1dEoG/GsRDxpfvO+Krer0QwYkae+6b u5gjXsJ0wqgB6wV6Rhc2OGxW+OeCBqwQUIYmCFxC03wBkB6YA4+f+51zuMEqQag+QwV3 YyHcoe3WbC/AXB8ArCkizRwCo3xt/S/o53p3DSmjDuZnQE3hBAfTu04+T9h42Q6+G5er CS6A== 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 u11-20020a6540cb000000b0052cbf501db2si8561809pgp.68.2023.07.31.23.47.50; Mon, 31 Jul 2023 23:48:03 -0700 (PDT) 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 S231592AbjHAGb5 (ORCPT + 99 others); Tue, 1 Aug 2023 02:31:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbjHAGbw (ORCPT ); Tue, 1 Aug 2023 02:31:52 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8EFEE7; Mon, 31 Jul 2023 23:31:50 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHk69Bvz4f3lfk; Tue, 1 Aug 2023 14:31:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S3; Tue, 01 Aug 2023 14:31:47 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 01/10] ext4: correct grp validation in ext4_mb_good_group Date: Tue, 1 Aug 2023 22:31:55 +0800 Message-Id: <20230801143204.2284343-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S3 X-Coremail-Antispam: 1UD129KBjvdXoW7XF13ZFW5Aw1UKw1xJF45GFg_yoWfArb_GF yDAr48AFWfJ340k3WIvwsayrW0qF4xXr45Xa93tr43ZF45WF48Aa4kJry3AFs7W3y2yFy5 Aa43JrWUtrWS9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRZOzsUUUUU 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773008305338634744 X-GMAIL-MSGID: 1773008305338634744 Group corruption check will access memory of grp and will trigger kernel crash if grp is NULL. So do NULL check before corruption check. Fixes: 5354b2af3406 ("ext4: allow ext4_get_group_info() to fail") Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- 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 3e34e37392fb..556b7cd27f76 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2553,7 +2553,7 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac, BUG_ON(cr < CR_POWER2_ALIGNED || cr >= EXT4_MB_NUM_CRS); - if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp) || !grp)) + if (unlikely(!grp || EXT4_MB_GRP_BBITMAP_CORRUPT(grp))) return false; free = grp->bb_free; From patchwork Tue Aug 1 14:31: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: 129018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2481663vqg; Mon, 31 Jul 2023 23:41:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/MVemIRUy1uAHLHq+aTZ2bCh9yyMdIEpvsm3toB6RVRz2xRHvO38FrStu8j1/OODdG4a4 X-Received: by 2002:a05:6a00:419a:b0:67d:308b:97ef with SMTP id ca26-20020a056a00419a00b0067d308b97efmr10827317pfb.2.1690872095065; Mon, 31 Jul 2023 23:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872095; cv=none; d=google.com; s=arc-20160816; b=0SJiaC7CzXZ+64FxfOlf4YZsMDRjj6D1DEySuvFBPD6ERnmca3w67ZQnsYhuxx+yCb mbwZt9ljOnSrEvtdtZrsZaZBJ3RbRCD5vKjUqYK4RLubx9LoaqjRMhIpw1T/5zaxLybE xxHZWysxymj5jmoPU5MwdAFV+PYY/TVlXkFTHp8HhmoN7OM8zc9M7tBuGGGquUkhCHNi +Y56hY9/jrJfrkpOpfmHwezVCAzsyi1lrHchPxuvmkLoMYxzkF8cMk9d+rI9BArBZ74E 4yIAfzr75cGAaOv+EkP3iSEyIKgGN581xMw1lBUNyJAiSXpimniOVFU74oJ2qJLBRd8A JMmg== 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=oS09VbzT0L5bZHtokM76Lw+dlqbeimHpMjisr68qnys=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=zve2MNh31RTsUjvXzL4Sw6G+Ok3smY49Fyq3dM2xeEasLfmZ/WFVKyQrPbsKStNOTe nYhNmY/mh407/ZYWko4j3ZgyiP/+NTNVNkB2l8C0IfFbZpAqNxfHy8aDU5kXKKkWw+JC GOwrNIDuGNmFtWJvw+HgV0SloB9hqUccD5q2BJWgi/9AC1A2vPWXnuucJeyvJjblzLIL UGoanjEjSvo5h4Y3LtnX0DKWgBFtT4nZG9pJPvMDsF0k1ni3hVZUXWe5PjLLjsdREs1Q DFa3VHMNptAeOKiwP2cVQHk1cPxnnSh0xEv96IaRGo0nG4UPq/KyvXABo/cWM9pzwR9Z L/uQ== 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 n4-20020a635904000000b00553e8d95742si7182500pgb.654.2023.07.31.23.41.21; Mon, 31 Jul 2023 23:41:35 -0700 (PDT) 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 S231478AbjHAGby (ORCPT + 99 others); Tue, 1 Aug 2023 02:31:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229968AbjHAGbx (ORCPT ); Tue, 1 Aug 2023 02:31:53 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24449E9; Mon, 31 Jul 2023 23:31:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHl5TnLz4f3l8B; Tue, 1 Aug 2023 14:31:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S4; Tue, 01 Aug 2023 14:31:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 02/10] ext4: avoid potential data overflow in next_linear_group Date: Tue, 1 Aug 2023 22:31:56 +0800 Message-Id: <20230801143204.2284343-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww1fAw1xWr45Gw17Ww48Zwb_yoW8JFy5pr srG3W8uryYgr1DGa9xGayvg3WrKw4Ig3WUJryfuw1jvF97Jr1kJFZrtr10vFyfGF4UAF15 Xa15AF1Uu3WfuaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR mfOrUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773007897776919921 X-GMAIL-MSGID: 1773007897776919921 ngroups is ext4_group_t (unsigned int) while next_linear_group treat it in int. If ngroups is bigger than max number described by int, it will be treat as a negative number. Then "return group + 1 >= ngroups ? 0 : group + 1;" may keep returning 0. Switch int to ext4_group_t in next_linear_group to fix the overflow. Fixes: 196e402adf2e ("ext4: improve cr 0 / cr 1 group scanning") Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 556b7cd27f76..a6635cba291a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1080,8 +1080,9 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac) * Return next linear group for allocation. If linear traversal should not be * performed, this function just returns the same group */ -static int -next_linear_group(struct ext4_allocation_context *ac, int group, int ngroups) +static ext4_group_t +next_linear_group(struct ext4_allocation_context *ac, ext4_group_t group, + ext4_group_t ngroups) { if (!should_optimize_scan(ac)) goto inc_and_return; From patchwork Tue Aug 1 14:31: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: 129040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2486755vqg; Mon, 31 Jul 2023 23:55:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlEkj4ccU6NyY79KLPcy2MxeKttYyzYiCFtfMKyNBdUGYPqPhhfAYNHwz4Gt5JpvBp19TYnW X-Received: by 2002:a05:6a00:1a4a:b0:668:7292:b2c4 with SMTP id h10-20020a056a001a4a00b006687292b2c4mr12743597pfv.4.1690872939422; Mon, 31 Jul 2023 23:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872939; cv=none; d=google.com; s=arc-20160816; b=DZAi/7kFTU/DadtDKWD8+qgXoWTp/8JKm3AI0oaQ42AvKmmThLhLRIyG4LcaygLK7y yPzQI/u1USKek4qnnRINA/Zv8tLUjJ9dynOfQ42Rz9qOYb+VOpSEF4QaGGYWihrlBu8E VNRrsLtpPvLgGMDl+JgcBFEWdDE5Yv9gtWb++F7wxu4q8rJgkhlNhGnjBFesq/bV1qb3 7yzhpxc/1jrAPdeG/cQK252MJpLKd8Z2HOccyrxQ2KqOekXRPuFXLl3d8MIcnFptFd9t pdxg2GU21xqQXJSQ2VLOH1tH/tgXzjAeAaj+9vfVaksn5GrPHz/J2rXHJ1NwfLqjZ1Ya CyGg== 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=ZUlVotK3S3yS9vNA7ZrPJH6CyJfGwF4jTJNDp5v4h0k=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=0kZwnMmbY7ocTTReMHSODXT0gHTrud2xUOxIIaAx2dlX+IicVep8HTu61KFyd0Pqws t/7mVrig1F8Xo/IdcMt6GFKzY7ehMeTTBTtRWH/aPZfxFYIdpGzLhzj3rQvfsc18T1N5 GBASSlDaEMZ1Jq22w3mD2S4GlD/4OuqA5vxxlbURo6bvSAteZaxyMailA0vV+GVBJYBl 8mAt4IUvDvWBzFRg6vuLTxl3XB8Fs8g7jdgwZNL1SaeF33J4cJJwTVoPHGbjiBwd1vCu ueYhJhIO4lSsXX+8mRq34KGT7jigDmnRLKLlwCeRylD+xCJzFcQ8htKqpkCKX3zga8+v 0krw== 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 k28-20020a637b5c000000b005633b3c6d44si30251pgn.655.2023.07.31.23.55.26; Mon, 31 Jul 2023 23:55:39 -0700 (PDT) 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 S231626AbjHAGcA (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231378AbjHAGbx (ORCPT ); Tue, 1 Aug 2023 02:31:53 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 829B0133; Mon, 31 Jul 2023 23:31:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHm0qBMz4f3l8s; Tue, 1 Aug 2023 14:31:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S5; Tue, 01 Aug 2023 14:31:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 03/10] ext4: return found group directly in ext4_mb_choose_next_group_p2_aligned Date: Tue, 1 Aug 2023 22:31:57 +0800 Message-Id: <20230801143204.2284343-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S5 X-Coremail-Antispam: 1UD129KBjvJXoW7CFW8CFyktw4UKr45XF1rXrb_yoW8KrWrpa nxXF10kFWfWw15Ww4UGayqq3Wvgw48KayUJryxX3WrX343AryvyanrtFy8ZF9rCFZ7CFn5 W3Z0v3y5Cryxua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiyCJDUUUUU= = 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773008782957567354 X-GMAIL-MSGID: 1773008782957567354 Return good group when it's found in loop to remove unnecessary NULL initialization of grp and futher check if good group is found after loop. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index a6635cba291a..4cbbe930e010 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -874,7 +874,7 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups) { struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); - struct ext4_group_info *iter, *grp; + struct ext4_group_info *iter; int i; if (ac->ac_status == AC_STATUS_FOUND) @@ -883,7 +883,6 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context if (unlikely(sbi->s_mb_stats && ac->ac_flags & EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED)) atomic_inc(&sbi->s_bal_p2_aligned_bad_suggestions); - grp = NULL; for (i = ac->ac_2order; i < MB_NUM_ORDERS(ac->ac_sb); i++) { if (list_empty(&sbi->s_mb_largest_free_orders[i])) continue; @@ -892,28 +891,22 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context read_unlock(&sbi->s_mb_largest_free_orders_locks[i]); continue; } - grp = NULL; list_for_each_entry(iter, &sbi->s_mb_largest_free_orders[i], bb_largest_free_order_node) { if (sbi->s_mb_stats) atomic64_inc(&sbi->s_bal_cX_groups_considered[CR_POWER2_ALIGNED]); if (likely(ext4_mb_good_group(ac, iter->bb_group, CR_POWER2_ALIGNED))) { - grp = iter; - break; + *group = iter->bb_group; + ac->ac_flags |= EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED; + read_unlock(&sbi->s_mb_largest_free_orders_locks[i]); + return; } } read_unlock(&sbi->s_mb_largest_free_orders_locks[i]); - if (grp) - break; } - if (!grp) { - /* Increment cr and search again */ - *new_cr = CR_GOAL_LEN_FAST; - } else { - *group = grp->bb_group; - ac->ac_flags |= EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED; - } + /* Increment cr and search again if no group is found */ + *new_cr = CR_GOAL_LEN_FAST; } /* From patchwork Tue Aug 1 14:31: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: 129037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2485700vqg; Mon, 31 Jul 2023 23:52:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlHGkyvkqt9+5Ezt3YhP1Sp/cjwroaM8ZiSGM9QyIMLvV6xDrIc42s/+aP/peVibNLGcEeOp X-Received: by 2002:a05:6a00:2316:b0:687:535f:6712 with SMTP id h22-20020a056a00231600b00687535f6712mr1105354pfh.14.1690872759868; Mon, 31 Jul 2023 23:52:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872759; cv=none; d=google.com; s=arc-20160816; b=0ZVRSe4TXE8wW/sAC2ikUNByrZpDFjtbdMBKd1QISKTRrJfT0VqKSlZzxvzbIXxBVr yoon15+TmbGiMaPG3sLcX4N5Sj8YSvchUwdUmdDv1wOkobfIRrG5s5ngTq6KnbzPuMTv W5D10KahMZYTQufelCK41i2qBsthZ89Ru0hDBJqFWrtI2/CdtDqWsNtPxl7JE38PG0ft zSUrECMfsNNcB3MqCBjqnUAZIuVItA+NTpK174JZVIHt+fkoT8PQYh16lqcF6VGD5hnw Y9lftQYYXH2J5UsOD99+JMzlsCOExlR6o6lx+FY8U9f4iyhKUhuajoMvBvGO8Cf5em67 h4KA== 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=4zfd6w8YDuBol5fU+o8MqqyciyXmW31rc0yklHeeYgA=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=hIN0/vJwMlxvrTrvKJJh7sJPmum20zaxltaFkS5E1luantM1k/iMAGru+1CyDn7Gh3 Q8nE2om0WEoB8DdN4tdLbWkjdmrlqGrnmMF9WOFjyc5czW6TSzf+rlAwHQZDLdzgDb3U /7eL3VMX+ys+FLDBHypjGRpfgLJEP2DatI0LFa4iAOpkAiJShkK5tK9UzZ6EMGzJeRhh hgPEN06kl42hqC1whTTu8bVD19lzr44uw64ZjOoh4YL2TEGinf2hJkBbGbZRvJHVFeZN OPa/8RX/72wRIuiaHQLW3J5qkiCvahogmdfWSBI96YrQSn48Ox/8mApRdx/qI8BEfTPz DrFw== 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 s76-20020a63774f000000b0056419b1dc2bsi6740714pgc.276.2023.07.31.23.52.26; Mon, 31 Jul 2023 23:52:39 -0700 (PDT) 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 S231720AbjHAGcI (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231383AbjHAGbx (ORCPT ); Tue, 1 Aug 2023 02:31:53 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B1AB1BB; Mon, 31 Jul 2023 23:31:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHl6tWSz4f3jM3; Tue, 1 Aug 2023 14:31:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S6; Tue, 01 Aug 2023 14:31:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 04/10] ext4: use is_power_of_2 helper in ext4_mb_regular_allocator Date: Tue, 1 Aug 2023 22:31:58 +0800 Message-Id: <20230801143204.2284343-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S6 X-Coremail-Antispam: 1UD129KBjvdXoW7GF1rJr1UurW8Jw1xGw47XFb_yoWfXFX_Ga 4jkr4xJFWfJr1Ik3ZYyayktr90qFs5AF45XFs3JrsxXF1UuFZ7Kw1qyrs3Zr48WrW7Ar9x W3ZxGFy0yasa9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2 IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4U McvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I64 8v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AK xVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrx kI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v2 6r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJw CI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOwUUUU U 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773008595473598174 X-GMAIL-MSGID: 1773008595473598174 Use intuitive is_power_of_2 helper in ext4_mb_regular_allocator. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4cbbe930e010..acf8e3183e47 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2799,10 +2799,7 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) * requests upto maximum buddy size we have constructed. */ if (i >= sbi->s_mb_order2_reqs && i <= MB_NUM_ORDERS(sb)) { - /* - * This should tell if fe_len is exactly power of 2 - */ - if ((ac->ac_g_ex.fe_len & (~(1 << (i - 1)))) == 0) + if (is_power_of_2(ac->ac_g_ex.fe_len)) ac->ac_2order = array_index_nospec(i - 1, MB_NUM_ORDERS(sb)); } From patchwork Tue Aug 1 14:31: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: 129035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2485028vqg; Mon, 31 Jul 2023 23:50:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGBtZRa30LJgyqgd4QQ+B4sM//l+Zy4XS6pLE7cH4MaF7Pto5R3B/g4gxHBXY1gpJpWJ9Tr X-Received: by 2002:a17:906:112:b0:993:fba5:cdef with SMTP id 18-20020a170906011200b00993fba5cdefmr1719918eje.8.1690872649317; Mon, 31 Jul 2023 23:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872649; cv=none; d=google.com; s=arc-20160816; b=d/To3nGD5p7HnRg7GkOOOr0j6VxREi1ZNeiLloJcn/Kfa790t9lVr4RvO6wplF8Nux +SMbR5e2VS0HBt61D5kjj5xZ04SpP164x7ATVpK0zrFr9zxwO/+/i+im8ULzgKlMco09 hPvqEv9Ce6vrmza4nC7afd1EdGQMEuDqQEL52LWqihFpHwPj03B+k9rOmkGEOULkV07d YBUMK+Rg27Jndo1nPLCd/SxtUQ2f6swcmy3vMHVE3z6tYpRgNUKdFRlfCXeU6noZxcVX WNxzaeN81wqfL4GWiZ2d4HRO8vv4RfW7Uq+cp83qpKJfuCRIVwc9xt/KVWGWEFg0xcEP 42zA== 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=HsC26rLgi482PZL4DwD6ToUxyY6I9OcgDF4VCz9r7O4=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=OfPkHNGDfCwBZKb1qNzabfYwPuYmfP2Qc/WQhiBU0nZVOGQVVay2b67qdCrKX6xuyO GCx54h22zeakjgVkw6MhI46BErgHfb5sy0DFF0krLYiXdH9Sj9b8XTzA5eTsATzftPHe LY1dWzdvTdIaT3seHmryhwZ/BuE9a+oxDuMLR91w9rvGv7/KAREUfZV5eJf5FnsFRMGr kHmu2DRsw9THNkPKfUDFVMC/blaSMVu/GRB9pD38JjWbSyxQQ9YIUIuQ6/eH8+7Tje3/ /ahZVYB+0ZoHBxSujxNEYqN9G35A8mIQ1eMGT9WRC7PBa3iET3WTaTO4N5VPEscjwFhq wxBA== 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 a17-20020a1709062b1100b00991f1e4b044si7989483ejg.336.2023.07.31.23.50.25; Mon, 31 Jul 2023 23:50:49 -0700 (PDT) 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 S231627AbjHAGcD (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231404AbjHAGbx (ORCPT ); Tue, 1 Aug 2023 02:31:53 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F23F1AD; Mon, 31 Jul 2023 23:31:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RFQHk4P2Fz4f3lY3; Tue, 1 Aug 2023 14:31:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S7; Tue, 01 Aug 2023 14:31:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 05/10] ext4: remove unnecessary return for void function Date: Tue, 1 Aug 2023 22:31:59 +0800 Message-Id: <20230801143204.2284343-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S7 X-Coremail-Antispam: 1UD129KBjvJXoW7KF17ZFWrJrW8XF4kCw47XFb_yoW8WFW7pr 13JF18uFs5XF1Uua12gws8Gw1ayw1xWF1DJrWIgwnY9rZxJrZakFWDtF10gFyrtrZ5u3Z0 vr4qvF4UCa1fu37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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: INBOX X-GMAIL-THRID: 1773008479497596229 X-GMAIL-MSGID: 1773008479497596229 The return at end of void function is unnecessary, just remove it. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index acf8e3183e47..2f26a91595ca 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4876,7 +4876,6 @@ static void ext4_mb_generate_from_freelist(struct super_block *sb, void *bitmap, mb_set_bits(bitmap, entry->efd_start_cluster, entry->efd_count); n = rb_next(n); } - return; } /* @@ -5630,12 +5629,10 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac) #else static inline void ext4_mb_show_pa(struct super_block *sb) { - return; } static inline void ext4_mb_show_ac(struct ext4_allocation_context *ac) { ext4_mb_show_pa(ac->ac_sb); - return; } #endif @@ -5876,12 +5873,9 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) spin_unlock(&lg->lg_prealloc_lock); /* Now trim the list to be not more than 8 elements */ - if (lg_prealloc_count > 8) { + if (lg_prealloc_count > 8) ext4_mb_discard_lg_preallocations(sb, lg, order, lg_prealloc_count); - return; - } - return ; } /* @@ -6535,7 +6529,6 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, error_return: brelse(bitmap_bh); ext4_std_error(sb, err); - return; } /** @@ -6638,7 +6631,6 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, } ext4_mb_clear_bb(handle, inode, block, count, flags); - return; } /** From patchwork Tue Aug 1 14:32: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: 129016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2481263vqg; Mon, 31 Jul 2023 23:40:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5MUvVG49nA1QBCwGMLNR+OVq2Ixll4JsaNeAuxNmd01q8TY1XNcLEahuD6xFQ03n6L/qI X-Received: by 2002:a17:902:d503:b0:1bb:83ec:832 with SMTP id b3-20020a170902d50300b001bb83ec0832mr11127023plg.2.1690872027510; Mon, 31 Jul 2023 23:40:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872027; cv=none; d=google.com; s=arc-20160816; b=fg6FPBl8UNdETa29tfwq0RyqyLdtC2+sAQVDgei4GaI0CP4rfBkVitZKO7nhlchyEX E8EcNCaS1VsRcdD33Pk/wZzjjk06DeIeA0jEdS8EwbsnPW21T/BqX48YTGn7UqVIbvAl 9q/6BNdt6eQAdZkXuptX7bPp95KDG/pHr5EIgeP+obK6NE8j8GaYXbS+z+UR4GSNWwOx zD/eITannQtbYuK8Zuypm0h1Bz5g29R4orjbcz3iqrg9ecyOtHHHf11+xlPYkAv4oFoi ImvclI6BcSvfxJXgHcXZdKZy4c9+nUQ1CPdpIukeXGk2az305J8QK+BpMP0G8Ax0fpJ0 ZQFQ== 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=ZWoZWujJTwLKo+SYHkrR2lJ7nxZpWsMw4EmpsACBO8I=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=vaqjAvrYa4NP9MZBWNiAiDiBmCZ6CExvvv2KXKvAzS/uhr20RbjhmBSIUkh4z/Hy9u H/ko9/bAvIc//t3TChnhTWtvFrBZUV2GhjP/wM1VWj1xJJr2E6MhqUGOnR1CtraLnbpQ +9HAOmDZqDWIHhlquLQGTOJKje09REiajV4gnJVBci1dLA/yL6dX6RoAY1ndI5gm53IL QJU1Fy/byAKP+3ANMCzNpWLtN/FT9zNedm8N5xKHVDN12bvg6BmtU+T4hyGAaVktq9pI HhTFAhKWR1LrPIKLehz2bY6xsepyRNU7k4YuaSexuU2fhDXH2zvA8/6TM8uXxTcULF8I PvEQ== 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 le15-20020a170902fb0f00b001bbc63065dfsi8403815plb.568.2023.07.31.23.40.14; Mon, 31 Jul 2023 23:40:27 -0700 (PDT) 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 S230362AbjHAGcV (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbjHAGbx (ORCPT ); Tue, 1 Aug 2023 02:31:53 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A99E48; Mon, 31 Jul 2023 23:31:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RFQHk6zKpz4f3lY5; Tue, 1 Aug 2023 14:31:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S8; Tue, 01 Aug 2023 14:31:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 06/10] ext4: replace the traditional ternary conditional operator with with max()/min() Date: Tue, 1 Aug 2023 22:32:00 +0800 Message-Id: <20230801143204.2284343-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S8 X-Coremail-Antispam: 1UD129KBjvdXoW7GF45XryxZrW8uFW8JF4kXrb_yoWDtrb_Ga 4UAr18Gry3GrWFkry0qrsYvr48uan5try5WrWUtFW8XFyjq3yFvw1DZr43CF4xuFWjyrsF ywn3uFn7GF1IgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2 IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4U McvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I64 8v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AK xVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrx kI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v2 6r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJw CI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOwUUUU U X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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: INBOX X-GMAIL-THRID: 1773007827001929463 X-GMAIL-MSGID: 1773007827001929463 Replace the traditional ternary conditional operator with with max()/min() Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- 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 2f26a91595ca..35b7a0ba25a3 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6820,8 +6820,7 @@ __releases(ext4_group_lock_ptr(sb, e4b->bd_group)) void *bitmap; bitmap = e4b->bd_bitmap; - start = (e4b->bd_info->bb_first_free > start) ? - e4b->bd_info->bb_first_free : start; + start = max(e4b->bd_info->bb_first_free, start); count = 0; free_count = 0; @@ -7038,8 +7037,7 @@ ext4_mballoc_query_range( ext4_lock_group(sb, group); - start = (e4b.bd_info->bb_first_free > start) ? - e4b.bd_info->bb_first_free : start; + start = max(e4b.bd_info->bb_first_free, start); if (end >= EXT4_CLUSTERS_PER_GROUP(sb)) end = EXT4_CLUSTERS_PER_GROUP(sb) - 1; From patchwork Tue Aug 1 14:32: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: 129023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2482705vqg; Mon, 31 Jul 2023 23:44:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlFWs8iTwnrPrrF1ensx9ylZwXpF1/i1xAR3gOv8VIoxZqnegQ8xASFckzCOqIoLjS1jKwko X-Received: by 2002:a05:6a20:8f06:b0:13e:7a0a:36d8 with SMTP id b6-20020a056a208f0600b0013e7a0a36d8mr1312559pzk.9.1690872271470; Mon, 31 Jul 2023 23:44:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872271; cv=none; d=google.com; s=arc-20160816; b=SQijfN1Gqzr4cULx0525ftjmnLmLAsi4UvM7j+m4WcQM9MfZ1QywhvPqtncTJj2CvR zo5o8v6z1cP96J1wCwH4vy9ejKpbJSYpsOYZYCAmnCisFUBDBkyBUlATiwR0hOCgB3/K UYMsBaewk4glN2WNjy/bsFD0mRNEiMeKaujkXZXoFy9YntHVtuWs6JZAcyrAK8aUCdce l3QXiFL2wYTZHTReF5g1pRcLY5lvzcWyoqocaizP+Wu5yfrVdbqdKNPEvqVdiLPorS86 7q5Xz7Egqi2p9RZULORZ3DNtQwxNK62OVvScOsqgLoPR+bb6wSDNxjrf0ogd8TALqwsK NOJA== 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=YOpl2IFhcEGA84g7ZcfocNFhak5AjtAk1Xh/29xyqN0=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=i/seTcA0799/Ec3R8nWo9bR2DA1IFIH+5JKtKumPaUOTNkiRdPtTXzFP0byMoPPQws wUkaSEWu/97T5LsRnXFNV4l2ROFUgjLY9KzIYlPSotpznnuQc19RfK7/FS75RuUFxpHM ec3LV9p3SDqOpseIolAyHbutGp1FgdGbeOIioIiWv4U5bRdNaXnkw2bsD/MW/a/v7JYt IOTVJIwdpH1l2+iUCsjTzHaojLoh7YVbvdSr0WGpyK1B7VfweVDde4AOfJsse3JjXRUr 8FWdqDY0zTfCac8/AzIhkyMS5jS06jOcur9rY6CFRwlDNkzFAzWE6QgU1xVfvouitkPO aNHQ== 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 f16-20020a056a00239000b00681fb4b7019si8825206pfc.220.2023.07.31.23.44.16; Mon, 31 Jul 2023 23:44:31 -0700 (PDT) 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 S231731AbjHAGcY (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231474AbjHAGby (ORCPT ); Tue, 1 Aug 2023 02:31:54 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33F1AE7; Mon, 31 Jul 2023 23:31:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RFQHl2ZN1z4f3lw2; Tue, 1 Aug 2023 14:31:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S9; Tue, 01 Aug 2023 14:31:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 07/10] ext4: remove unused ext4_{set}/{clear}_bit_atomic Date: Tue, 1 Aug 2023 22:32:01 +0800 Message-Id: <20230801143204.2284343-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S9 X-Coremail-Antispam: 1UD129KBjvdXoWruFyUXr1kGF45Wr4xXFy8AFb_yoWfuFX_J3 4IvF4kGryYk3Z7KFs5u3WkJF1ktrnxtr18uFyrJr1ruFyaqan8Ar4kAryjvw1rWr4UXFy0 yrn7tr1YqFykXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2 IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4U McvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I64 8v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AK xVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrx kI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v2 6F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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: INBOX X-GMAIL-THRID: 1773008082950552652 X-GMAIL-MSGID: 1773008082950552652 Remove ext4_set_bit_atomic and ext4_clear_bit_atomic which are defined but not used. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/ext4.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index ea87850c1bb6..a9b1eeb6bf09 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1249,10 +1249,8 @@ struct ext4_inode_info { #define ext4_test_and_set_bit __test_and_set_bit_le #define ext4_set_bit __set_bit_le -#define ext4_set_bit_atomic ext2_set_bit_atomic #define ext4_test_and_clear_bit __test_and_clear_bit_le #define ext4_clear_bit __clear_bit_le -#define ext4_clear_bit_atomic ext2_clear_bit_atomic #define ext4_test_bit test_bit_le #define ext4_find_next_zero_bit find_next_zero_bit_le #define ext4_find_next_bit find_next_bit_le From patchwork Tue Aug 1 14:32: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: 129027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2483663vqg; Mon, 31 Jul 2023 23:47:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlEa7ETQDZ5YCXrZUpV5iLRMll8+LGsJznOFewxta3KhAviwbTnXb9sGI/8GYD57neLBEBRc X-Received: by 2002:a17:903:2301:b0:1bb:9f07:5e0 with SMTP id d1-20020a170903230100b001bb9f0705e0mr13430918plh.60.1690872420488; Mon, 31 Jul 2023 23:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872420; cv=none; d=google.com; s=arc-20160816; b=JsB3DqzNTnpVPHcePXQSap8bafd3pyHz2BhWfdQsGVz9uNOwyjs+cbRJd1QLgCcxxz Nuvmk+VocmTTFoa5RT83SDlsiKaAfR17qtjqweHwxevISAgwULZ5BqJ5659dX5fQFwfy pUujqQYOhhMReLzP/OvhQ1mmNvmYNGOxe2mrzGP1NObapkVNjkij96nDMs+PoJ5hHkJE WV7Orz0v7QTsFYx7runQ7CKWyTqmxhwiSbegc+iswLx0AVxA9WBcGFjjr0kuSTRzeb4c MTNj9gj8dDgzj0wz4XtrXM+BNJ3AA2n/mexDLhtNI6bCDvDR56KL90d2NcCJk/+nlOSr Z4oQ== 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=4TyZipRKFuLrunU29wcodWazWx5eTViSoMVXB2q6kwI=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=x+dsnDcP3tPAFcft9zBK4pPjmCgDIn60P4jbJ+Ckq8mTIkKxy1hL35quYAm7GgF4kf O8I74sw1YRy6U+qtXrnYx5DnmBgJ4KLklrL7N75ZGuDHZiiNBxdWxxTLSBoheNNIRCbr 6fTKFNOqmSsQj/+KlJtl6jhVbowlOzuXMzB9ySzL2KdNMlgzDDjKELF93gPhfiEdAV77 cBnZoaBADJ2V5M9jh61N8j9LemWi7Bgsy5H3DWdcr0yi/mHfMvLHAtfnM8rrYHCC1DZN KWo8XRYoYMwRN8JvkTfNXzBgUYKtl8LTts3muplFi5upkLGjDOk3sbF+CwXlbIeWUbQD J48g== 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 q4-20020a170902f34400b001bbc138af15si8256371ple.157.2023.07.31.23.46.47; Mon, 31 Jul 2023 23:47:00 -0700 (PDT) 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 S231800AbjHAGcd (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbjHAGbz (ORCPT ); Tue, 1 Aug 2023 02:31:55 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 975C3DB; Mon, 31 Jul 2023 23:31:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHn3B1Jz4f4YQZ; Tue, 1 Aug 2023 14:31:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S10; Tue, 01 Aug 2023 14:31:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 08/10] ext4: return found group directly in ext4_mb_choose_next_group_goal_fast Date: Tue, 1 Aug 2023 22:32:02 +0800 Message-Id: <20230801143204.2284343-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S10 X-Coremail-Antispam: 1UD129KBjvdXoWrZFykAr45Wry5CFWxAFy5Arb_yoWDKrb_Ga 47AFsayFWfAw18G3WF9wsYyr48KFWkAr4DXry3tr4Yq3WUuaykK3Wq9r45Aa18ua10yrWf Ka9IvFWxKF4SvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2 IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4U McvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I64 8v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AK xVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrx kI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v2 6F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr 1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773008239363059032 X-GMAIL-MSGID: 1773008239363059032 Return good group when it's found in loop to remove futher check if good group is found after loop. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 35b7a0ba25a3..e9e37ffe5c10 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -959,16 +959,14 @@ static void ext4_mb_choose_next_group_goal_fast(struct ext4_allocation_context * for (i = mb_avg_fragment_size_order(ac->ac_sb, ac->ac_g_ex.fe_len); i < MB_NUM_ORDERS(ac->ac_sb); i++) { grp = ext4_mb_find_good_group_avg_frag_lists(ac, i); - if (grp) - break; + if (grp) { + *group = grp->bb_group; + ac->ac_flags |= EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED; + return; + } } - if (grp) { - *group = grp->bb_group; - ac->ac_flags |= EXT4_MB_CR_GOAL_LEN_FAST_OPTIMIZED; - } else { - *new_cr = CR_BEST_AVAIL_LEN; - } + *new_cr = CR_BEST_AVAIL_LEN; } /* From patchwork Tue Aug 1 14:32: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: 129039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2486040vqg; Mon, 31 Jul 2023 23:53:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFqC/rjEfpId3BrDTTA7V68EHzfpaHWzTbUoLbPwNKgFy5Ltv1lVp/iEZwIo+MzvucjRcn4 X-Received: by 2002:a17:906:8a70:b0:982:1936:ad27 with SMTP id hy16-20020a1709068a7000b009821936ad27mr1610119ejc.11.1690872816365; Mon, 31 Jul 2023 23:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872816; cv=none; d=google.com; s=arc-20160816; b=FnfwhLC2FMmxRnjtcVdNdRAgmwj/3sCOsoQFwNkU3xEyQ5hmWLf+BxbRkOwNB8mcuM TRJgtIez5byqWpbmPWAA5UIsqDbczI1SPcFyeqNewqOfrixTUzE/upqNFw0/YJwSgqoM XGQmXQEkrV9OyIuau4JOBLSow5WbOXGMDdZSHhgFTYU/KDiB7DTMNSN7ae7adc2XyWet 6mW738WAP0Jbk9uh5DEru+P5N8HgKqWUnWMiLNENDW6p5inBwOSZrx+rNc8TkXZAVlWX /ssq8Ebd02K7auDMOMWK+MEa5s26PxMGcUz0Yn/pY/wLsb/hhLrkV9TZ34xb5uSgQMGM in4g== 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=i1X/txTABoQKj6fWYPhF8APANIYmLCU35q/1bqHIjvA=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=AM+sNxNBx1tJdvEiFliwfCTeztuYeMCLXUsuKecqIXSDxy3/Vd8DPkCDRiNvdIpQku OHzTQ8igRX7h67TTsNtCsPciC6fn0yTaCGWKsKCPhIA4lbWqYbzhSOyVeH0wB798/YEJ PciyBtd+N0oygEJOhl1Z2Zf+CyJ9D0zfuwngOh3CNzPghdQfL1N/Z28TT9S7LCI/Roum KRaa6CCLWtrInFRbFz43NrVOXn2bUycJqQOA7CJgntReJrJ/vJ8LU3HwRYQeUbKgc2Cw JxYYTecXGSh2TyEzSXzc2VfrYb8PnR+0l5QwKbV091tV+SusoreGQGCKrZp741cixPq8 71LQ== 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 e8-20020a1709067e0800b0098dfa5abc0bsi8267977ejr.88.2023.07.31.23.53.13; Mon, 31 Jul 2023 23:53:36 -0700 (PDT) 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 S231769AbjHAGc1 (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231477AbjHAGby (ORCPT ); Tue, 1 Aug 2023 02:31:54 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83E38E5F; Mon, 31 Jul 2023 23:31:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHn5xJCz4f3nTs; Tue, 1 Aug 2023 14:31:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S11; Tue, 01 Aug 2023 14:31:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 09/10] ext4: return found group directly in ext4_mb_choose_next_group_best_avail Date: Tue, 1 Aug 2023 22:32:03 +0800 Message-Id: <20230801143204.2284343-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S11 X-Coremail-Antispam: 1UD129KBjvJXoW7ArWUJry3GryUJFW7CFyxGrg_yoW8Gry3pw n3WF1xuF1xW3W5JFsrGaykWa18Kw4fKFy8tryrZw1rXFy3JFWkGanrta40vF93CrZrCF15 Zw40yr1Sk3Zru3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773008654494364209 X-GMAIL-MSGID: 1773008654494364209 Return good group when it's found in loop to remove futher check if good group is found after loop. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index e9e37ffe5c10..bfaab173a3f4 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1042,18 +1042,16 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context ac->ac_g_ex.fe_len); grp = ext4_mb_find_good_group_avg_frag_lists(ac, frag_order); - if (grp) - break; + if (grp) { + *group = grp->bb_group; + ac->ac_flags |= EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED; + return; + } } - if (grp) { - *group = grp->bb_group; - ac->ac_flags |= EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED; - } else { - /* Reset goal length to original goal length before falling into CR_GOAL_LEN_SLOW */ - ac->ac_g_ex.fe_len = ac->ac_orig_goal_len; - *new_cr = CR_GOAL_LEN_SLOW; - } + /* Reset goal length to original goal length before falling into CR_GOAL_LEN_SLOW */ + ac->ac_g_ex.fe_len = ac->ac_orig_goal_len; + *new_cr = CR_GOAL_LEN_SLOW; } static inline int should_optimize_scan(struct ext4_allocation_context *ac) From patchwork Tue Aug 1 14:32: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: 129015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2481220vqg; Mon, 31 Jul 2023 23:40:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlHKg1pA+JNCU4UJlHAsgu8L4fAjHX9Q99M1fm3/ZOgSTraqQmN8CTX7ExZnMgUu5zadRQFJ X-Received: by 2002:a05:6a00:1304:b0:682:3186:55e0 with SMTP id j4-20020a056a00130400b00682318655e0mr10913437pfu.12.1690872023514; Mon, 31 Jul 2023 23:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690872023; cv=none; d=google.com; s=arc-20160816; b=FaO8/MX1yyEIW+HdeXESRyHvvrqEpE1XjL9nbSzognuriDNTk383Ywqr3I94w7fisp g2pnEIGzTIv3FW0I3GvkhhOZ9fO5ToLZwb0O7w9yVE4nHa4rKGJ/2+kDrsJa1O0+fCqR RlziKw+p73guJvTZJvl4nw2sqGUbIncMTszMzfupfY/dfwq2EnlC/qf9o9pNthYpB0md 4foYCb4vdr700dJz4cnPjEokWk+YqTwc43offcyd9uQ1NGz0LPfQRNY9hCkSyCnbi5s3 nuQRRhUYHOzFJSzwTYhDb68iRjcJ7HTvknlxrvhH9pS5Tmp6LLr0/EcY13zPaEz9kzr0 QLTA== 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=tpaHwQY83vYOzlmovxROlP+8b6IYsKALppd2NSSihcs=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=jm/neHzRqDPH8eoqpQbS2qOXYB63ghx044pdRUHvRtqFt67//meBkIM2XYUEUtkZ9u QlzI5lnQUoR7uOrV1lcV6uFA9T5S4OWGl7guBL1X28N96/z1ZRp+ACaQdoEqoPDNsp0E BF9JkfwE/0+Fb8DUXLh1J0LoVunCcDNo8xi+/y7cyRoLIzDMXN/TJUYuszTNUwxcgddV 4jU+nhfOIFfbGYDsPZOj/1uPU2yObr76xkx8SPmaHYvHm0XOpB/X5RB0ZlO8trLEyucC 5pQLdrN+mc0/1QOUkKpFiXvqFh3u8qJc3MAoBEXqcxnDZRTHDQTtbtNtrykZk4ega6l0 Ah6Q== 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 x63-20020a638642000000b005636ef310adsi8180573pgd.597.2023.07.31.23.40.10; Mon, 31 Jul 2023 23:40:23 -0700 (PDT) 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 S231786AbjHAGca (ORCPT + 99 others); Tue, 1 Aug 2023 02:32:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbjHAGbz (ORCPT ); Tue, 1 Aug 2023 02:31:55 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D95B114; Mon, 31 Jul 2023 23:31:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFQHp5Ds2z4f3m7p; Tue, 1 Aug 2023 14:31:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrQpshkMcvqPA--.21719S12; Tue, 01 Aug 2023 14:31:51 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ritesh.list@gmail.com, ojaswin@linux.ibm.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH v3 10/10] ext4: correct some stale comment of criteria Date: Tue, 1 Aug 2023 22:32:04 +0800 Message-Id: <20230801143204.2284343-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230801143204.2284343-1-shikemeng@huaweicloud.com> References: <20230801143204.2284343-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrQpshkMcvqPA--.21719S12 X-Coremail-Antispam: 1UD129KBjvJXoWrury8Xr1rGrW5tF1DXr15XFb_yoW8JF17pr 1aka4xGF1fXr15ua1Du3WkWw4DGa1fWFyUur9Yvr4FvFy7JFyfuFWDt3Z5ZFy8Zrs3X3WY yrZ8ZFWUGa1Uu37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw 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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773007822804590426 X-GMAIL-MSGID: 1773007822804590426 We named criteria with CR_XXX, correct stale comment to criteria with raw number. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- 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 bfaab173a3f4..1e8ce0ece47a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2782,8 +2782,8 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) /* * ac->ac_2order is set only if the fe_len is a power of 2 - * if ac->ac_2order is set we also set criteria to 0 so that we - * try exact allocation using buddy. + * if ac->ac_2order is set we also set criteria to CR_POWER2_ALIGNED + * so that we try exact allocation using buddy. */ i = fls(ac->ac_g_ex.fe_len); ac->ac_2order = 0; @@ -2840,8 +2840,8 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) /* * Batch reads of the block allocation bitmaps * to get multiple READs in flight; limit - * prefetching at cr=0/1, otherwise mballoc can - * spend a lot of time loading imperfect groups + * prefetching at inexpensive CR, otherwise mballoc + * can spend a lot of time loading imperfect groups */ if ((prefetch_grp == group) && (ext4_mb_cr_expensive(cr) ||