linux-ext4 - Re: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 12 Sep 2012 11:31:46 -0400 (EDT)
From:	Lukáš Czerner <lczerner@...hat.com>
To:	Lukáš Czerner <lczerner@...hat.com>
cc:	linux-ext4@...r.kernel.org, tytso@....edu
Subject: Re: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system

On Tue, 21 Aug 2012, Lukáš Czerner wrote:

> Date: Tue, 21 Aug 2012 11:48:27 +0200 (CEST)
> From: Lukáš Czerner <lczerner@...hat.com>
> To: Lukas Czerner <lczerner@...hat.com>
> Cc: linux-ext4@...r.kernel.org, tytso@....edu
> Subject: Re: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system
> 
> On Tue, 3 Jul 2012, Lukas Czerner wrote:
> 
> > Date: Tue,  3 Jul 2012 21:10:42 +0200
> > From: Lukas Czerner <lczerner@...hat.com>
> > To: linux-ext4@...r.kernel.org
> > Cc: tytso@....edu, Lukas Czerner <lczerner@...hat.com>
> > Subject: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system
> > 
> > With a minor tweaks regarding minimum extent size to discard and
> > discarded bytes reporting the FITRIM can be enabled on bigalloc file
> > system and it works without any problem.
> > 
> > This patch fixes minlen handling and discarded bytes reporting to
> > take into consideration bigalloc enabled file systems and finally
> > removes the restriction and allow FITRIM to be used on file system with
> > bigalloc feature enabled.
> 
> any comments on this ?
> 
> Thanks!
> -Lukas

ping^2

> > 
> > Signed-off-by: Lukas Czerner <lczerner@...hat.com>
> > ---
> >  fs/ext4/ioctl.c   |    7 -------
> >  fs/ext4/mballoc.c |    5 +++--
> >  2 files changed, 3 insertions(+), 9 deletions(-)
> > 
> > diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> > index e34deac..9d6e0bc 100644
> > --- a/fs/ext4/ioctl.c
> > +++ b/fs/ext4/ioctl.c
> > @@ -420,13 +420,6 @@ resizefs_out:
> >  		if (!blk_queue_discard(q))
> >  			return -EOPNOTSUPP;
> >  
> > -		if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
> > -			       EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
> > -			ext4_msg(sb, KERN_ERR,
> > -				 "FITRIM not supported with bigalloc");
> > -			return -EOPNOTSUPP;
> > -		}
> > -
> >  		if (copy_from_user(&range, (struct fstrim_range __user *)arg,
> >  		    sizeof(range)))
> >  			return -EFAULT;
> > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> > index 1cd6994..c4bd0a6 100644
> > --- a/fs/ext4/mballoc.c
> > +++ b/fs/ext4/mballoc.c
> > @@ -4984,7 +4984,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
> >  
> >  	start = range->start >> sb->s_blocksize_bits;
> >  	end = start + (range->len >> sb->s_blocksize_bits) - 1;
> > -	minlen = range->minlen >> sb->s_blocksize_bits;
> > +	minlen = EXT4_NUM_B2C(EXT4_SB(sb),
> > +			      range->minlen >> sb->s_blocksize_bits);
> >  
> >  	if (unlikely(minlen > EXT4_CLUSTERS_PER_GROUP(sb)) ||
> >  	    unlikely(start >= max_blks))
> > @@ -5044,6 +5045,6 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
> >  		atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen);
> >  
> >  out:
> > -	range->len = trimmed * sb->s_blocksize;
> > +	range->len = EXT4_C2B(EXT4_SB(sb), trimmed) << sb->s_blocksize_bits;
> >  	return ret;
> >  }
> > 
>