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;