mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kemeng Shi <shikemeng@huaweicloud.com>
To: Ojaswin Mujoo <ojaswin@linux.ibm.com>,
	linux-ext4@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>
Cc: Ritesh Harjani <ritesh.list@gmail.com>,
	linux-kernel@vger.kernel.org,
	syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com
Subject: Re: [PATCH 1/2] ext4: Check stripe size compatibility on remount as well
Date: Mon, 19 Aug 2024 20:31:26 +0800	[thread overview]
Message-ID: <2475f15a-d332-bef1-4ea6-70461f7ef3bb@huaweicloud.com> (raw)
In-Reply-To: <957d29b85e06f415ee125de141809d2b9e084003.1723794770.git.ojaswin@linux.ibm.com>



on 8/16/2024 3:57 PM, Ojaswin Mujoo wrote:
> We disable stripe size in __ext4_fill_super if it is not a multiple of
> the cluster ratio however this check is missed when trying to remount.
> This can leave us with cases where stripe < cluster_ratio after
> remount:set making EXT4_B2C(sbi->s_stripe) become 0 that can cause some
> unforeseen bugs like divide by 0.
> 
> Fix that by adding the check in remount path as well.
> 
> Additionally, change the users of EXT4_B2C(sbi->s_stripe) to
> EXT4_NUM_B2C() so that if we ever accidentally hit this again, we can
> avoid the value becoming 0. This should not change existing functionality.
It's better to mention this change is in following patch or simply remove
it from this patch.

Other than that, looks good to me. Feel free to add:

Reviewed-by: Kemeng Shi <shikemeng@huaweicloud.com>
> 
> Reported-by: syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com
> Tested-by: syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com
> Fixes: c3defd99d58c ("ext4: treat stripe in block unit")
> Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
> ---
>  fs/ext4/super.c | 29 ++++++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index e72145c4ae5a..9d495d78d262 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5165,6 +5165,18 @@ static int ext4_block_group_meta_init(struct super_block *sb, int silent)
>  	return 0;
>  }
>  
> +/*
> + * 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.
> + */
> +static bool ext4_is_stripe_incompatible(struct super_block *sb, unsigned long stripe)
> +{
> +	struct ext4_sb_info *sbi = EXT4_SB(sb);
> +	return (stripe > 0 && sbi->s_cluster_ratio > 1 &&
> +		stripe % sbi->s_cluster_ratio != 0);
> +}
> +
>  static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
>  {
>  	struct ext4_super_block *es = NULL;
> @@ -5272,13 +5284,7 @@ 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) {
> +	if (ext4_is_stripe_incompatible(sb, sbi->s_stripe)) {
>  		ext4_msg(sb, KERN_WARNING,
>  			 "stripe (%lu) is not aligned with cluster size (%u), "
>  			 "stripe is disabled",
> @@ -6441,6 +6447,15 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
>  
>  	}
>  
> +	if ((ctx->spec & EXT4_SPEC_s_stripe) &&
> +	    ext4_is_stripe_incompatible(sb, ctx->s_stripe)) {
> +		ext4_msg(sb, KERN_WARNING,
> +			 "stripe (%lu) is not aligned with cluster size (%u), "
> +			 "stripe is disabled",
> +			 ctx->s_stripe, sbi->s_cluster_ratio);
> +		ctx->s_stripe = 0;
> +	}
> +
>  	/*
>  	 * Changing the DIOREAD_NOLOCK or DELALLOC mount options may cause
>  	 * two calls to ext4_should_dioread_nolock() to return inconsistent
> 


  parent reply	other threads:[~2024-08-19 12:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-16  7:57 Ojaswin Mujoo
2024-08-16  7:57 ` [PATCH 2/2] ext4: Convert EXT4_B2C(sbi->s_stripe) users to EXT4_NUM_B2C Ojaswin Mujoo
2024-08-19 12:51   ` Kemeng Shi
2024-08-20  6:29     ` Ojaswin Mujoo
2024-08-19 12:31 ` Kemeng Shi [this message]
2024-08-20  6:30   ` [PATCH 1/2] ext4: Check stripe size compatibility on remount as well Ojaswin Mujoo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2475f15a-d332-bef1-4ea6-70461f7ef3bb@huaweicloud.com \
    --to=shikemeng@huaweicloud.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ojaswin@linux.ibm.com \
    --cc=ritesh.list@gmail.com \
    --cc=syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®