From patchwork Tue Mar 21 16:12:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1650699wrt; Tue, 21 Mar 2023 01:14:02 -0700 (PDT) X-Google-Smtp-Source: AK7set+EKTuI6zAWGfbuCmC9+Cgrm57xB2tLLyrxRzReZKbAiwD1bV/n+0Up42ghlDO4fszD47YR X-Received: by 2002:a17:90a:191:b0:237:3dfb:9095 with SMTP id 17-20020a17090a019100b002373dfb9095mr1826220pjc.6.1679386442512; Tue, 21 Mar 2023 01:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386442; cv=none; d=google.com; s=arc-20160816; b=nfb0SSK0mP/UcU4dDdkLixzpnmSuSyuX+kSoypfdhFnkrsaR09KSjgNPn1tqAYcic9 hTOYgf7grWklguIPwuBUtNWDazSS6aapIwlrZi5ti3Crnl4dTN4OevCvWHUtdswPmb7m PFHf39IDf0S27GTksd1noMnh7/lNYT+BXvHO+pl2hCCg0ftK2ns716UmuRKIzFLPeUt0 TbtnRh3wVrwqxBrh4n3/zxqsHkrWwhig4iHnoiIBs1YdrGwPhbcEYOhAuYPA3KHXCb9W /FJJBvc4gV2BKR/7xqfSVrF3jVyTTcy8gEa9yoWcuJJYIu+lk0BpDD/YHpdDgrs6kXgs 6s8Q== 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=FJ4eADdiMJmm7bPCqxzvpD93LB/+kNiefPJIH/I6ahg=; b=hFGGSgHlNWlsDHDibcH0q2Dgk7ftulj6X6RX70b8wBZz0EHfvA85c4QEjqrNxCQbjf RpO1jFeopewOA+Y94t3HU9w1CWhkIMMNpT9ykjXVzuCktNxYfHLrfAOqJQhjXZOprT9g 6YmZ7EFKQwnvS0gEvw65fk45aC6xsfI7TauPpgV0+epsW3jaAbbWqygy5VpwlTprRrRn uhx8hvdHWL6hOvujf/9XquVnuYPQgFISVK3EPLrsUgnXMarqkekBJyafj/5io81xEKYA xIgXcovk5niNTRmqb54RhP3EFwGSIFgcXmL9shhpj0SIq8U4Y2HSzz/GfZh6hkb2SZMh tGcg== 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 bs185-20020a6328c2000000b0050f692470fasi7245719pgb.301.2023.03.21.01.13.46; Tue, 21 Mar 2023 01:14:02 -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 S230512AbjCUIKC (ORCPT + 99 others); Tue, 21 Mar 2023 04:10:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230335AbjCUIJd (ORCPT ); Tue, 21 Mar 2023 04:09:33 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6064A1BAD7; Tue, 21 Mar 2023 01:09:29 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgkln3yQVz4f3pCM; Tue, 21 Mar 2023 16:09:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S10; Tue, 21 Mar 2023 16:09:27 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ojaswin@linux.ibm.com, shikemeng@huaweicloud.com Subject: [PATCH 8/8] ext4: try all groups in ext4_mb_new_blocks_simple Date: Wed, 22 Mar 2023 00:12:20 +0800 Message-Id: <20230321161220.418652-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230321161220.418652-1-shikemeng@huaweicloud.com> References: <20230321161220.418652-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbEzZhlk+NQhFw--.4478S10 X-Coremail-Antispam: 1UD129KBjvJXoW7ur13Kry7uF1DAFyDurWrAFb_yoW8Ar48pr sxCF18Kr1fWFnF9anFg34Sq3WxJw1I9F4UWryfC34rGrZrXryfJFsrKF1Yya1jyFZ3X3ZI vr4Yvry3Aa1jgaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760964318063955148?= X-GMAIL-MSGID: =?utf-8?q?1760964318063955148?= ext4_mb_new_blocks_simple ignores the group before goal, so it will fail if free blocks reside in group before goal. Try all groups to avoid unexpected failure. Search finishes either if any free block is found or if no available blocks are found. Simpliy check "i >= max" to distinguish the above cases. Signed-off-by: Kemeng Shi Suggested-by: Theodore Ts'o Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5b837918c624..ee564e700278 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5796,7 +5796,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, struct buffer_head *bitmap_bh; struct super_block *sb = ar->inode->i_sb; struct ext4_sb_info *sbi = EXT4_SB(sb); - ext4_group_t group; + ext4_group_t group, nr; ext4_grpblk_t blkoff; ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb); ext4_grpblk_t i = 0; @@ -5810,7 +5810,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, ar->len = 0; ext4_get_group_no_and_offset(sb, goal, &group, &blkoff); - for (; group < ext4_get_groups_count(sb); group++) { + for (nr = ext4_get_groups_count(sb); nr > 0; nr--) { bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { *errp = PTR_ERR(bitmap_bh); @@ -5834,10 +5834,13 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, if (i < max) break; + if (++group >= ext4_get_groups_count(sb)) + group = 0; + blkoff = 0; } - if (group >= ext4_get_groups_count(sb) || i >= max) { + if (i >= max) { *errp = -ENOSPC; return 0; }