From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55394C433EF for ; Thu, 6 Jan 2022 02:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344971AbiAFCpy (ORCPT ); Wed, 5 Jan 2022 21:45:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344982AbiAFCpt (ORCPT ); Wed, 5 Jan 2022 21:45:49 -0500 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF7B6C06118C for ; Wed, 5 Jan 2022 18:45:48 -0800 (PST) Received: by mail-pg1-x52a.google.com with SMTP id v25so1353587pge.2 for ; Wed, 05 Jan 2022 18:45:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pB9ixd309jdajttTHm9n2WuXxz/2zgca6PMdCtbA1H8=; b=sqp4SRvOVax4jD2sd2uTEErw/3HlMsCT8Kq+lArtmcRL/R/BceBTImeqHLY/+V1ki2 ofzk1QXs3EsDndi+227ANu85vtUI16kMg+j7kYkuDxGG5VDag5qC9M9VL+e7EVa8Xi1d p/u7MtxcJndcyKPPP3U8SVB8I+5j1jum55VV6QQla4hvmjw0xAX+uBu4scGSEOw2XnBl BL/A5Ir5y3s2oUXUH6nHmaEJlzoSGjuJebXDQkQ5nQSQvirX+okqc9ts0+5jCEPEEOlY AsLDgcwVfn3e65XkOEZL3qT4Xx6UAeXZ1LHxEeMKZ7ZcAGo5wpmCF3UbkdYttekugo84 c9KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pB9ixd309jdajttTHm9n2WuXxz/2zgca6PMdCtbA1H8=; b=y1Dt4XGwfek4nQFgosoGBfkjba8ld4cGFA0bR/BFcrDr2DA5/rUkmeS8usvSAfHQ48 6O1BjY6f0JkP2WUSiDKgESojleA5eWKP0piKB7Y4CDx5D/yR3Qo6Fo6ymf/TYsxJtYZW Ecl2ZBmnyglSxaHsQcDMzAO4/GwAV51pcKKRnYCTgjdhLMfLfEaz9ledM9pqHt3K+v6A mUx4p7g3GgtZ7ExtbcYj8WQKVKgxJI2MP1G8Li1H7Ko86Ji3jBEsGe1rH18eHe7GgyQI 8QKcZZ/rM2wF6T1stGrqs65tYN0SZl89nofpQ7HB5ZQHoDQoKgKKKnmSIapZDNi+M6GN mTCw== X-Gm-Message-State: AOAM532phKOWYuXUwi6eNearwjsTo953e7NQ4fB8JiS1eREjIbLSyaIe eWHTFAmWjh7xSgIvMpccVQd5gA== X-Google-Smtp-Source: ABdhPJz1EAGyp79Lg8XVJc3VyhIObQSQ4Y2rSML71svFGe1MFS8/xezpM7v46uLzSYa389+jmuPzUg== X-Received: by 2002:a05:6a00:174d:b0:4bb:cbd7:c556 with SMTP id j13-20020a056a00174d00b004bbcbd7c556mr49331875pfc.26.1641437148543; Wed, 05 Jan 2022 18:45:48 -0800 (PST) Received: from yinxin.bytedance.net ([139.177.225.251]) by smtp.gmail.com with ESMTPSA id p12sm414244pfo.95.2022.01.05.18.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 18:45:48 -0800 (PST) From: Xin Yin To: harshadshirwadkar@gmail.com, tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Xin Yin Subject: [PATCH 2/2] ext4: modify the logic of ext4_mb_new_blocks_simple Date: Thu, 6 Jan 2022 10:45:18 +0800 Message-Id: <20220106024518.8161-3-yinxin.x@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220106024518.8161-1-yinxin.x@bytedance.com> References: <20220106024518.8161-1-yinxin.x@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org for now in ext4_mb_new_blocks_simple, if we found a block which should be excluded then will switch to next group, this may probably cause 'group' run out of range. change to check next block in the same group when get a block should be excluded. Also change the searche range to EXT4_CLUSTERS_PER_GROUP and add error checking. Signed-off-by: Xin Yin --- fs/ext4/mballoc.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 215b7068f548..31a00b473f3e 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5757,7 +5757,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, struct super_block *sb = ar->inode->i_sb; ext4_group_t group; ext4_grpblk_t blkoff; - int i = sb->s_blocksize; + ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb); + ext4_grpblk_t i = 0; ext4_fsblk_t goal, block; struct ext4_super_block *es = EXT4_SB(sb)->s_es; @@ -5779,19 +5780,26 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, ext4_get_group_no_and_offset(sb, max(ext4_group_first_block_no(sb, group), goal), NULL, &blkoff); - i = mb_find_next_zero_bit(bitmap_bh->b_data, sb->s_blocksize, + while (1) { + i = mb_find_next_zero_bit(bitmap_bh->b_data, max, blkoff); + if (i >= max) + break; + if (ext4_fc_replay_check_excluded(sb, + ext4_group_first_block_no(sb, group) + i)) { + blkoff = i + 1; + } else + break; + } brelse(bitmap_bh); - if (i >= sb->s_blocksize) - continue; - if (ext4_fc_replay_check_excluded(sb, - ext4_group_first_block_no(sb, group) + i)) - continue; - break; + if (i < max) + break; } - if (group >= ext4_get_groups_count(sb) && i >= sb->s_blocksize) + if (group >= ext4_get_groups_count(sb) || i >= max) { + *errp = -ENOSPC; return 0; + } block = ext4_group_first_block_no(sb, group) + i; ext4_mb_mark_bb(sb, block, 1, 1); -- 2.20.1