From patchwork Fri Jul 21 17:09: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: 123678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp76903vqg; Fri, 21 Jul 2023 02:22:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlEtq24x+09NDJzZpflEnlUMekFEGeIUgePjZEO0RSGfHfeZzkEYGdSiGth4ODaVc9lLGNlj X-Received: by 2002:aa7:db4e:0:b0:521:29a:8ee3 with SMTP id n14-20020aa7db4e000000b00521029a8ee3mr1453276edt.5.1689931364089; Fri, 21 Jul 2023 02:22:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931364; cv=none; d=google.com; s=arc-20160816; b=iiKSKoAszZG1otjeXuzqRxHWY/Ji8XBSzy99NuDOjPDvTIcLssLvcAWTcFNh3JXOVk rezKbr3SMygNOwXw+2wNg/+I+i7V19h6nlBoesKe+PmbhMhzNUqim5qB550/8oe1hwhR 7vtvLXx7Drcbfy8qM/Ermaz6IcFr/S8FlNiUJlyDNV86I8h/gr96bWUOh64iwBze+N3a +iqUrFzkUoZbq1oxkFjLIL5QIp89rx8AiRVWa3IkeTFB9nq0UwpKtld0YnuKVDx4u5kd 9FGwPn25BfrZ+qkNu9Mb9mkBOqjeeBzhYdpY0FeYG993hjjoyuOOsOFNjmrJSM0+ib33 GprA== 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=LXZDkbE1yGQqYEm081f2soMgVUBEksVq85+edYsEhZU=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=FwHJbhKnUvR+m0JTk1shBrPPPlHTb8yW5KaYPzBbv3hD99nqnIQ1zuumnMLC+stiB/ Srf+nNJXwunrh6ChaiEXAxKs5DB6A1IW9gf4Wzs5hlpVxLHAqi5ZJAYfGWTFtNuRPnS/ nzNOjAgW9jXqJpSPmKNqqJoFoiZGqaAQavAMxRQtLWmgbEKOCICtS6MC1oUN1uFSc7v/ AJmJ/C5gGMrqpi9smWJe2lXhePReSMVmQ6oYr+oVaXZV0SzvC8g6BKImCs8KTO+B/T3a 2JG/tJjA05s5uMaHUXRHyyEh06ln1BEBAkZSBFD533xWesHYPse+vnY30wOJLkqpiGBx 0bZQ== 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 i11-20020a50fc0b000000b0051e252568besi1986324edr.662.2023.07.21.02.22.18; Fri, 21 Jul 2023 02:22:44 -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 S231605AbjGUJJu (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF6BB30C0; Fri, 21 Jul 2023 02:09:40 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJt34nwz4f3mLw; Fri, 21 Jul 2023 17:09:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S3; Fri, 21 Jul 2023 17:09:36 +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 01/10] ext4: correct grp validation in ext4_mb_good_group Date: Sat, 22 Jul 2023 01:09:58 +0800 Message-Id: <20230721171007.2065423-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S3 X-Coremail-Antispam: 1UD129KBjvdXoWruryxZrWUXFWrJF1fZF48tFb_yoW3Xwb_Ga 4DAr4kAFZ3J34Ik3WIyws7try0ga1xGr45J39xtr45ZF98WF4kAa4kJryfAF4xWrWav345 Za45GryUKrWSvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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_Jr0_Gr1lIx 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, 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: 1772021469877897119 X-GMAIL-MSGID: 1772021469877897119 Group corruption check will access memory of grp and will trigger kernel crash if grp is NULL. So do NULL check before corruption check. Signed-off-by: Kemeng Shi --- 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 3ab37533349f..90ffabac100b 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2554,7 +2554,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 (!grp || unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp))) return false; free = grp->bb_free; From patchwork Fri Jul 21 17:09: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: 123676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp73032vqg; Fri, 21 Jul 2023 02:14:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQ76QjWHNd319JnCcMF09GJGQaIymNoevLXprHawyLa9Zl577n7jMQ0bAn7mUbZNPMhBo7 X-Received: by 2002:a05:6402:7c9:b0:51d:98d1:5337 with SMTP id u9-20020a05640207c900b0051d98d15337mr1134668edy.37.1689930850204; Fri, 21 Jul 2023 02:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689930850; cv=none; d=google.com; s=arc-20160816; b=hg52qDsoBLZAfZWwrPacDdxeHm5LGtDvp6IpXaOiAgNrLL8k4eDk0+YR7clXQQlFTD 6wDzIxfoKOcTMoEfON4VshdacLNSPTWVqkLcYYosDPchDbHzIxWMNuSBmXfSFeo6zIqY Pkro2SxJAdD7KXwGjpWUKXL9Wa38Z7MBG9v+tYq+fAwd53BN8/52vjc4UYIcF3cdEloK uh3BODmwFnRlPdwaERUpcRo7rpKLfXmC6YXYRpogQlLBY+E1yy5LqOpZC0Xu5XL/l5yy 4MDo74xQz4IU5Cl8YpB5Yn6437stF1y93BWS77mt56fUrYW5oY86S76vcV93IHDLE7rC AYhA== 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=bGiRuQWoSZDYHPJWOIWT6ZPRZoiftczZk6Lj+KeE6Aw=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=ivyjQ4EvFRD6ITyxg1kX6t/zaYB8WorUPIpdouNCkGd+rYLfjuzwk7Q23uJL2hQkvh hyXZaeK+xruD5pk88weBj5V/3/2rdQtPWiIVLS6RYSaHnh4alqVsAWZkIImFGqaR2yuJ ZipC+pdkjRWK/t2WsBt0blgeHAJCtUQv8FFyFEJHMw+AY+EjgbPVtkTjMpMO5W0Mkl21 n6naFFK3J3hu2wdNISJolC+1MGN2Bbb3mI2mBm79im8Qq0upefO2TL+moqGyyUlcwfUt NjxMWjA/vNOTfusv52PqNap/NhQ8a5Psgk6hfNfsTKXyVEjQV16tsg1ata7oYL6ZBzpM u07w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v23-20020aa7cd57000000b0051dec563f99si2187650edw.73.2023.07.21.02.13.45; Fri, 21 Jul 2023 02:14:10 -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 S231486AbjGUJJp (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230317AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A92DD2D7E; Fri, 21 Jul 2023 02:09:40 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R6kJw2nk2z4f3nTL; Fri, 21 Jul 2023 17:09:36 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S4; Fri, 21 Jul 2023 17:09:37 +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 02/10] ext4: avoid potential data overflow in next_linear_group Date: Sat, 22 Jul 2023 01:09:59 +0800 Message-Id: <20230721171007.2065423-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S4 X-Coremail-Antispam: 1UD129KBjvdXoWruryDuFWruFy8Zry8GFyDZFb_yoWkCFc_Ga 10yr4fJF95Jw1S9a4I9wsYyrWvgFsYyr1UXFWftFsxZ3WUXw48u3WDJrsxZFW8uryfAFy5 urW7Cr1SyFWS9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR mfOrUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772020931000048861 X-GMAIL-MSGID: 1772020931000048861 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. 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 90ffabac100b..33ee3991f62c 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1081,8 +1081,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 Fri Jul 21 17:10: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: 123696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp83821vqg; Fri, 21 Jul 2023 02:39:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbJOfSLxW3cMhDUMRq8FE19+mK/yAHmbwK9zkFvqxiYBQzh6bxDotHUTFTW0djrXTxtn3H X-Received: by 2002:a17:907:271a:b0:993:ffcb:ad4e with SMTP id w26-20020a170907271a00b00993ffcbad4emr1133954ejk.13.1689932372010; Fri, 21 Jul 2023 02:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689932371; cv=none; d=google.com; s=arc-20160816; b=qJaAleZBx3FUXDiQaq72ahpRcjtIA1ODL7qy/Ox0cVe08mpHzQCHJTFWSauGArV/rS AgUOqHDHzIGtSynBiUvBo17C5RnEJXeJuFbLfIc6ABz5LjEjyqa6x4az2ApthqaN27JW Mqc/Xf4EyiV0RZie7vhYWgRJ0z+heXrtMOdZNoVrCM4cSp/vxt09zapRDRJYw9/pkoR3 +TdUkWvza2OKBRNuGEn5LSfmIrZekAxEVQ71x4rb9vai4E8+nAgjrpC00Agwg5RqWlxh 7t6ZGxuaovQOyXivlFFu+aqr2Sb4oABvsBuGGKMPG20SmrzzHkywb50kA6FlYVOsp6mT M5AA== 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=Qae1FYmQ5hRZVwYgjW9a2+iQA9iYt0/SY+MKoOlkJe0=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=t6sAainlNkv8h5CykljAV1ON7xUWKc4MQ/4s1dV+CRlYGQ/wb5Byv54DG00zdOeaQV Jdr0Y2hNyGU8Gamydu3ryiEmstW0UXLEXgZ11bwoNog6RwnKq7DM9AzTXwJkqYhLDRmo hwVI59iYgSPavbZS75ClZlULKQ4TWLpBw6MqmSliyWkMKeBwXvLn6XXAC1bOfCndCTZv fSbs2fLjprSew6jz6FWSvgU/dI5XGy0E8EGRpOUBiJGYnR+B8jBSqJsxAf475545hBOd pppWms0/8fYxqMahvvkghf14QhQ8zDEFTkJcn7EbsycinqIpOTXCxjWfHFREx9zfrzwz mgWg== 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 lv17-20020a170906bc9100b00997eac101c8si1761956ejb.523.2023.07.21.02.39.06; Fri, 21 Jul 2023 02:39: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 S230001AbjGUJJ7 (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231357AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C9A030C1; Fri, 21 Jul 2023 02:09:41 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R6kJw5CzXz4f3nVC; Fri, 21 Jul 2023 17:09:36 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S5; Fri, 21 Jul 2023 17:09:37 +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 03/10] ext4: return found group directly in ext4_mb_choose_next_group_p2_aligned Date: Sat, 22 Jul 2023 01:10:00 +0800 Message-Id: <20230721171007.2065423-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S5 X-Coremail-Antispam: 1UD129KBjvJXoW7CFW8CFyUZF4DZF18Zw17Awb_yoW8tw1Upa nxXF10kFWfWw15ur4UGayqq3Wvgw48KayUJryxX3WrJa43Ar9Yyan7tFy8ZF9rCFZ7C3Z3 Was0v3y5Cryxua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRPEf5UUUUU = X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772022527069837709 X-GMAIL-MSGID: 1772022527069837709 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 33ee3991f62c..4031f8e2a660 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -875,7 +875,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) @@ -884,7 +884,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; @@ -893,28 +892,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 Fri Jul 21 17:10: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: 123690 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp81404vqg; Fri, 21 Jul 2023 02:33:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzdz4/0auamYFky/jv2Jk+zBpjoC47lbsN8/69SLuXCYKr8b3leaFa4tbTuUtGmb1XFF9O X-Received: by 2002:a17:906:8e:b0:997:ea90:96b4 with SMTP id 14-20020a170906008e00b00997ea9096b4mr1217789ejc.61.1689932016108; Fri, 21 Jul 2023 02:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689932016; cv=none; d=google.com; s=arc-20160816; b=Rd+go+TOY+C/8Z9JxRhQ6snKOzm00vyX9YYq3PqFgZkKHAie9ATR6HcuvTZzMWkbUg 2i+rxsdkzcEBP2dN2X/VkDwTFySge0RGVrd1TPoopxVOHFxdYZSeiWCnjsC6XUeIdND4 8HOIWrpi8DN7bCiWI4V71XotzrfPhEqQa8ixyQ3X7jpIM8vU030IJNskmVnOQo45golO idyT+H0ITU41N7Jj/ehKGogwtXZYfDkuguu61MOYzSw+3dq1JTnYzPZK2m5iz+aczDW6 RfhbUCgfri6cQ3RXtjB1KDxKpukiabOvAUt5WCjigb8cvCrT88CCvUi+LlPSAZ0bRud7 7h8Q== 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=5DT9OI3Wwc6ZScG6Kc/ZdvUyDgrqJpfUyDixGCeXroU=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=gb2RPWraXaBt8AeoIKsFJ2tft6zeiAo759LaLnZRAqWbx/HWi4vx+/N4n0GkjHPk4s CvAELHNRMXt418ZQdlZNsglde9ci1SphhpgWJFMmvoh0iBid+P4RlShnDyGu/40+zcsl kMnDgPUqg3ohcupwkXgrU0LoiP59C/fycAPugGPw/cRWdbImEqV/gd7mHCh06n8qCOdK 5FHigYxbnodsyXeE9lwa1u3Ks/+PeHyMzRvtLFS11l7AsZFFNcvQXWXKj0G20EAas6v1 symoFURW8KDIos+W0vMHoLTjQP0AZHm/SpAEL+zpAEtu30sLDRTLzpMDrn5gvCI98vKz FNLg== 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 q16-20020a1709064cd000b0099b42c9082bsi1768294ejt.508.2023.07.21.02.33.10; Fri, 21 Jul 2023 02:33: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 S231636AbjGUJJx (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231279AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D69ED2D7F; Fri, 21 Jul 2023 02:09:40 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJv3g8Xz4f3s6K; Fri, 21 Jul 2023 17:09:35 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S6; Fri, 21 Jul 2023 17:09:37 +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 04/10] ext4: use is_power_of_2 helper in ext4_mb_regular_allocator Date: Sat, 22 Jul 2023 01:10:01 +0800 Message-Id: <20230721171007.2065423-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S6 X-Coremail-Antispam: 1UD129KBjvdXoW7GF1rJr1UWFWDKFy7Xr1rCrg_yoW3uFb_Ga 4UCr4kGFWfJr1xC3ZYyF4kt3s0qFn3AF45XFs3JrZxZF1UZFWxKw1Dtrs3Zr48Wr47ZrZ3 Wa43GFW0yasa9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772022153607534066 X-GMAIL-MSGID: 1772022153607534066 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 4031f8e2a660..b838944b5f09 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2795,10 +2795,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 Fri Jul 21 17:10: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: 123687 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp79354vqg; Fri, 21 Jul 2023 02:29:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlEB5EYNq7I/dYim0+awfMPIOC4vOj+/s+ZgVRy00iCuchEonBvf3VeQZSp4l5SKbaNY0IZ2 X-Received: by 2002:a67:fd19:0:b0:443:6f2d:d44a with SMTP id f25-20020a67fd19000000b004436f2dd44amr612811vsr.2.1689931745393; Fri, 21 Jul 2023 02:29:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931745; cv=none; d=google.com; s=arc-20160816; b=X/7iIMleAJt4LEokR++kghNbGuDJVU49IgZQtpM52vsIzFQ1Ipxgb2Ayqw0PVpTgM5 Tkcn1w1iA0jc/qEZioyiCQD3UJqtp+j+3tLulmXyDMnT8HJd8xjy0C4kzueMWcHff1DE sRe87Hm2ptSlrmI2qKWQlB6k0lQq6J9ysM4zMxk7SzR8fJxZYzlwDyf1rgSBWh26LNFP c5RzzVPRLFdoOufaaABi8He0fsPEoipVQrFkUAdJC2/mCsBuzp1f2cXxi15vbDpVlPYJ kaEHP84iKYgWL+BG6V99M8U/qUyqhhCmqyStf1nx7DuLYH+mH4I8WTAZtkzUBPZ2M1l8 +D1g== 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=PduGBKBzEMMme8Qrb4uT0OK9MBiITthhGqh6MH8kIdc=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=kSBUsXtyTcJuVJsvh12QKEkfLd+MuxS/mIMjDF/huJK1+keSWCtb8HBbnzVJx3aQwj Sat2FrVTpsxAEHRpA4ENameMDDhn7EpcUIuMiYVB/9z2Ny7YkhIxF62or7d7aZJhb7ms JcQ61vIqfEzr4CFnKkQlBCFJh19dZGVaeIURx8VitJ7Oyv0tf3dT7d5WJ1Z2V6naoAI1 LaBr9k6k0se8X1IO+SmHncvYIHstsGbJPLInalO1RbkBQtK5NMV3+zS89YqLX3Agtl6q UzNJa1txt0mIEiHupO0I1MM/3rOtMy6qu++J9nDwNYQ4W1xt1rFiAFQS2NmjCA9uUDQO ItlQ== 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 a123-20020a636681000000b0055bbc6e2c6csi2493793pgc.491.2023.07.21.02.28.47; Fri, 21 Jul 2023 02:29:05 -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 S231575AbjGUJJs (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231319AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 366F630C2; Fri, 21 Jul 2023 02:09:41 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R6kJx5XJjz4f3kpt; Fri, 21 Jul 2023 17:09:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S7; Fri, 21 Jul 2023 17:09:38 +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 05/10] ext4: remove unnecessary return for void function Date: Sat, 22 Jul 2023 01:10:02 +0800 Message-Id: <20230721171007.2065423-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S7 X-Coremail-Antispam: 1UD129KBjvJXoW7AF18Wr17Xr1UAry5Kr1kAFb_yoW8Gr43pr 4DJF18urs3W3WDuF42gwn8WwnIvw1xWFyDJryIgwnYkFy3ArZ2kFWDtF10gFyfKFZ5uanI vF4qvFW5CF4fu37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772021869899710418 X-GMAIL-MSGID: 1772021869899710418 The return at end of void function is nunecessary, just remove it. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b838944b5f09..78160bf5b533 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4880,7 +4880,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; } /* @@ -5634,12 +5633,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 @@ -5885,7 +5882,6 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) order, lg_prealloc_count); return; } - return ; } /* @@ -6470,7 +6466,6 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, } error_return: ext4_std_error(sb, err); - return; } /** @@ -6573,7 +6568,6 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, } ext4_mb_clear_bb(handle, inode, block, count, flags); - return; } /** From patchwork Fri Jul 21 17:10: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: 123686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp78796vqg; Fri, 21 Jul 2023 02:27:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlFrpRtxUiytkW004ubHoTNjTL8WZ5gqRy7t1ynCh/St7UXDojTmygop6N8fTiSd/843xXVM X-Received: by 2002:a05:6a20:cb:b0:131:a3b1:5677 with SMTP id 11-20020a056a2000cb00b00131a3b15677mr1109589pzh.20.1689931653819; Fri, 21 Jul 2023 02:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931653; cv=none; d=google.com; s=arc-20160816; b=eYBYIk6uBNZqRSq/N3kTfPIrmVYUZTzvq6eHopI3H4o0y+nh0Xtomnx5GqdLPnj5/g O3y3kT1sZpGKuuLegQL8g83eWtI34hn5GQP/7vKXngUZ/PZ0XLx6TZxfq+504LADCTMs Fte664bXvHrUfQWd5D2SJhPLllHpEq4skf9RlgVYMduA1BBcsl56BIeWwEjsLUTFcC/s cpgdT1PQ0sSLK/XPL6hhrDliSGohtZz/+gMWrtdCFt+qrpIfNr1RJvjlQleRQuHMI4RL bHSkndXMSix9AI9qilB/oWh06plVDmPy5/qHrpAZL7dmKVmo6/yxMPcB0l5oAq/iHzaS gLHQ== 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=Z6KxAWVM1q+OTanohiuVuMarMnbUF16ttguRbBDzNfA=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=Zl/8a0pLxjEmaJ+X5aiYLJ9Ektw25bYW888h9V/iUdEZ3CROvOX1bcCx7tieyTX/71 HGVwvVUitEXdg0fo+Qr/9DIqh4jAzMwmDjxbZYUF8+e8ozC6W416rbg9ORd22vJSyXWt UM5tQKQNNZEHRypOkM879GQVvSCCN7TlTbH5OckuT8s8OW8KfHNXNo3habt+Wj5bGFPh 74X+1uyLP0G0UH1Z0xMObIkVDsdeDJpuLIi9pVC5VnxGmof8tNTLqKPg6fjTpq5FuhQN OsYrtSuPPEHuykKsTGVZyKV+HlT6+3bTO/VvI2UrkeAFm+YbKAX8QYHjPWvWB9Hn3QkY oXyA== 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 l9-20020a170903120900b001b5589848absi2777423plh.234.2023.07.21.02.27.19; Fri, 21 Jul 2023 02:27:33 -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 S231639AbjGUJKC (ORCPT + 99 others); Fri, 21 Jul 2023 05:10:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231379AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F33F730C7; Fri, 21 Jul 2023 02:09:41 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R6kJx5yGSz4f3n6L; Fri, 21 Jul 2023 17:09:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S8; Fri, 21 Jul 2023 17:09:38 +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 06/10] ext4: replace the traditional ternary conditional operator with with max()/min() Date: Sat, 22 Jul 2023 01:10:03 +0800 Message-Id: <20230721171007.2065423-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S8 X-Coremail-Antispam: 1UD129KBjvdXoW7GF45XryfGw1kWFy3KFyxuFg_yoWDXFX_Ga 47Ary8Gry3GrWFkFy0vrsYvr409an5try5XrW5tFW8AFyUJ3y0vwnrZr4fGF4xuFWYyrsF ywn3WF97GF1SgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772021774073571516 X-GMAIL-MSGID: 1772021774073571516 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 78160bf5b533..412d335583fe 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6699,8 +6699,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; @@ -6917,8 +6916,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 Fri Jul 21 17:10: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: 123680 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp77302vqg; Fri, 21 Jul 2023 02:23:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGfW9ovVagwrdSl3QEipmK3YWurXonusjV3Oe9P4zo6u7itTXU4aRE8nmiLS7Pwh0ow7hua X-Received: by 2002:a05:6402:608:b0:51b:cee4:fc21 with SMTP id n8-20020a056402060800b0051bcee4fc21mr1022349edv.39.1689931429919; Fri, 21 Jul 2023 02:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931429; cv=none; d=google.com; s=arc-20160816; b=cSp4nXTpQVkKnigLg1imw2TMWTWcVati7kn/565wYZQb6gK9i+5Qw4vNHGhWwzb5VK XRhvACrvsDroco5OEHJ6FvYHs4HUY9zsc55KExsOqA1YXsCMkJMauTc3SBiQn9iBc1uJ bxs5N3snoUvNCgW+khLUDqwE6F50IDUV6k9nZ4VaXyzEqnLKF6AxAP4WiCFZ3ykP5go7 U6pNqnoA1bbDEN8zhMHweB6yrcJyk9Gtx8HrlnxGrqi6U/IxAyL5N8OZllATHXujBGwR mcTgqlmH6MykP910Lsy7CUP8znpXOeVotqSIKFOL3Dz0SLNPJs4XplysxBCJWwnz+Nr9 czjw== 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=HheNxjZEnCe1K2xSNIKlJviFql3SQyE5dd7H7P0cGyg=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=xd9z8125XGcK2a99VFEUVmokDWu7LG15wwpa/cprggj1afMrXS/Cst/+wK3/EVvhgV OHgIL5igt/IgAxYjo53KSccuZ+D1d/mpfwJMvQtD5d+9dh54iNgReRj8a/RGo0OrLPLB KIqSvAEW7PB78Z4IRUe/tHupQ+gsWPzNSEc2pyGBlFNvnlHo6KYW7oShhUYQtkHmepr4 yIbgD2HxE1mgoM7y+2M8mPwyY9EXwqW/ffu5P1OAb3hAC//y0DDGSHL+kEBYo8QT2zIA kjaBZ4jQtd4FeXKni/sFA3JwO0+24m+6Vwp619+nbkXpc51pO6OOW5xQVzaGP+J+3XeD /WEg== 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 y15-20020a056402134f00b0051e1660a34bsi2133153edw.51.2023.07.21.02.23.23; Fri, 21 Jul 2023 02:23: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 S231650AbjGUJJ4 (ORCPT + 99 others); Fri, 21 Jul 2023 05:09:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231360AbjGUJJm (ORCPT ); Fri, 21 Jul 2023 05:09:42 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB45F30C4; Fri, 21 Jul 2023 02:09:41 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJw4R6Rz4f3s67; Fri, 21 Jul 2023 17:09:36 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S9; Fri, 21 Jul 2023 17:09:39 +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 07/10] ext4: remove unused ext4_{set}/{clear}_bit_atomic Date: Sat, 22 Jul 2023 01:10:04 +0800 Message-Id: <20230721171007.2065423-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S9 X-Coremail-Antispam: 1UD129KBjvdXoWruFyUXr1kGF15Zr4kAFy8Grg_yoWfXFb_J3 4Iva1kGryYk3Z7KFs5u3WkJF1ktrnxtr18uFWrJr18uFyYqan8Ar4kCryjvw1rWr45XFy8 Arn2qr1YqFykXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772021538901648262 X-GMAIL-MSGID: 1772021538901648262 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 Fri Jul 21 17:10: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: 123693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp82469vqg; Fri, 21 Jul 2023 02:36:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlEdi1HV/27IxsKQIyK+Te2K7WovmyegOFeLRfXVD8B54mW0m7pjdim/pGpU2xBfEsuOvaji X-Received: by 2002:a17:906:106:b0:986:d833:3cf9 with SMTP id 6-20020a170906010600b00986d8333cf9mr1223465eje.39.1689932168445; Fri, 21 Jul 2023 02:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689932168; cv=none; d=google.com; s=arc-20160816; b=fyNMjWKBLdJ3FBhAozHQEU+OgvfaTXHo8uohOycqTBw9SCahkClvQnzmXXhorFdiNs 6CzYLvA6TfcMb1/zvwkCLU1C7nioq7U1KzlZ53XFqLO8RJIHn7BxOeqK2GAy41QvVhP9 sqqXp5NJ75OWZYYpcbJHKvlK0kasU+pdVBNUor1TH5kmjYR5d0NH2W+/1S3Tqrie0pa3 4Kcgz+PT1bsU/bYrW8qXtuIZGXZx+tC9cnHLTRGJBtudQiHY40GbkKxlmn1j5eSkLhNe TK3cOQ/Kux0SupCz81JqYkiUJjxRd+6CQR/ARomRsDjJj+H8MoPzGGR6GUh+yqwdQ5wj 3sOw== 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=VxBSH+vrvjCNahfAjpGKgMvfiRPTMPo1u7N+uDDjr+U=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=K0bOTiGl+5SoYdKuCYdgWfiUUsn7xlfccSRzNvACQ0oEoYAcyw0QJ56cYeP3wQ6PYH KgR8sewzraGbpyS3dgMjFGOp4cus9jyqBBlGALkFrMyheMeUaw2lryrMyhRr7K/v0WBW mHHrTKpmlWJGVoFej8aPADxF8avyAjCgBAdUzHa0MqOg9Usr2cOwtvuoUmIqzVhzwLGt XjAHklIIfUIIddb957q6OLued9jP0vfY77EpHhZ/eXla2WLqu82kNaH/LmI4C/CGUZ+U LQN7h46pkJAmuDwex7vgzjaOX4S9GxEoRpq+p82vN2Q8+1XuVKpQw4aAStFCss/e06R/ JHTA== 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 b26-20020a170906039a00b00992d262f9f7si2002959eja.933.2023.07.21.02.35.44; Fri, 21 Jul 2023 02:36: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 S231695AbjGUJKL (ORCPT + 99 others); Fri, 21 Jul 2023 05:10:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231407AbjGUJJn (ORCPT ); Fri, 21 Jul 2023 05:09:43 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A19E92D7E; Fri, 21 Jul 2023 02:09:42 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R6kJy46JNz4f3wRh; Fri, 21 Jul 2023 17:09:38 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S10; Fri, 21 Jul 2023 17:09:39 +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 08/10] ext4: return found group directly in ext4_mb_choose_next_group_goal_fast Date: Sat, 22 Jul 2023 01:10:05 +0800 Message-Id: <20230721171007.2065423-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S10 X-Coremail-Antispam: 1UD129KBjvdXoWrZFykAr45Wry5CFWxAFy7KFg_yoWDWFX_Ja 47AFs3AayrAw18G3W09wnYyr48KF4kAr4DXry3tr45X3WUuFWkKw1q9r4rAay7ua1jvryf Gas0qFWxGF4SqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772022313628210925 X-GMAIL-MSGID: 1772022313628210925 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 412d335583fe..6f8e804905d5 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -960,16 +960,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 Fri Jul 21 17:10: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: 123684 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp77601vqg; Fri, 21 Jul 2023 02:24:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlHLpo9T4SkkvBsuG5DB4C2nHzVg5gfsy/+Im8EWNAY9lde61pie0G0dquCBEJp9M3v5QEvu X-Received: by 2002:a50:fa91:0:b0:51e:1692:1111 with SMTP id w17-20020a50fa91000000b0051e16921111mr1043321edr.3.1689931467774; Fri, 21 Jul 2023 02:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931467; cv=none; d=google.com; s=arc-20160816; b=lzs31U/omMSK8m6CMn9ZuJkbET7U0pR/up0YAmcHiICsGPXNCdTUqkoO0vxd/CHlHo jNzTrGdcIfJoP3zVlkaq+FiyGQPZd2MfMeiJBNyMvnllj3Qs/Fw3urS0iHZVyfGEGr0s pPC6HkRJGTQt+iUBIIZ5Doe45w7IIGPAvMwFPKeI9EDzyvu/6CCCL3WaRgcY+fohZ8xC IslwuiFVGZcoxTf4+H6omjLqwssFZINPi+gsoJ1oiv5RCS5ydkQNrSRE6H9ETIccmQDb C2TQOXwE17gd28DqBiYNzVm9suTLbicRQHwn6SoPTZDWPqf35YBtbuD6OWdl/cyukBKy VOpw== 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=a6rlyf5OsSn4vMohd9fdFn0hbfv0Ek+BXiN5b1akbWI=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=KRsKN+TuRESt4d/cY0zTxxYl92GzoznzCixStTQ3/e1IrZ4RiKmvS+318lZzmphtQU uflq+gJfQSRZgiGq/YddpKiTekzkX0+c6NIdhZP93Dz/8EZ/yHbgi8SWJkQkQ+4QM/gn 6QVWCEcGOTHjiDWgHlndS+e7jyMXrTfnn2kXuSRbFpcnO3+xzuLnzmGrzFKWcdKtDj43 e47KiyX8lKLfK34QNHD4eHnP/sgSg8npBXQhgkWjTE4TG96hV96a+RxSemZChoXIRKgw QMF8X41ipiZjHecCr4G7xBiq1Zu+bWvcrZQyfeJIB1K7mbXiHxZQrLCovUQKPsIJJfQ2 grvg== 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 o14-20020aa7d3ce000000b0051df7bb12d4si2035567edr.525.2023.07.21.02.24.02; Fri, 21 Jul 2023 02:24: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 S231643AbjGUJKF (ORCPT + 99 others); Fri, 21 Jul 2023 05:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231403AbjGUJJn (ORCPT ); Fri, 21 Jul 2023 05:09:43 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70EE01984; Fri, 21 Jul 2023 02:09:42 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJx2ck9z4f3q35; Fri, 21 Jul 2023 17:09:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S11; Fri, 21 Jul 2023 17:09:39 +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 09/10] ext4: return found group directly in ext4_mb_choose_next_group_best_avail Date: Sat, 22 Jul 2023 01:10:06 +0800 Message-Id: <20230721171007.2065423-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S11 X-Coremail-Antispam: 1UD129KBjvJXoW7ArykJw1DKF4DJr45ZF4kXrb_yoW8JFWrpr n3WF1I9Fn7W3W5JFsrGaykW3WIkw4xKFy8tryrZw1rJFy3JFWkGanrta40vF97CrWkCFn8 Zw4ktrySkF17u3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772021578707763216 X-GMAIL-MSGID: 1772021578707763216 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 6f8e804905d5..b04eceeab967 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1043,18 +1043,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 Fri Jul 21 17:10:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 123683 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp77543vqg; Fri, 21 Jul 2023 02:24:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlEcDtHZYXewlYtkrfcppOIaNI8F0CkJ8vNuwWgNNvWwARymPldvXo/Sk38f9bLt5BdZAO2L X-Received: by 2002:a05:6402:717:b0:51d:e1d7:319d with SMTP id w23-20020a056402071700b0051de1d7319dmr1236305edx.37.1689931458582; Fri, 21 Jul 2023 02:24:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689931458; cv=none; d=google.com; s=arc-20160816; b=CzVdIRspzg/n8wU0ZconnzPaYXqZ0vaKDqQkhtZzcWMpyT51BCxg+r7wVnyVRPapgj ZT2Wc1iazbwt2YLehoiWDzftZgPyYz2oGADbSOmQHvCEqKfkPxW/iGaI4Jxg/SsPZ3wH kPSd4RyfIDK3if4q+qC4xiwQ5uyoBjJTL3zuQ6Q2XAaj9fmGGWjNKkcOLEpS2Tcg1i6K 2jikx4x1oLA5wAxQPMLd4LIf6fH4lmQYaDsiOhGxttS87nFXg0vd1sSBGa0uxXHFqba6 S46xUgRHXl5OPEVtNcPX9Cm90JGUDy/G9UMJlAyz6OJum7N0pIv3eGKuEOvCifga+UUT 0IkQ== 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=27Nzqrah1zLOAhZ2Ey/0gVNZdx8OwSov1Dt4BP72qi0=; fh=MlGqaUnvBjpXmiP990bdf+mzv9VjPrVaE5OVdv29XYE=; b=FQnm2iWl0c5Bm2n1kkYx4keVOirdCp65yW8NxV1CShfvz0T9ZkK+IgjT/KpH8+qOBL E718ciYIWZEaT4PItom9IDnI4UR9fCkrnpuSlvthrp8YfGmqr1w2XWtvOMIzUmfTca20 LE7jPb36T+TEtYzy55rvX1+EWdbNtaWN6zpwvLaLeya/0V+6GTQcRs5zt210MiWbGroW qvqs4Cd2cWmrQkI4hMWM6EzUwFYvQUVlCo/dThqVlehV7MHE+atNpf2I3/I9WRYL019m ngB+TBCffIvf6uOzXL2HZUYUW6LIFfBHZ4dhnL6MxcZe3CpYrn9bj7HYwYWgq9iD7M2t IMBA== 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 o9-20020aa7c7c9000000b0051e065bbc3csi2059945eds.8.2023.07.21.02.23.54; Fri, 21 Jul 2023 02:24: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 S231621AbjGUJKS (ORCPT + 99 others); Fri, 21 Jul 2023 05:10:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231441AbjGUJJo (ORCPT ); Fri, 21 Jul 2023 05:09:44 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8F1D1984; Fri, 21 Jul 2023 02:09:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R6kJx5GS3z4f3s6V; Fri, 21 Jul 2023 17:09:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFPS7pkqi7fOQ--.527S12; Fri, 21 Jul 2023 17:09: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 10/10] ext4: correct some stale comment of criteria Date: Sat, 22 Jul 2023 01:10:07 +0800 Message-Id: <20230721171007.2065423-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230721171007.2065423-1-shikemeng@huaweicloud.com> References: <20230721171007.2065423-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFPS7pkqi7fOQ--.527S12 X-Coremail-Antispam: 1UD129KBjvJXoWrury8Xr1rGF17Aw4DWFWDXFb_yoW8JrW5pr 13KFyxGF1fXw15ua1Du3WkWw4Dua1xWFyUJrySvr4FvFy3JFWfuayDtFykZry8AFs3Xw1Y yrW5ZFW7G3WUu37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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: 1772021569492695056 X-GMAIL-MSGID: 1772021569492695056 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 b04eceeab967..e30494f3d289 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2778,8 +2778,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; @@ -2836,8 +2836,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 ||