From patchwork Tue Jul 25 18:50: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: 125560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2412132vqg; Tue, 25 Jul 2023 04:54:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlFwJtBV+K3s4ZunbOWPwxLIXTODpdMB2VOrphMfuum1kPdfDnJizXTNDA83LzMqJGczEctm X-Received: by 2002:a17:907:2cc9:b0:99b:415f:2e4f with SMTP id hg9-20020a1709072cc900b0099b415f2e4fmr12765476ejc.57.1690286062465; Tue, 25 Jul 2023 04:54:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690286062; cv=none; d=google.com; s=arc-20160816; b=JGNiEEk2B8FHoIxGYp+u4WuhB2OSGCLkrVcmpGljc63uMuyYIfFSMVmbUAfvTvwXnn rlizv2DqUbWAIl117CB9jTB4P1jnusx+Cm8YgIECpSo64qKG3oMZC7kEZJlA+Q3jpIdO t7ovia4Wc/l7cRxfvLSkBg7CwsNmaOTnirb632k/2FXHk5X6G+PuRFUfJtNPIyRHGpGg dmKxpiyLdI2ThY3KiJbvKHjV/zwybb4WfFb3Vz4ouBtj59ju4VW+tSeGIiXCV+mEPkLL BaeXCFftNueCr4Kv4ZJeVwrqAMcbj9SY6A5KkpDG2NcytimYGFelV2ekFScNiM84tpY4 LOgw== 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=Es6z/R6ul/+apTi6bSNtyEIICMgGSyS+J4p1vOv8wac=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=SKb06azYSwm5LAjoMZZNHXZ2EQ6lhIyxwpOiVKCeruu7JIV6bUdxXpTSBZWoW8EwFL Gq45RvL4ADsQGgbonM5aAJewwckRYF7QMwRu/8ryNTPj20DfIcaJjfgqF3VbKSZEd8GM by9gb55d8CeE7dkv8TK8iaC/XbMwDPOxw72rqQpNqrqHDf2/xIGtVyJvOYhWvbpSWFQ7 +c6ElQALhKGeZCm9uNj4CWX43U7HexHACRu31gRjSiSkO1pB+DGLbBTa8upveKIWZbYH LBp0xYHl+OELdp1j2ikQU+bzh9CUh624QgfLedWmFBY4MOlt2MqRaC9f8YjHCdvxSxPd sAVQ== 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 o19-20020a1709062e9300b00993470682e9si7593848eji.739.2023.07.25.04.53.58; Tue, 25 Jul 2023 04:54:22 -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 S232908AbjGYKvg (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233784AbjGYKvJ (ORCPT ); Tue, 25 Jul 2023 06:51:09 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C43751FDB; Tue, 25 Jul 2023 03:50:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMg32S7z4f3pJ4; Tue, 25 Jul 2023 18:50:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S3; Tue, 25 Jul 2023 18:50:40 +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 v2 01/10] ext4: correct grp validation in ext4_mb_good_group Date: Wed, 26 Jul 2023 02:50:57 +0800 Message-Id: <20230725185106.2147273-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S3 X-Coremail-Antispam: 1UD129KBjvdXoW7XF13WFy3tr1xZr48Zr17Awb_yoW3tFX_Ga yDArs7AFZ3J340k3WIqw4vyrW0gF4fXr45Ja93tF43ZFW5WF4kAa4kJr13AFs7WayayFy5 Za45JryUKrWSvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sREgyCDUUUUU= = 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772393397976543150 X-GMAIL-MSGID: 1772393397976543150 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 456150ef6111..62e7a045ad79 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 Jul 25 18:50: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: 125547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2410252vqg; Tue, 25 Jul 2023 04:49:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlG90PMRWRjhMpaSMBFkQpF9bKe+HzYpamrk295tLin1kqGfeqBz0hT2a9ppF2NoHRszb1af X-Received: by 2002:a17:906:778e:b0:994:3395:942f with SMTP id s14-20020a170906778e00b009943395942fmr13837570ejm.17.1690285797429; Tue, 25 Jul 2023 04:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285797; cv=none; d=google.com; s=arc-20160816; b=C8PGRj2qlFVtej8arU2xdyW7K+12n4085NAOQ+MFN0mmbjZQhkvPnXLhhuljdeCY8e jvgQRv1l+nc5lGbNkdxUbY95MM2aFpKU7bp45esnLplZ4do2ZI8NbGO3YtxMIUnQEpAp 89caR1qmIFuEDQhVLt8zABgP+bNe5/vIoVOYxX1CVDGK7pliDarWL7MYohGDydyaNJeW kB6fflXPSmi9UGm6DxG3FQBYIRVuCqzjgFWa6gILpJwrsmU2X98Nt01b4o4YkUJx67ry OJDL5NKK7rW+4jpNhUenVT4mkOiZpM7qsj/C7NrgYMslZvKjK+e6skMo20hmGuC8VKxt uocQ== 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=DEMgrKXFeo2BEWOkWuyCkAEGWhuKa/OcmOkK0opMoBg=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=UthC+Qdz4maTYajabgs5Jqw6Yd+s2jvz94N8uIkuwsOHQ5dfZ66TUNUmfpe5E0PnvV Xc4wag+6tT4QUY/ZqpMAtepkuM5h2Ih6K0WC2htHbhER+Z0bmNa6yhzbB2CG8NE/Yn+A DVy6oyXmRWbGsz0+vkaI6L4Jvx4LlopJfOn68ot24qlQprQaZQi/s1E9yp0Dad3hCpXF /xhY8TUFR4byVwv7IXbRPDYn4QwOepOn03U4pDuaKXlwcqufx/OGu1yyJQ/SnL5kbBHB 7LfjX42Hk2BQ2oiMdbURiAvulwCs3rYAoqyTrcY0DoA4+WCxgXWtkqpw3eczZnEAcfiu Yx9A== 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 e14-20020a170906080e00b0099b9df9a864si2512105ejd.738.2023.07.25.04.49.33; Tue, 25 Jul 2023 04:49:57 -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 S232389AbjGYKva (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233748AbjGYKvJ (ORCPT ); Tue, 25 Jul 2023 06:51:09 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4F381FE5; Tue, 25 Jul 2023 03:50:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMg5jjTz4f3sjT; Tue, 25 Jul 2023 18:50:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S4; Tue, 25 Jul 2023 18:50:40 +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 v2 02/10] ext4: avoid potential data overflow in next_linear_group Date: Wed, 26 Jul 2023 02:50:58 +0800 Message-Id: <20230725185106.2147273-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww1fAw1xWr45Gw17Ww48Zwb_yoW8JFy5pr s7Ga48urWaqr1DGa9xGayvg3WrK3yxW3WUJryfuw12vFyxJry8GFZrtr10vFy3GF4UAF15 Xa15AF1Uu3W3uaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNVbyUUUUUU== 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772393120597416027 X-GMAIL-MSGID: 1772393120597416027 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 62e7a045ad79..3cd795e98008 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 Jul 25 18:50: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: 125537 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2408533vqg; Tue, 25 Jul 2023 04:46:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlFJ7nKSprKlMUHxvwc6/Pp/RdZJieN6h3anSBw18I8dV9+Ll/ZOKOlYOPzn12uw2XpL/zTo X-Received: by 2002:a05:6808:169e:b0:3a3:8e77:ddfd with SMTP id bb30-20020a056808169e00b003a38e77ddfdmr15938677oib.8.1690285569001; Tue, 25 Jul 2023 04:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285568; cv=none; d=google.com; s=arc-20160816; b=ZPSO0KQ6Zpg7s6SIxuSpKQPgUYYF1+rAn10BT7j3QaX45JtE0L5ib2pzgkI72mi5s0 fgHdylbCm8WLVIndpC3uZH33HRIcQFks6+oELYchJQreZII9OQ4+UDLpa41sGe3SqcA1 NnQj6XpnNQqLw/I3RIN8W4gjwDQm0u84qLmJpwMO85odlslWfNma3/dAYPh5q46saQbs 7Vf0gHILSq6dELQ00sBO6hN7EXVe2/Cja2wFfBmYGAn6Z1XYb0nB4VKeNrZUnPhyL1mS Ombgp/VmHd+VKMyM7ZuZFyyS1DWfrcHrlX1FXdeobFVcFYOvWy0pWRgYZGIkbSAnhmiD K+aA== 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=m+TIOA66e8cyOWa4etc4wE1kRphuB7YfiESugWY9mRo=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=S4LuwWFt9Bn9B+uqEXA9UmxXo+Q7iJea+lkQnNgAFaYHBVqiMJ6eEujPsPUmP0VUy8 x/3uugc0yxR3g2Pa108Vj5e/Y9exg6r2ANctMgZXJ6OKze7nJQYCl+iML7w0WWkjhLSs MY9k6CXnLYmHq6yQWPo/2qxgJmtC5m6gbzsamhUlcyNIlSvd67rU76XB+5LsiHfXX4rk HaOv5YKJDtPWow+bnXP5TRBaKrPcjvAU83gLjsPPCeX+c1rwzR+r4qTWgGxL5r7NlKdi 5MeN9Da6kPuCIg6tsgbz/3xLbX2fnHHVLW4FFUEQbR6cAEe3PFFIsYrXkqaHvrEyRO/l rQdw== 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 r65-20020a17090a43c700b0025943bb2873si11074459pjg.136.2023.07.25.04.45.55; Tue, 25 Jul 2023 04:46:08 -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 S233391AbjGYKvp (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233788AbjGYKvK (ORCPT ); Tue, 25 Jul 2023 06:51:10 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E66B270F; Tue, 25 Jul 2023 03:50:44 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMh11gjz4f3tP3; Tue, 25 Jul 2023 18:50:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S5; Tue, 25 Jul 2023 18:50:41 +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 v2 03/10] ext4: return found group directly in ext4_mb_choose_next_group_p2_aligned Date: Wed, 26 Jul 2023 02:50:59 +0800 Message-Id: <20230725185106.2147273-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S5 X-Coremail-Antispam: 1UD129KBjvJXoW7CFW8CFyktw4UKFWxtFWfGrg_yoW8KrWrpa nxXF10kFWfWw15Wr4UGayqq3Wvgw48Ka4UJryxXw1rX343Aryvyan7tFy8ZF9FkFZ7CFn3 W3Z0vw45Cryxua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMI 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772392880728834892 X-GMAIL-MSGID: 1772392880728834892 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 3cd795e98008..bf309c4d686e 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 Jul 25 18:51: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: 125527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2384011vqg; Tue, 25 Jul 2023 03:57:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlFEiSFHOtrkCFAFSdr2akCxCPC8l1+/mj2K6mLU4wyK+wdPz/IX8KykmMuLl3j7RYn8D6As X-Received: by 2002:a17:902:bf02:b0:1b8:5bcc:2ffc with SMTP id bi2-20020a170902bf0200b001b85bcc2ffcmr8702234plb.45.1690282619802; Tue, 25 Jul 2023 03:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690282619; cv=none; d=google.com; s=arc-20160816; b=LrqNOiBLXR98K5IDk7cIvHXcWtIHl4kYomyPTKcG5nWdlkEqRvt90gyT4RTgKDV9D9 MRpFevZOi9VCO4twW4SRQtgQX4IF757xc5eN70tMe6LbhCsFf44TsbYqQ9jWAwKELQnm WqiJlLOzt2KbYD3Fcz/pOkjTSn93DREMXW3lPOC3dhfKyRRodX2OWkrab37UNq4z9ei4 0nNmaSH2x2VguL9qOVIx0/uMMQOJ/PjgPwwRYcjSyzcgOjeRygE5xUot85CpPH65X4a7 iQKHlXShFhBfPBzvO0mGfGAlAc1YRWSxx28cHCoBbBDzdGNfvwEVGkM5O4NgXfXc4Pg7 DTLA== 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=Zb9pgs02/Hm6BtTjnxI9jKsqvGAHUjZLJZqrdH4dbBY=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=FSr+P+umSE+895U1ZNijU8sQcxY3iudhTBIJAbVQLv999G7EkqgBn5Bt8wBigK2Qn+ +k/OALUCCUdB4o0TKgGnx9+N5DyPyRAbjqqxZFzK0xFq7ujSmi7hwV0RHs3R7oB3xZtt v6LIJeeyEVZDzGh+EBJ0yobfmVEsjyOQo3uYo7V2j4KR1cntu7PnBJ+Us/0818JTnAY6 AWWGP7wSeuon0fvTXbxvvrZ8TwBGdDzOotMSPnM/L4tUzkO054MYdMDxM7URe6wgS2Ac Tvq15sYZu9OqUkVcjEZgyX7Hai+FYU6N4h0cQcKROLlRhFXjPxR4+mMAIiNlGGS0N9e5 OUFQ== 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 li11-20020a170903294b00b001bb35920640si10723634plb.351.2023.07.25.03.56.43; Tue, 25 Jul 2023 03:56:59 -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 S232137AbjGYKwB (ORCPT + 99 others); Tue, 25 Jul 2023 06:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233793AbjGYKvM (ORCPT ); Tue, 25 Jul 2023 06:51:12 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 360AC2724; Tue, 25 Jul 2023 03:50:45 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMh6Z7Rz4f4VkW; Tue, 25 Jul 2023 18:50:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S6; Tue, 25 Jul 2023 18:50:41 +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 v2 04/10] ext4: use is_power_of_2 helper in ext4_mb_regular_allocator Date: Wed, 26 Jul 2023 02:51:00 +0800 Message-Id: <20230725185106.2147273-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S6 X-Coremail-Antispam: 1UD129KBjvdXoW7GF1rJr1UurW8GF4xAw1kXwb_yoWfXFX_Ga 4jkr48JFWfJr1xC3ZYyayrKr9YqFn5AF45XFs3JrsxXF1UZa97Kw1qyrs3Zr48Gr47ArZx WasxGFy0ya9a9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772389788217117304 X-GMAIL-MSGID: 1772389788217117304 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 bf309c4d686e..35c6224d453c 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2794,10 +2794,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 Jul 25 18:51: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: 125534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2408230vqg; Tue, 25 Jul 2023 04:45:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPM0InLHzREAdl0QpGociKUqqlGHXzc9P2I3ANfTgXMxxZcwk7o2kVHOVUjejj/FBZtGBA X-Received: by 2002:a17:902:d484:b0:1b8:1687:b53 with SMTP id c4-20020a170902d48400b001b816870b53mr14454796plg.26.1690285532052; Tue, 25 Jul 2023 04:45:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285532; cv=none; d=google.com; s=arc-20160816; b=b7Z5G4cyN9A7ExSsjPqYjGXvV32Pmpupp9/w0VFkLO9avEFDrDGzOThAxoEbo1dMTk p5m7W0CiLTus5Chxau8Qg0ji0gW40i7reC7OlrCz78EtD5T09SjCiDb6Pqp4Mn5mORKp ynSFh8JpHibssv5SNpDYVJnEmY4fgUaTlKNl1zdN7QSOtIDIvI16VzkYCdP/8M9l5e1v nstHOS5/Tm9HRb5OW2Rp3omgJ0w+rFhNGaO8MXcJpnL1SrwLZc5ovHufFR4qnvCX9oU8 grwWd15yVOxguK3J1q8ufNk5wPTxL36yL+g9IXJScswrdUF4RzXPB9NJf0lDJ4ZkznvH Y1pA== 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=FgEmK6xtYFJosUDZPPKeVp84+0Yy0sRt5PY1S/lJKoo=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=OCmIsKSNRunB+oytWkOGjOOTa6XpooXlI71bEgkhL1F7BZHmMD1Nnac2IkjkKLEqb6 FmHpeBxpQgB7fY86ofwslGxsyfHawVQuaF0YN13hQpVeSCpKH1u0VG7nPynkgCxAFqo/ /Ic88virefyj1GICGtxA23nKSvGjkKLIejIgKZg7T/Cu6N5y8k9mp21d//kqF1OhRWpD 6asG8dzQhRr4Uv36f0tA3a0COCWWzhFb2bUqB9cXvcdlfBdF+J4OjooOxmoK5DKWMxsC Oz74zkIHVI0jQNXUnvq8w5E99r/a9a7apLg4W6ramPlALST+2k0WqFJGSDFlEumOAs+9 gZIA== 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 kw5-20020a170902f90500b001b9e9edea43si10373384plb.552.2023.07.25.04.45.18; Tue, 25 Jul 2023 04:45:32 -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 S233197AbjGYKvl (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233787AbjGYKvK (ORCPT ); Tue, 25 Jul 2023 06:51:10 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FC092715; Tue, 25 Jul 2023 03:50:44 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMh673yz4f3tpn; Tue, 25 Jul 2023 18:50:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S7; Tue, 25 Jul 2023 18:50:41 +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 v2 05/10] ext4: remove unnecessary return for void function Date: Wed, 26 Jul 2023 02:51:01 +0800 Message-Id: <20230725185106.2147273-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S7 X-Coremail-Antispam: 1UD129KBjvJXoW7KF1rAF13tr1ktw4kCF1UAwb_yoW8WFW7pw 13JF18uFs3WF1DuanFgw15Ww1akw1xWF1DJ34IgwnY9rW3JrZakFWDtF10gFyrtrWkuana vr4qvF45Ca1fu37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772392841915178389 X-GMAIL-MSGID: 1772392841915178389 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 35c6224d453c..ba021b19ac02 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4871,7 +4871,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; } /* @@ -5625,12 +5624,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 @@ -5871,12 +5868,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 ; } /* @@ -6530,7 +6524,6 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, error_return: brelse(bitmap_bh); ext4_std_error(sb, err); - return; } /** @@ -6633,7 +6626,6 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, } ext4_mb_clear_bb(handle, inode, block, count, flags); - return; } /** From patchwork Tue Jul 25 18:51: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: 125550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2410861vqg; Tue, 25 Jul 2023 04:51:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGERbkedSpzsDkph+n6WjFidzgqCZPmI9BXtqyEhgM08wy4Ulw5i5V9SjyBOeLW2+S0I0gn X-Received: by 2002:a17:907:7708:b0:993:d589:8b75 with SMTP id kw8-20020a170907770800b00993d5898b75mr2327980ejc.2.1690285878601; Tue, 25 Jul 2023 04:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285878; cv=none; d=google.com; s=arc-20160816; b=GBdyqtsne6qbO2FrTOOTYqCn6FKYi/Yrq0n0/gmIvShRbxuRYphqVPt9sEyr6FvDwh PNTg+0g6LIgNsj3VYOxI+BRie2e5ddyw7HVCwpwnCMFxfbfqS8xHqdwKieuIGayB8J4L pJivKmsc+d0TdDiFrCEXq1sxGTYg0+gY3a0V4m/kmT2FYhh+FEDTp6EgCiP9NWGAyBDB YGQHAmxMMGxpTKOkCgW3HQ3BAALRmwX3qXfIZsfY3sj+FAJoh6F93g5tIgmdbZKPuepn +bof22AP0PrXI1co1FSGLRhqYsUPnR10ViXOESDXWwMuTwaFqFAzvVmsHLv90esMEfJW 7tMQ== 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=w/RcrqjF2r0wQuZg+57qRAlXBzE3Sz7bUGpIXHNruNY=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=VUJlNbM+mJIhUFANoRx78CUSpDXxHy2KhMv9SQUCFAOOm+ESz2rgAw1e5dCdyMaZ76 TI4hbfi0R6KJEHdKwQVEtZtiez47yNtslySL5GV0TsR4QqKs0UU2z6DWE3bRzbPuMeir fv36Mrouokvn0vxH/WDRwUwKWz55Yq1EXhOEGCTSeOTANChyhedLy70W/FHTLGeS67xg M2NgXmyXyHdoS8nt5Le4INDZMJ0RMIUg3izQVOM+Ql3mBfrupIyGRPyP8ErP/E1qjkOl 6Jk5S7qhKoFQQxSyIRZfjEYdu+snLI0m/xA7gakkearMsB6qsw1uBzX0nF0QbOntFGLA QtGg== 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 q5-20020a1709066ac500b00992f45c9342si8165162ejs.1020.2023.07.25.04.50.54; Tue, 25 Jul 2023 04:51:18 -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 S233543AbjGYKvu (ORCPT + 99 others); Tue, 25 Jul 2023 06:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233789AbjGYKvL (ORCPT ); Tue, 25 Jul 2023 06:51:11 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 094182720; Tue, 25 Jul 2023 03:50:45 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMj1gLPz4f3sjV; Tue, 25 Jul 2023 18:50:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S8; Tue, 25 Jul 2023 18:50:42 +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 v2 06/10] ext4: replace the traditional ternary conditional operator with with max()/min() Date: Wed, 26 Jul 2023 02:51:02 +0800 Message-Id: <20230725185106.2147273-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S8 X-Coremail-Antispam: 1UD129KBjvdXoW7GF45XryxZr4kWF45ZF4fKrg_yoWDtrb_GF yUAr18Gry3GrWFkry0vrsYvr48uan5JryYqrWUtFW8JFyUt3y0vw1DZr43Crs7uFWqyrsF ywn3uF97CF1SqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772393205517814384 X-GMAIL-MSGID: 1772393205517814384 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 ba021b19ac02..73f8ecdf4d23 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6815,8 +6815,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; @@ -7033,8 +7032,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 Jul 25 18:51: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: 125536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2408347vqg; Tue, 25 Jul 2023 04:45:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlEZMteo9ibejGDdU2B4gWE53P03gv0IlCrlliHaKD0gY6p+UGP3UlDFQe+WL5sy4wSoTy+9 X-Received: by 2002:a17:903:2350:b0:1bb:4861:d3a7 with SMTP id c16-20020a170903235000b001bb4861d3a7mr10781371plh.16.1690285546124; Tue, 25 Jul 2023 04:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285546; cv=none; d=google.com; s=arc-20160816; b=PjnN9/LXuzqAnUxy93vW3SFRBEJpvz97GGJAbwMF44JUdwn0xe+AqOhQnWnfYrq7bV BF+jHk7m7P6YXDJDUy8zCXQbI3vTMEIbUfAcLFQ14H9L6Yv7/nkl+k18WarEA4SuEi2x Q+yI28WN5Y/Vk39U0VRqXh3qdCMnwItlqX2o+g200kWuWjf4XE7JWIGvXvay+7UmKOy3 9fW37Sa4MJhd059izdwaixTYBev90BIUB9dLdkkrmrZ0j8zCq9iX6LJ1Fs1CfI7Rc47m VSTB11eIFch7bL6LAvoieaeiOppVtyz/VrrfN6yirqngt0FjDB//E6gsqOdL8g4tQJDe XHbA== 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=JKAadUY9rksRXw7JdlEKIIFZ7T/7Rqow/r2Iu3x3NTI=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=o8R21mozfOCUlHsV8WWRPP3RnGnfPF5K1fK6jnRNku3HPB+lYVSERimnva6fkMfvxE R22JNgGVfqvZsfHk+QCuyc6eWBn46ThCMit51DBjmaq+ySnsNWlTg7GajCfhUN9s+Rki bWHdfMLTpb7RzpDIstUS+FzY9kzf6iGJYQR+fyUJFTqwtdseNd1iM8LVUbGdBzK7z6w3 Izc3a2R6eI9m+EHUA7PxGaIWq4mbGP7FwVeOMx0smLt0E73UmaRx64Ag5ETd4Mbzh5rj UT50JPUClnxjwFBea/58NhFubsUMF1VInr7OhVNX5HUxRdGREMPRrTm7ED+atwDovi70 JcDQ== 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 n7-20020a170903110700b001b89bfd0c2csi11751446plh.647.2023.07.25.04.45.33; Tue, 25 Jul 2023 04:45:46 -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 S230462AbjGYKwc (ORCPT + 99 others); Tue, 25 Jul 2023 06:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233823AbjGYKvU (ORCPT ); Tue, 25 Jul 2023 06:51:20 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D8E1273E; Tue, 25 Jul 2023 03:50:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMj4L2Lz4f3tP1; Tue, 25 Jul 2023 18:50:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S9; Tue, 25 Jul 2023 18:50:42 +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 v2 07/10] ext4: remove unused ext4_{set}/{clear}_bit_atomic Date: Wed, 26 Jul 2023 02:51:03 +0800 Message-Id: <20230725185106.2147273-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S9 X-Coremail-Antispam: 1UD129KBjvdXoWruFyUXr1kGF45Wr4xZw13Arb_yoWfuFX_J3 4Iva1kGryYk3WxKFs5u3WkJF1ktrnIqr18u3Z5Jr1ruFyYqa15Ar4kCryjvw1rWr45XFy0 yrn2qr1YqFykXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbq8FF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772392856796036184 X-GMAIL-MSGID: 1772392856796036184 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 0a2d55faa095..7166edb2e4a7 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1252,10 +1252,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 Jul 25 18:51: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: 125528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2384049vqg; Tue, 25 Jul 2023 03:57:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlE+Fy2OcZam+fyDSrLvUdHi1mmdxgNePuHijeF5et8MK7y8s6aF0HwKBs2zi4xZspFjABmV X-Received: by 2002:a05:6358:708:b0:134:f070:d6b8 with SMTP id e8-20020a056358070800b00134f070d6b8mr11652572rwj.4.1690282623810; Tue, 25 Jul 2023 03:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690282623; cv=none; d=google.com; s=arc-20160816; b=rhtZaJczPGysqlQtkPKQPO0B6ViUIsEY1MFJyw1QgsMfLDSn39arlvs8TnyXa97srT JoVYwoo1sPYtCIPbQh0CV6YV3tAnb+O4KJ1GJ70xRjGhECge79NyNDyEGZ4SpW6UqxUS vnEQFRDbS8Elna+SWLz2h71F71F8joBTQWFb8DZnKp5L3bllGdQalXePmczdeacjwSGN QovcicG0O6hcm7MRVwmVE9dJUviXpgNKt5/rUEOurFVDGnoDIPXYJSmXfI87DUFFodxX kuLjYEEhSSHnK1azI9ktrbeFQ4DjMFFQeZ8M84cB2bSda+aFX8WUnrKj0XDJnhkrSDyn Sp6A== 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=PBMKlSoVAqVl1/zZPb7iefK482Tnz/k3cOS7ldbQQkI=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=K7swnWqWmdkj6zjbJBIpZRq4Cb0izVBAGgNWVOKhRsO6I0ujLh4ANB4XyS8epf0uFI Ybj9wRwWGEVs7u0pKCeEgcht5s4mdPMtkugFrI5Tc7QGt9NE4P+vVUqWxUEWOuS96w/c WQGlIulZtKXFHTlBGYtGh3cQb60jzh0XPUkLHpaR/SQp9KX5spddJYfMyEK/EC8hrK5Z FNsKVLNLldOx5kfCc8+DZowxRpXqKjj5S5g4XqPvFXhl/PXlxXC6ooEuzHY4fs3hFBAR qqD/TqUlYImizUJCXurvCIWyuuXooHal8XvcYY3MuGF5aroTdhvLEfqmV1IuFcz5zNER T6MQ== 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 bu22-20020a632956000000b0055ba5bb0bd4si10747317pgb.776.2023.07.25.03.56.48; Tue, 25 Jul 2023 03:57: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 S232211AbjGYKwN (ORCPT + 99 others); Tue, 25 Jul 2023 06:52:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233800AbjGYKvO (ORCPT ); Tue, 25 Jul 2023 06:51:14 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26AF01FEF; Tue, 25 Jul 2023 03:50:45 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R9DMh2YK6z4f3tDK; Tue, 25 Jul 2023 18:50:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S10; Tue, 25 Jul 2023 18:50:42 +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 v2 08/10] ext4: return found group directly in ext4_mb_choose_next_group_goal_fast Date: Wed, 26 Jul 2023 02:51:04 +0800 Message-Id: <20230725185106.2147273-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S10 X-Coremail-Antispam: 1UD129KBjvdXoWrZFykAr45Wry5CFWxAFy5Arb_yoWDKrb_Ga 47AFs3AayrAr18G3WF9wsYyr48KFWkAr4DXr9xtF45W3WUCFykK3Wq9r4rAay8ua10yry3 KasIvFWxKF4SqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbq8FF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772389792233322577 X-GMAIL-MSGID: 1772389792233322577 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 73f8ecdf4d23..88a3c00e484f 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 Jul 25 18:51: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: 125554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2411263vqg; Tue, 25 Jul 2023 04:52:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFUIuyBlHrEe+oBFbBfZ8KSSM0OzrdyltJE0fYQytey1MUeVW9wFHE9T23zLpJhbNuY8E8P X-Received: by 2002:a2e:968e:0:b0:2b6:9ed5:bf15 with SMTP id q14-20020a2e968e000000b002b69ed5bf15mr8417049lji.23.1690285932111; Tue, 25 Jul 2023 04:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285932; cv=none; d=google.com; s=arc-20160816; b=NgAVhT0NXmOXv1ggEKriYPTAJRR1JaWKdxMEteRBhzzJz9NiuiVBdtGxKIwjc8i5Jd cxgCoYAb++rKQ3OQukElZymjH0IRq235DOSFh4tWPWxd+MD9+kul8qqtajPJIEH/l5Z0 AYpGlkTXbwYRPDdGoqI8O+LhNb8CbLfHBs8hKGDKM+kMNWJGC8xN+D4D44dVcfXHDQFh Nk+XBWowGRLnYrPsH9WzpzXRMdtuZCkOw2C495wq20F81SW47sWmb0KQd9VJ81XrIdv+ mexR6aQljLhy2DsA2kncNMezl9LfR3aNI7hosjQByfJazHnRwaL4aDRLZrZz+50RiL8k 5zLg== 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=k7/2ubdFQ9/pnyAefA9DS+vcEc5ph07bynv3BDRRNlw=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=xppNvGnyGXxrA3mNLYau3qRd2FV6XkB4X8vNbANmGx2emCzFk8DfuMKyAp5TUO1C/H 1jM94t+YQlCCfhQh1a7h3mp7mc+CYAJo73opSxmW1lKnlCWeQO7I4ceHKjQFvJNv6H7B xfVI/LgSu8SbRISIi3bGCMxj3/7LUIEzkf5zoX5Kas2aLp8Rkid8lywPs/Uwp+G7lCdl G8gtur/E07644NhRh35y1mSGwOxpQYTE8U2YIDphERg7Y8rVXqivXXaQWr951wW2tNoh XKzX9UqF7qGJIcajEDgDFC8Wu/OXgXHvjDPslCC+F8dpBkg0dHBFe+/C7GY/DkykB5lQ EPVw== 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 r25-20020a1709067fd900b0098638efc275si7189413ejs.688.2023.07.25.04.51.48; Tue, 25 Jul 2023 04:52:12 -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 S233770AbjGYKwU (ORCPT + 99 others); Tue, 25 Jul 2023 06:52:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233804AbjGYKvQ (ORCPT ); Tue, 25 Jul 2023 06:51:16 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77AC01FEB; Tue, 25 Jul 2023 03:50:46 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMk5SpJz4f4VkH; Tue, 25 Jul 2023 18:50:42 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S11; Tue, 25 Jul 2023 18:50:43 +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 v2 09/10] ext4: return found group directly in ext4_mb_choose_next_group_best_avail Date: Wed, 26 Jul 2023 02:51:05 +0800 Message-Id: <20230725185106.2147273-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S11 X-Coremail-Antispam: 1UD129KBjvJXoW7ArWUJry3GryUJFW7CFyxGrg_yoW8Gry3pw nxWF18uF1xWF15JFsrGaykW3WrKw4xKFy8tryfZw1rXFy3JFWkGa1Dta40vF97CFWDGFn8 Zw4vyrySk3W7u3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP214x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772393261853765054 X-GMAIL-MSGID: 1772393261853765054 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 88a3c00e484f..36eea63eaace 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 Jul 25 18:51: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: 125544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2409908vqg; Tue, 25 Jul 2023 04:49:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlGs6Ut/jBfoqWXnaZdSrIri5er1jzPPXc3HB/yqY9AGId/z6CzLaWJa8N9WfZPC62CdwNEI X-Received: by 2002:a17:906:7a5a:b0:988:fa98:2e7f with SMTP id i26-20020a1709067a5a00b00988fa982e7fmr11802766ejo.38.1690285743186; Tue, 25 Jul 2023 04:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690285743; cv=none; d=google.com; s=arc-20160816; b=fLN8UNT2UHk7glRse09rdD2dVkF7y0jTTHpf4wGi88R7tgaQr/Um2wVPywEd8mychl RCtXx2ot63X62uMhkb8gRQfZ8YA8GYVDBDDJmnpuVz88+DdbWiQCu9q9Snpl4CKRZ8TG 1N4K1JW57a5dzDmu45lcFbZQfbLI1v5ThuPvtNh33J4Qf5mJpaYtz3CVxGKgHQttdrrm VumCM0KmBM8A2Us/7lNJSw9CUindwUTqz0ZMgcTCt0q62CUQKZJRHJnO3p7uwXvCEg2S 0PUpQXnsRf7bQwOqluFguS3z9B5/aLMl9yJQsMHxX+jR4qYyO6msaHtY9Hz8p3Igi9gI 1iQw== 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=9szTr6iJd44Bzq41yk5ynyok4mR9Pcl7G+fDIGhQR24=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=ral6UNWhyUh0HUOHeNgI5Ahng9xvO7dMcRzHDuwbbrUkpDlHS23Nr1jkAIyuMquaED a8GaglGMIGY12c8ygXLmdtGDYn4Noi4ke6J81MSl696H1J0nIGUoxScGJZsUB+mxVtyt EEVoHdhAySQ+qXay0ExhkJLl9qEGIwaghHMSWWdcseVYKqXebqWxyIoHWfGFHQOabXP+ c0h7Yb6HE6Ya9fBYzEqPPVHvAvYB06G1r6LGUskjkfgD0XOPEberUWyIdvSHv02Q9qPp X6QrBR+Pf2HPjBV0MTgSp1Ax/snRAi4xsHSqhwAyhJED78KNHJwWQp8G5ITLOu3KOtvi +9Lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g27-20020a170906199b00b00993ebae9929si7778266ejd.708.2023.07.25.04.48.39; Tue, 25 Jul 2023 04:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233704AbjGYKwR (ORCPT + 99 others); Tue, 25 Jul 2023 06:52:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233802AbjGYKvP (ORCPT ); Tue, 25 Jul 2023 06:51:15 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77C192728; Tue, 25 Jul 2023 03:50:46 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R9DMl0hJSz4f4VkP; Tue, 25 Jul 2023 18:50:43 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quj+qL9kl7XQOg--.17520S12; Tue, 25 Jul 2023 18:50:43 +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 v2 10/10] ext4: correct some stale comment of criteria Date: Wed, 26 Jul 2023 02:51:06 +0800 Message-Id: <20230725185106.2147273-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230725185106.2147273-1-shikemeng@huaweicloud.com> References: <20230725185106.2147273-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quj+qL9kl7XQOg--.17520S12 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww1xWrWxXrykCF47trW3Awb_yoW8GF1fpr 4aka4xGF1fXr1UCa1Du3WkWw4Dua1xWFy7Xr929r4FvFy3JFyfuF4Dta4kXFy8Ars3X3WY yrW5ZFW7G3WUua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP214x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772393063469246195 X-GMAIL-MSGID: 1772393063469246195 We named criteria with CR_XXX, correct stale comment to criteria with raw number. Fixes: f52f3d2b9fba ("ext4: Give symbolic names to mballoc criterias") 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 36eea63eaace..de5da76e6748 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2777,8 +2777,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; @@ -2835,8 +2835,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 cr below CR_FAST, otherwise mballoc + * can spend a lot of time loading imperfect groups */ if ((prefetch_grp == group) && (cr >= CR_FAST ||