Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 10 Aug 2023 12:10:16 +0200
From:   Jan Kara <jack@suse.cz>
To:     Zhang Yi <yi.zhang@huaweicloud.com>
Cc:     linux-ext4@vger.kernel.org, tytso@mit.edu,
        adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com,
        yukuai3@huawei.com
Subject: Re: [PATCH v2 07/12] jbd2: add fast_commit space check
Message-ID: <20230810101016.jed6k7egldi3w5bv@quack3>
References: <20230810085417.1501293-1-yi.zhang@huaweicloud.com>
 <20230810085417.1501293-8-yi.zhang@huaweicloud.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230810085417.1501293-8-yi.zhang@huaweicloud.com>
Precedence: bulk

On Thu 10-08-23 16:54:12, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
> 
> If JBD2_FEATURE_INCOMPAT_FAST_COMMIT bit is set, it means the journal
> have fast commit records need to recover, so the fast commit size
> should not be too large, and the leftover normal journal size should
> never less than JBD2_MIN_JOURNAL_BLOCKS. If it happens, the
> journal->j_last is likely to be wrong and will probably lead to
> incorrect journal recovery. So add a check into the
> journal_check_superblock(), and drop the pointless check when
> initializing the fastcommit parameters.
> 
> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>

Just one small note below. With that fixed feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

> @@ -1389,6 +1390,14 @@ static int journal_check_superblock(journal_t *journal)
>  		return err;
>  	}
>  
> +	num_fc_blks = jbd2_has_feature_fast_commit(journal) ?
> +				jbd2_journal_get_num_fc_blks(sb) : 0;
> +	if (be32_to_cpu(sb->s_maxlen) < JBD2_MIN_JOURNAL_BLOCKS + num_fc_blks) {

To avoid possible overflow of the right hand side, we should probably do
the check like:

	if (be32_to_cpu(sb->s_maxlen) < JBD2_MIN_JOURNAL_BLOCKS ||
	    be32_to_cpu(sb->s_maxlen) - JBD2_MIN_JOURNAL_BLOCKS < num_fc_blks) {
		...
	}

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR