From patchwork Tue Mar 21 16:12:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72743 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1649704wrt; Tue, 21 Mar 2023 01:11:22 -0700 (PDT) X-Google-Smtp-Source: AK7set8fW8eLF+Mk8AedoNk+UIHe+39fUuaEjRQ3xkcSusH1JSrxBwprLaNUn8DzyMUM8koA6Va8 X-Received: by 2002:a05:6a20:7b05:b0:cb:77f0:9a42 with SMTP id s5-20020a056a207b0500b000cb77f09a42mr1316390pzh.33.1679386282540; Tue, 21 Mar 2023 01:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386282; cv=none; d=google.com; s=arc-20160816; b=f4xXStmwimFfklCxqHERHOlGWgLXDojyNRCb6tG5DdcmKWlqDWqbYlGkA32VD7AyBj ZC2YllLWUPF0wbsqrsPDgXoAZTGeHnaSa1XbcDRQC4/u4djpBr4tQbjYfdbz/Dsepc7Z JDKcfvXQQ9ay4/O/qxM8lJ2F9jqUt/cYRGeIfGg+SvA5PmzgOs65H2y8FCE+TZHi5SOP lUQNk3ox+Grewjd6iQaRQBkFRaABZgJPfC10TSGwdb84WU9sJlv4wCtDiOaqHHzKoi5Q Ut5FgPdBblOZdcu3CdVATzTe6r/dYZ8KiHj4HWREBZrg1XHFfTIPr+vrEOmFeWAlV7gG XBpw== 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=vhj3hWmDqREjhFJySHTcGmx7P493Uu48qh0Ys6ZHlgY=; b=ksZMQ/JEbj8hA5c58czf5r1vEs4We7pKZwEzbjkeZoa7a+2oWsDDbavic47BNAVqKw dMqCqfz7QeO7aV5uMd6QDYT4bn3ebhk0H89BCn6jAFVzuk8c1CxCHcaDdg38OTpP2SXk 33N3YpOmiFA2bseTEe0zkCpDYJUpmVsUnDAtWP1rYBNWVGDIg1q7GvvDsp21x0GLer5N 8n/sb8Yy7JRa/qJ6LDgn/MZ6qHFG3GQYQKbS4xGAaAyClzrLKnNcJjz1SgXMAEJZtmeM fh3OibNRUxZ4+ofEYIlfIorSlG2OfeEDP4XCPVFhd56dx2Pq3ZMphNoyCJP5ADg3thaL t2vQ== 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.11.07; Tue, 21 Mar 2023 01:11: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 S230171AbjCUIJm (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230302AbjCUIJb (ORCPT ); Tue, 21 Mar 2023 04:09:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED29C3C2E; Tue, 21 Mar 2023 01:09:27 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgkll27nGz4f3pBY; Tue, 21 Mar 2023 16:09:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S3; Tue, 21 Mar 2023 16:09:24 +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 1/8] ext4: fix wrong unit use in ext4_mb_normalize_request Date: Wed, 22 Mar 2023 00:12:13 +0800 Message-Id: <20230321161220.418652-2-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--.4478S3 X-Coremail-Antispam: 1UD129KBjvdXoW7XF17Jw43uF4rJr4kCryUJrb_yoWftrX_XF yjyrn7WFWrJw1aka1Syw4ftryrt3W8JFnrZr43ZrWxuF1UWFWfua4qyF95C3yxG34Utay3 K34rZr1fWF4FgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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, 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?1760964150903740720?= X-GMAIL-MSGID: =?utf-8?q?1760964150903740720?= NRL_CHECK_SIZE will compare input req and size, so req and size should be in same unit. Input req "fe_len" is in cluster unit while input size "(8<<20)>>bsbits" is in block unit. Convert "fe_len" to block unit to fix the mismatch. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 63a68cee36c6..6318c763a239 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4056,7 +4056,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, start_off = ((loff_t)ac->ac_o_ex.fe_logical >> (22 - bsbits)) << 22; size = 4 * 1024 * 1024; - } else if (NRL_CHECK_SIZE(ac->ac_o_ex.fe_len, + } else if (NRL_CHECK_SIZE(EXT4_C2B(sbi, ac->ac_o_ex.fe_len), (8<<20)>>bsbits, max, 8 * 1024)) { start_off = ((loff_t)ac->ac_o_ex.fe_logical >> (23 - bsbits)) << 23; From patchwork Tue Mar 21 16:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1649379wrt; Tue, 21 Mar 2023 01:10:36 -0700 (PDT) X-Google-Smtp-Source: AK7set/6mdsjuFasZJWysaZihhkxLJiDeW56Zoo0rnUXnqN5mHcIIFLkUB0kCaavqQnUBFhpB0Gi X-Received: by 2002:a17:90b:1644:b0:23e:feef:38ef with SMTP id il4-20020a17090b164400b0023efeef38efmr1825369pjb.41.1679386236488; Tue, 21 Mar 2023 01:10:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386236; cv=none; d=google.com; s=arc-20160816; b=kRH/Ei12dcTjkywaDbF90qK/91Ml+PXVDA0h9zREfUNHLbytwcHz8VpZpZBmaYzQmy spvvdHVFaKHvMNrQZ5SbcNdEhU8ocee8KTHjN2dZO2cA/lg01crgKgIPxIdJvfwPmpGD 7dgCLhlHWKnT/+z9zOHxh+XxZWjNLQU+SJ0ljP5XfxjZacZLwHf9uLukc2tqvobMpGnM /xmdw+mEVCY/5jKdAZU54Qpiqn/9JiCku8aEQiR4cKsqO9oEQ3zhgR7KlUu6QWUoB4MY JNMc4hAAzbESO8L3ulg6VCNBXEUP+RGl/9wFDXZyIv+8e7/oViSt/wQSGKBd/O7WNWju t/lw== 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=FU0z9T0T8IwfT5aTM3ROhj1WD4YCrO+lzYzL4cC9QgU=; b=05yGjlLCRqIvETPszWRMUzM5wLVbEd9tk5sImCNZAW3E4sTpFo6Mhb/36xHxkR2HTr 9piJhvD1Y/sMkusfYgRxmpDqY1V9pAQ8w3Y1XnhCsVfu6ngZ0rDxGvsnMaIGqbyUHuk5 htb8c8AooViImf0xbfh2LFAt6GMo5lLplGZcWvsbMTFdLVXgiSMQqBdlWYmJLGQuFH8D z9bG9gmxuhg5bz9PHthVvGD19M4ExysLrEiAValv8DV6CPaCc68g9L4G5qm3AXdv8Ftj pC+KLK8t2gASZJ8uSuM1VC83t1bOs6f15yjTJEMJfzHVMNuto5HLZfF/JJ/q/ACwCqCG DY4A== 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 o12-20020a1709026b0c00b001a1799a0db6si12541551plk.63.2023.03.21.01.10.21; Tue, 21 Mar 2023 01:10: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 S230427AbjCUIJh (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjCUIJb (ORCPT ); Tue, 21 Mar 2023 04:09:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE80A305D7; Tue, 21 Mar 2023 01:09:27 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgkll5T8lz4f3tpw; Tue, 21 Mar 2023 16:09:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S4; Tue, 21 Mar 2023 16:09:25 +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 2/8] ext4: fix unit mismatch in ext4_mb_new_blocks_simple Date: Wed, 22 Mar 2023 00:12:14 +0800 Message-Id: <20230321161220.418652-3-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--.4478S4 X-Coremail-Antispam: 1UD129KBjvJXoW7tw1DGw1rWFyDKr18tFW5ZFb_yoW8GF13pw sIyF10kr1fWr1Dua17u3ySqw1fZ34xur47XrWfu34rWrWxXryxGFs3tF1rtF1rtFZxZ3ZI qr15Zryruw48G3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s 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, 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?1760964102666556774?= X-GMAIL-MSGID: =?utf-8?q?1760964102666556774?= The "i" returned from mb_find_next_zero_bit is in cluster unit and we need offset "block" corresponding to "i" in block unit. Convert "i" to block unit to fix the unit mismatch. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 6318c763a239..7f695830621a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5761,6 +5761,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_grpblk_t blkoff; ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb); @@ -5789,7 +5790,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, if (i >= max) break; if (ext4_fc_replay_check_excluded(sb, - ext4_group_first_block_no(sb, group) + i)) { + ext4_group_first_block_no(sb, group) + + EXT4_C2B(sbi, i))) { blkoff = i + 1; } else break; @@ -5806,7 +5808,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, return 0; } - block = ext4_group_first_block_no(sb, group) + i; + block = ext4_group_first_block_no(sb, group) + EXT4_C2B(sbi, i); ext4_mb_mark_bb(sb, block, 1, 1); ar->len = 1; From patchwork Tue Mar 21 16:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72746 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1653140wrt; Tue, 21 Mar 2023 01:21:02 -0700 (PDT) X-Google-Smtp-Source: AK7set8ZHysy8oIVARARe89S2PpF855ro/okXHCVIUc411NIiZchzrndUevjWPR1UASudSgzCIlv X-Received: by 2002:a17:903:7cd:b0:1a0:4ebd:15d5 with SMTP id ko13-20020a17090307cd00b001a04ebd15d5mr1214230plb.67.1679386861886; Tue, 21 Mar 2023 01:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386861; cv=none; d=google.com; s=arc-20160816; b=k3cJwnH+DKXRdP8rOput3q+VOAnluNuPPQ4oVypUcxHEe8BUwfmebm2erBfOLV13x0 p3MLSnW95WpPIlxdLp0T0yIuY3YC5RyAzvKY9wQQHBcYcm3Zm3QgHzjgmc++Di6ryjfH 86myzyh3ImHedimIXFX2wfmNIK3gbYrUo1g/X6liDTYo/yDomYltiNPVy8O56Q4+5TCX Mm4ALW3Kky0FYGZkP09KC+MooHWzLMuPw34N+EEQ6aDLCpaUmGYNfyPXQXk6EsEKV2Gz pmxF7pcoqH9A0y5rwioVN3ku+i+peLpwMf277nOkAW+YN+dHIh39hA3yxtcipXvMMNYj bBUQ== 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=a8GJSZvNkP45/MwrUw15gq3ah4mkPmilQlLnwUMUFr4=; b=VkDIHAikVtJbnacmQZDUMDs3bD+jieZzFRRqWOg4Jd4Og3f201q4iOYisgSquP/o28 NJKDzlTEsZu9dw1E174+A3trf5ejIrXwgRhblbZlXmmISaSfElFl2v/jWfSHKf/Wbsa3 s7xsl+MDqBTbe5N7jMiS9yyO8cNLFWONcNLs4ReDyr4Ld8cLJ+Zz8OUhqbxi/YCDYvhB kSMg8P+G6LKyxiysFmgVmm2ODEv8AzBVPfpyXWwAK5ikOtOlA7lauYO5bs+fe2gC3Rqu xJ1B9FGzFWGTZjBFYEzmiFX9FRzwcPrcA48aWsOIjJZLyxC+TKGvqT+RSKAU/1dGQF5V e6dg== 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 x26-20020a63171a000000b005077dda0477si13035101pgl.802.2023.03.21.01.20.48; Tue, 21 Mar 2023 01:21:01 -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 S230358AbjCUIJd (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230298AbjCUIJb (ORCPT ); Tue, 21 Mar 2023 04:09:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EB2F1ABC5; Tue, 21 Mar 2023 01:09:28 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgklm0lw2z4f3vdV; Tue, 21 Mar 2023 16:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S5; Tue, 21 Mar 2023 16:09:25 +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 3/8] ext4: fix wrong unit use in ext4_mb_new_inode_pa Date: Wed, 22 Mar 2023 00:12:15 +0800 Message-Id: <20230321161220.418652-4-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--.4478S5 X-Coremail-Antispam: 1UD129KBjvdXoW7JrWUKw47uF4kZry7GryUWrg_yoW3Zrc_Ca 1DCr4IvFyrtr1I9a1Syay8Ar9YgF1kJr4jqr45try3ZF18ur42kwsFvr45XayxGry7A3sx G3WYgr1FgF1S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR HMKAUUUUU 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?1760964758008718677?= X-GMAIL-MSGID: =?utf-8?q?1760964758008718677?= fe_logical and win are both in block unit. Remove wrong convertion for win from block unit to cluster unit. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 7f695830621a..86d978e1f7dc 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4640,8 +4640,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) if (offs && offs < win) win = offs; - ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - - EXT4_NUM_B2C(sbi, win); + ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - win; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); } From patchwork Tue Mar 21 16:12:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1649748wrt; Tue, 21 Mar 2023 01:11:27 -0700 (PDT) X-Google-Smtp-Source: AK7set+zwc8Y1UQwvFmgru1Wib8e42IPNMb6xD+7fkwTIKgh3a1sqny0INN5HZx5phU0rLeLsa5z X-Received: by 2002:a17:903:2288:b0:19e:d60a:e9e with SMTP id b8-20020a170903228800b0019ed60a0e9emr1726278plh.42.1679386286948; Tue, 21 Mar 2023 01:11:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386286; cv=none; d=google.com; s=arc-20160816; b=LOPp/nprWxbTRVWLnFxfCZF7wvxYZ2Fr7BvveduxHawvksVTRwRIg5lBBgL2LIWOi3 wtovb+I3DgTKqKei73m2NFNFp8J/4gdPGj8z04/Ihkiwdxu+oS5U98sAECvHqO3+wgcf v6/aaPSZVSkt9fBo80jo5mW+WT4RjNpM6YQLkNlle6S+kBVYfat04+WqvcppjLtdqms2 OSVsqH/0CWqYAI6J2t6r4+1ztXKmBzNfkBsHoEAgdKO7lo0g3zhuf/XsSRrb2LAJrgC0 htamXAnBum+PsFftCc3Wp8iobHetS0JtFC3ZsmYdEKMTZMS4OiD1+c/m+2rU3Qis9YHx kuDQ== 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=oD2a61kyQpTiaDtz74ir4UXZu/o68SapyCAIyWivtpg=; b=uYvhnB3wZmk7Xh72deaFly/SolB1RdsIPLVJE6DucD/npkzZoaQ9mTtPN764+if1qz Rr+H1WULzDfC+rOT8D1IBEB1qIrouXQrnlPkjm28YuQQd3dZP6pyCVqincnppuGtaKhm PhQZQIvpPvO2ma1BkMxsAmsxm9npV2/Kw1G3WoIpx9UFCgDrgaLLBvwyFD+R5ZDToX6v VA2JIoYHYa3eRLWCaJsfNJvPW5HnY0Z8GZkVnnVOcG+9rx6NaGfx05nptzyP4KiNz4o9 AtfMWXYIieFFKwKIHsvMY5OmAaMG9cmm/M6LwdWJNecvJrkX8NAME7HjQjMDxiDYQcxg BCHw== 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 i5-20020a17090332c500b001a05f8ed0cbsi14592167plr.589.2023.03.21.01.11.12; Tue, 21 Mar 2023 01:11:26 -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 S230492AbjCUIJp (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229924AbjCUIJc (ORCPT ); Tue, 21 Mar 2023 04:09:32 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FBF42055A; Tue, 21 Mar 2023 01:09:28 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Pgklm0tWhz4f3jMs; Tue, 21 Mar 2023 16:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S6; Tue, 21 Mar 2023 16:09:25 +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 4/8] ext4: fix wrong unit use in ext4_mb_find_by_goal Date: Wed, 22 Mar 2023 00:12:16 +0800 Message-Id: <20230321161220.418652-5-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--.4478S6 X-Coremail-Antispam: 1UD129KBjvdXoWrZFW5uw48CF15CF1rAr1UKFg_yoWfArg_Ga 1DArWkGFWftwn5C3WFyw4rtFnaga18Jr12gFWrtr15XF1DWr40k3Wqyr43Zrs7Wa1jqa9x Krn8Xry8GF1F9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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, 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?1760964155342745160?= X-GMAIL-MSGID: =?utf-8?q?1760964155342745160?= We need start in block unit while fe_start is in cluster unit. Use ext4_grp_offs_to_block helper to convert fe_start to get start in block unit. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 86d978e1f7dc..9a40e165e7d2 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2181,8 +2181,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, if (max >= ac->ac_g_ex.fe_len && ac->ac_g_ex.fe_len == sbi->s_stripe) { ext4_fsblk_t start; - start = ext4_group_first_block_no(ac->ac_sb, e4b->bd_group) + - ex.fe_start; + start = ext4_grp_offs_to_block(ac->ac_sb, &ex); /* use do_div to get remainder (would be 64-bit modulo) */ if (do_div(start, sbi->s_stripe) == 0) { ac->ac_found++; From patchwork Tue Mar 21 16:12:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1653142wrt; Tue, 21 Mar 2023 01:21:02 -0700 (PDT) X-Google-Smtp-Source: AK7set9MkqqhdlP4kvaKu1isyK1VRxdKomHqtp9UmuWSRvKfHLETv3denr7z3Mo9Qqk2CyfcskPD X-Received: by 2002:a05:6a00:4287:b0:625:524b:9712 with SMTP id bx7-20020a056a00428700b00625524b9712mr14204893pfb.2.1679386861987; Tue, 21 Mar 2023 01:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386861; cv=none; d=google.com; s=arc-20160816; b=xHyF6xJjhy+Vxcmqij8LUMani4mbMOV3kE1nyezuhg9+uTn92NY+fY/3fXYcXzes8y TClrHndOMxhcsezkd0xVon4BdvsIw4bmereUXAotgL0teSDdWit4Bwb3XNcbiYDzBuPj QNIgItnOj1g5b5I/N5drwl9Itsj0QFkxTRnUyx/3jfMLxzv1JWkOomHbVVT8G74FPrgj 7BSkKcnRnjJVWOzc+slM9XfuubscyRdlfEvh/7ye3BNAOaaOHlYwd4ZME5FQ8jOXygrh +46/6srDio7S71dxVWFCzEu+4+JBlS57/SNCjmBLvjMLcQUz45ByKNBIqwoA1RAOeKjS o8VA== 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=+b5nnwZGLdNCv4as3iXVbFSOPykoYo2qEIpqzMuM1SY=; b=kXFQkyETlxCz4+Wir/F/LH8ig50C0qGLOclZc4nAykvuOda79nz+pxVo5pHwdP/z2N IY1E3SDkLPtM5WzLQZxcABRw1kCDxhyHNBm7L98U4RyhEpttAf3xmdwwmVFMWDG4oV7z YuVR0be87J2z8GzmREkTGWU2WCYIuOK+G8rnx6Ud+cPPF40B8SuHloCYs78Y3ZbMk4y3 7kRWIbBHxrmt6RTn0qXL6NYqgaEFeZmOR3zLuv/l9+fTOMwq+40EHlFtImR4dSxR9JOI bJRCJSgOlQyRwkvwfWkjywtJLtoeUnR2UO1ftRtb/mOsz3yjWUQrRZt5lh/SHDRjq07D ildw== 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 h1-20020a056a001a4100b00622ae306420si5821921pfv.279.2023.03.21.01.20.48; Tue, 21 Mar 2023 01:21:01 -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 S230510AbjCUIJ7 (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230329AbjCUIJd (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 3E5F33CE10; 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 4Pgklm5M73z4f3vf9; Tue, 21 Mar 2023 16:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S7; Tue, 21 Mar 2023 16:09:26 +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 5/8] ext4: treat stripe in block unit Date: Wed, 22 Mar 2023 00:12:17 +0800 Message-Id: <20230321161220.418652-6-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--.4478S7 X-Coremail-Antispam: 1UD129KBjvJXoWxCFWfXr15ZFW3Cw4rAFy8uFg_yoWrJw43pr 1fAa1UtF1UWr1v9a17Wwn8Wr1fK3y8uryUJ3yxur1UWry2qFWfCF9Fq3WYyF97Xrs7WFyS v3yqvw17GrZrK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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, 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?1760964757963771496?= X-GMAIL-MSGID: =?utf-8?q?1760964757963771496?= Stripe is misused in block unit and in cluster unit in different code paths. User awared of stripe maybe not awared of bigalloc feature, so treat stripe only in block unit to fix this. Besides, it's hard to get stripe aligned blocks (start and length are both aligned with stripe) if stripe is not aligned with cluster, just disable stripe and alert user in this case to simpfy the code and avoid unecessary work to get stripe aligned blocks which likely to be failed. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 18 +++++++++++------- fs/ext4/super.c | 13 +++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 9a40e165e7d2..b963111eeec6 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2178,7 +2178,8 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, ac->ac_g_ex.fe_len, &ex); ex.fe_logical = 0xDEADFA11; /* debug value */ - if (max >= ac->ac_g_ex.fe_len && ac->ac_g_ex.fe_len == sbi->s_stripe) { + if (max >= ac->ac_g_ex.fe_len && + ac->ac_g_ex.fe_len == EXT4_B2C(sbi, sbi->s_stripe)) { ext4_fsblk_t start; start = ext4_grp_offs_to_block(ac->ac_sb, &ex); @@ -2343,7 +2344,7 @@ void ext4_mb_scan_aligned(struct ext4_allocation_context *ac, struct ext4_free_extent ex; ext4_fsblk_t first_group_block; ext4_fsblk_t a; - ext4_grpblk_t i; + ext4_grpblk_t i, stripe; int max; BUG_ON(sbi->s_stripe == 0); @@ -2355,10 +2356,12 @@ void ext4_mb_scan_aligned(struct ext4_allocation_context *ac, do_div(a, sbi->s_stripe); i = (a * sbi->s_stripe) - first_group_block; + stripe = EXT4_B2C(sbi, sbi->s_stripe); + i = EXT4_B2C(sbi, i); while (i < EXT4_CLUSTERS_PER_GROUP(sb)) { if (!mb_test_bit(i, bitmap)) { - max = mb_find_extent(e4b, i, sbi->s_stripe, &ex); - if (max >= sbi->s_stripe) { + max = mb_find_extent(e4b, i, stripe, &ex); + if (max >= stripe) { ac->ac_found++; ex.fe_logical = 0xDEADF00D; /* debug value */ ac->ac_b_ex = ex; @@ -2366,7 +2369,7 @@ void ext4_mb_scan_aligned(struct ext4_allocation_context *ac, break; } } - i += sbi->s_stripe; + i += stripe; } } @@ -2727,7 +2730,8 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) if (cr == 0) ext4_mb_simple_scan_group(ac, &e4b); else if (cr == 1 && sbi->s_stripe && - !(ac->ac_g_ex.fe_len % sbi->s_stripe)) + !(ac->ac_g_ex.fe_len % + EXT4_B2C(sbi, sbi->s_stripe))) ext4_mb_scan_aligned(ac, &e4b); else ext4_mb_complex_scan_group(ac, &e4b); @@ -3441,7 +3445,7 @@ int ext4_mb_init(struct super_block *sb) */ if (sbi->s_stripe > 1) { sbi->s_mb_group_prealloc = roundup( - sbi->s_mb_group_prealloc, sbi->s_stripe); + sbi->s_mb_group_prealloc, EXT4_B2C(sbi, sbi->s_stripe)); } sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f226f8ab469b..0a5bf375df5c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5231,6 +5231,19 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) goto failed_mount3; sbi->s_stripe = ext4_get_stripe_size(sbi); + /* + * It's hard to get stripe aligned blocks if stripe is not aligned with + * cluster, just disable stripe and alert user to simpfy code and avoid + * stripe aligned allocation which will rarely successes. + */ + if (sbi->s_stripe > 0 && sbi->s_cluster_ratio > 1 && + sbi->s_stripe % sbi->s_cluster_ratio != 0) { + ext4_msg(sb, KERN_WARNING, + "stripe (%lu) is not aligned with cluster size (%u), " + "stripe is disabled", + sbi->s_stripe, sbi->s_cluster_ratio); + sbi->s_stripe = 0; + } sbi->s_extent_max_zeroout_kb = 32; /* From patchwork Tue Mar 21 16:12:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72748 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1653750wrt; Tue, 21 Mar 2023 01:22:54 -0700 (PDT) X-Google-Smtp-Source: AK7set/zeAKc59rqjhDpPPG8/g3w6e8qu9L41yBL8dt9EB56wflh3BjBl2btY47cnkPeTvmGeTXi X-Received: by 2002:a17:90b:1e0f:b0:23f:d7ea:6212 with SMTP id pg15-20020a17090b1e0f00b0023fd7ea6212mr1613469pjb.38.1679386974327; Tue, 21 Mar 2023 01:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386974; cv=none; d=google.com; s=arc-20160816; b=Ai2XaZentsZle6PWDqfn3Pw75L7Fz7/hc6ngJmwEXp6vd7+CC4E6D8wc+57YlMkfu2 VXcD++F6AqXG5xLYO4CPUMxHBfFgIa6xF3CLrwkb5Lm3fMLKXt9WBfNiLuiy7HRWlW5h u9SGhDGGQTawGO2CO6ysza2exNqdImfpjaf3NJxeE7X2eBRGrne2UQtBXGaXKXADs81V QSqU4fnVyvTfORiob1TTuMfwvA/N6idd/MI1U05oks0Ac9MHI7BF3cjg2AJ1zHGWebOM ArHrNmFY8Y7/AMI0Faayz0c1Q/Lu0KeZ2rpY8bW/0xkfP0zujtbB0ahv6/R+Oae1UyHe TFsA== 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=lUVMWNTnXFB2vTnFJhSzr2IcD93B18ego3bTD+JxL9c=; b=tbv8Qbt9jS1T+W6QI6/orpUcK2VNFMyX5k5QRT6wbNs95SlosoRDYxLorkh7YO8wm7 hNfANgdSEARcZh0W74VxHaN/ugoVOF4AZ787kTffuPGnmYOkTQVzBpu+YY6AxM/En77C pTHb0iRhrvcDA8qGrlm2+PxUnZy6qFcGMLEGOMsU75+LlhbOSY6uIpEKoL+npSQGpuCX UNUerjIbqBgp5rb60pr54mFafvjEojg5yVBIIo5HNyn5y1i+FXAOxeFLq+R3p228K8C/ b95F2ck2Vi4VWudOsJk6j1fBj8YBkJuNWm1Kc9uo9AEekN/SHr5890VWXbSEITNYNCsn htew== 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 ot17-20020a17090b3b5100b0023b54bedd5csi20391413pjb.137.2023.03.21.01.22.42; Tue, 21 Mar 2023 01:22:54 -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 S230476AbjCUIJz (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230325AbjCUIJd (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 40F1E3CE35; 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 4Pgklm6Vx0z4f3pCJ; Tue, 21 Mar 2023 16:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S8; Tue, 21 Mar 2023 16:09:26 +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 6/8] ext4: add EXT4_MB_HINT_GOAL_ONLY test in ext4_mb_use_preallocated Date: Wed, 22 Mar 2023 00:12:18 +0800 Message-Id: <20230321161220.418652-7-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--.4478S8 X-Coremail-Antispam: 1UD129KBjvJXoW7tr18JFy3uFy5ur1rtr1DJrb_yoW8tw47pF W3JF1YkrnIgwn7Wws3Ww15Gw1rKw48K34rJrySgr1rZrWxGrsrCanrt348uFyqyr4rZFn8 ZF4Yvay7Gr4Ik3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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, 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?1760964876301222771?= X-GMAIL-MSGID: =?utf-8?q?1760964876301222771?= ext4_mb_use_preallocated will ignore the demand to alloc goal blocks, although the EXT4_MB_HINT_GOAL_ONLY is requested. For group pa, ext4_mb_group_or_file will not set EXT4_MB_HINT_GROUP_ALLOC if EXT4_MB_HINT_GOAL_ONLY is set. So we will not alloc goal blocks from group pa if EXT4_MB_HINT_GOAL_ONLY is set. For inode pa, ext4_mb_pa_goal_check is added to check if free extent in found inode pa meets goal blocks when EXT4_MB_HINT_GOAL_ONLY is set. Signed-off-by: Kemeng Shi Suggested-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b963111eeec6..5b837918c624 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4351,6 +4351,37 @@ ext4_mb_check_group_pa(ext4_fsblk_t goal_block, return pa; } +/* + * check if found pa meets EXT4_MB_HINT_GOAL_ONLY + */ +static bool +ext4_mb_pa_goal_check(struct ext4_allocation_context *ac, + struct ext4_prealloc_space *pa) +{ + struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); + ext4_fsblk_t start; + + if (likely(!(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY))) + return true; + + /* + * If EXT4_MB_HINT_GOAL_ONLY is set, ac_g_ex will not be adjusted + * in ext4_mb_normalize_request and will keep same with ac_o_ex + * from ext4_mb_initialize_context. Choose ac_g_ex here to keep + * consistent with ext4_mb_find_by_goal. + */ + start = pa->pa_pstart + + (ac->ac_g_ex.fe_logical - pa->pa_lstart); + if (ext4_grp_offs_to_block(ac->ac_sb, &ac->ac_g_ex) != start) + return false; + + if (ac->ac_g_ex.fe_len > pa->pa_len - + EXT4_B2C(sbi, ac->ac_g_ex.fe_logical - pa->pa_lstart)) + return false; + + return true; +} + /* * search goal blocks in preallocated space */ @@ -4387,7 +4418,8 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac) /* found preallocated blocks, use them */ spin_lock(&pa->pa_lock); - if (pa->pa_deleted == 0 && pa->pa_free) { + if (pa->pa_deleted == 0 && pa->pa_free && + likely(ext4_mb_pa_goal_check(ac, pa))) { atomic_inc(&pa->pa_count); ext4_mb_use_inode_pa(ac, pa); spin_unlock(&pa->pa_lock); From patchwork Tue Mar 21 16:12:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1655555wrt; Tue, 21 Mar 2023 01:28:32 -0700 (PDT) X-Google-Smtp-Source: AK7set9KhnWwbx7ze1kEqbbXaiLRlREDaRJXSqFmx5Cy/ZMXaOR9JunfDCwB872zNZWaYulGNNAh X-Received: by 2002:a05:6a20:2a2a:b0:da:d9e7:9a5d with SMTP id e42-20020a056a202a2a00b000dad9e79a5dmr293804pzh.4.1679387312143; Tue, 21 Mar 2023 01:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679387312; cv=none; d=google.com; s=arc-20160816; b=zUtX4VmNYbh9oU/LyRPAbpjk65H9Own/d98bNh7OvpQdpmRLeTIPPLCyNdvHnEBgQB rkxXNc1kv0xHq3erpnEw4MfqsTDyScmiKG2ib9ynHLjB5lWBJhPosqOsm6TfgmUaNC04 i4xvCT+bw/FWjiPlxhHGDr1XuNNJMxt9Yo0dO+VGsP3loCEOz6O8ZNDzIilYHvBDWk4t Z3g3C5QQJxFaiQoyMfbZaYIStnwrZB/+N78ciFiKPQBuND+Yx8b8UyuR+15xEJkkc/cm nM7071FG2o8gTWmj2J6YTtYUzWWkKOiKd53mebirTXkVk8bPz9+sv1Yy6YmmEsNAWAys HxyQ== 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=LS5jwSxAuZbifPf69jmbBdowoq6ZvW4Mpj9bfjpuAOc=; b=dtS4vAKj/HDcrDoucSr1yKGlMIrksVZBSm/HWih0OAs7XM396PBDU/om5zQ0ToPMua KVi7q57rcZN5GYZTZan11kfofMlHFWOeXyyQU08UcNEVRti5yKPly9iD1oRxX0qU58R7 L8JmODLF34J5IkQDiEQuYQnkhkbqevsZ2X9FDjqi0nhbLYopoBYB64tM+RNZDDtPSIdO 4Hw9Cof9xl6XC6xltCVgDhnW4A4QMKPpbpMd/pSJkHtJW8Qas8w40YZ5y+VnoZ1aWNb6 vOJXSWq4Iy+P1Rhgz6qlnJ1DeQJIp9u11CJjHMCVqZjUegfbSHepmH0J3VCQixvNg4vw h2ww== 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 i18-20020a63d452000000b004fbf6b6908asi12694428pgj.480.2023.03.21.01.28.18; Tue, 21 Mar 2023 01:28: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 S231169AbjCUIKH (ORCPT + 99 others); Tue, 21 Mar 2023 04:10:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbjCUIJd (ORCPT ); Tue, 21 Mar 2023 04:09:33 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60628193C8; Tue, 21 Mar 2023 01:09:29 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Pgkln0VFFz4f3nqL; 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--.4478S9; Tue, 21 Mar 2023 16:09:26 +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 7/8] ext4: remove ext4_block_group and ext4_block_group_offset declaration Date: Wed, 22 Mar 2023 00:12:19 +0800 Message-Id: <20230321161220.418652-8-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--.4478S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtF17JFyUWF1fJFWDZF4DCFg_yoWfKrb_Aw 17Jrs3GFyfJw1Ska1jgrs8Ar4rtws3Jw4DWa10gryrX3WDXF4jva4DCrn7Ars8u3WUA3W3 Ar9rXF17JFW8XjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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, 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?1760965230144797769?= X-GMAIL-MSGID: =?utf-8?q?1760965230144797769?= For ext4_block_group and ext4_block_group_offset, there are only declaration without definition. Just remove them. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/ext4.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 9b2cfc32cf78..f25f13a357de 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2697,10 +2697,6 @@ extern void ext4_get_group_no_and_offset(struct super_block *sb, extern ext4_group_t ext4_get_group_number(struct super_block *sb, ext4_fsblk_t block); -extern unsigned int ext4_block_group(struct super_block *sb, - ext4_fsblk_t blocknr); -extern ext4_grpblk_t ext4_block_group_offset(struct super_block *sb, - ext4_fsblk_t blocknr); extern int ext4_bg_has_super(struct super_block *sb, ext4_group_t group); extern unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group); 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; }