| Message ID | 20191216182656.15624-3-fdmanana@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Allow deduplication of the eof block when it is safe to do so | expand |
On 12/16/19 1:26 PM, fdmanana@kernel.org wrote: > From: Filipe Manana <fdmanana@suse.com> > > Since btrfs was migrated to use the generic VFS helpers for clone and > deduplication, it stopped allowing for the last block of a file to be > deduplicated when the source file size is not sector size aligned (when > eof is somewhere in the middle of the last block). There are two reasons > for that: > > 1) The generic code always rounds down, to a multiple of the block size, > the range's length for deduplications. This means we end up never > deduplicating the last block when the eof is not block size aligned, > even for the safe case where the destination range's end offset matches > the destination file's size. That rounding down operation is done at > generic_remap_check_len(); > > 2) Because of that, the btrfs specific code does not expect anymore any > non-aligned range length's for deduplication and therefore does not > work if such nona-aligned length is given. > Does anybody else rely on this behavior that needs a change like this for their fs? > This patch addresses that second part, and it depends on a patch that > fixes generic_remap_check_len(), in the VFS, which was submitted ealier > and has the following subject: > > "fs: allow deduplication of eof block into the end of the destination file" > > These two patches address reports from users that started seeing lower > deduplication rates due to the last block never being deduplicated when > the file size is not aligned to the filesystem's block size. > > Link: https://lore.kernel.org/linux-btrfs/2019-1576167349.500456@svIo.N5dq.dFFD/ > Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Thanks, Josef
On Mon, Dec 16, 2019 at 06:26:56PM +0000, fdmanana@kernel.org wrote: > From: Filipe Manana <fdmanana@suse.com> > > Since btrfs was migrated to use the generic VFS helpers for clone and > deduplication, it stopped allowing for the last block of a file to be > deduplicated when the source file size is not sector size aligned (when > eof is somewhere in the middle of the last block). There are two reasons > for that: > > 1) The generic code always rounds down, to a multiple of the block size, > the range's length for deduplications. This means we end up never > deduplicating the last block when the eof is not block size aligned, > even for the safe case where the destination range's end offset matches > the destination file's size. That rounding down operation is done at > generic_remap_check_len(); > > 2) Because of that, the btrfs specific code does not expect anymore any > non-aligned range length's for deduplication and therefore does not > work if such nona-aligned length is given. > > This patch addresses that second part, and it depends on a patch that > fixes generic_remap_check_len(), in the VFS, which was submitted ealier > and has the following subject: > > "fs: allow deduplication of eof block into the end of the destination file" > > These two patches address reports from users that started seeing lower > deduplication rates due to the last block never being deduplicated when > the file size is not aligned to the filesystem's block size. > > Link: https://lore.kernel.org/linux-btrfs/2019-1576167349.500456@svIo.N5dq.dFFD/ > Signed-off-by: Filipe Manana <fdmanana@suse.com> Should these patches be marked for stable (5.0+, but see below for caveats about 5.0)? The bug affects 5.3 and 5.4 which are still active, and dedupe is an important feature for some users. > --- > fs/btrfs/ioctl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 3418decb9e61..c41c276ff272 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -3237,6 +3237,7 @@ static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1, > static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > struct inode *dst, u64 dst_loff) > { > + const u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize; > int ret; > > /* > @@ -3244,7 +3245,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > * source range to serialize with relocation. > */ > btrfs_double_extent_lock(src, loff, dst, dst_loff, len); > - ret = btrfs_clone(src, dst, loff, len, len, dst_loff, 1); > + ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1); A heads-up for anyone backporting this to 5.0: this patch depends on 57a50e2506df Btrfs: remove no longer needed range length checks for deduplication Simply resolving the git conflict without including 57a50e2506df produces a kernel where dedupe rounds the size of the dst file up to the next block boundary. This is because 57a50e2506df changes the value of "len". Before 57a50e2506df, "len" is equivalent to "ALIGN(len, bs)" at the btrfs_clone line; after 57a50e2506df, "len" is the unaligned dedupe request length passed to the btrfs_extent_same_range function. This changes the semantics of the btrfs_clone line significantly. 57a50e2506df is in 5.1, so 5.1+ kernels do not require any additional patches. 4.20 and earlier don't have the bug, so don't need a fix. > btrfs_double_extent_unlock(src, loff, dst, dst_loff, len); > > return ret; > -- > 2.11.0 >
On Sun, Dec 29, 2019 at 5:22 AM Zygo Blaxell <ce3g8jdj@umail.furryterror.org> wrote: > > On Mon, Dec 16, 2019 at 06:26:56PM +0000, fdmanana@kernel.org wrote: > > From: Filipe Manana <fdmanana@suse.com> > > > > Since btrfs was migrated to use the generic VFS helpers for clone and > > deduplication, it stopped allowing for the last block of a file to be > > deduplicated when the source file size is not sector size aligned (when > > eof is somewhere in the middle of the last block). There are two reasons > > for that: > > > > 1) The generic code always rounds down, to a multiple of the block size, > > the range's length for deduplications. This means we end up never > > deduplicating the last block when the eof is not block size aligned, > > even for the safe case where the destination range's end offset matches > > the destination file's size. That rounding down operation is done at > > generic_remap_check_len(); > > > > 2) Because of that, the btrfs specific code does not expect anymore any > > non-aligned range length's for deduplication and therefore does not > > work if such nona-aligned length is given. > > > > This patch addresses that second part, and it depends on a patch that > > fixes generic_remap_check_len(), in the VFS, which was submitted ealier > > and has the following subject: > > > > "fs: allow deduplication of eof block into the end of the destination file" > > > > These two patches address reports from users that started seeing lower > > deduplication rates due to the last block never being deduplicated when > > the file size is not aligned to the filesystem's block size. > > > > Link: https://lore.kernel.org/linux-btrfs/2019-1576167349.500456@svIo.N5dq.dFFD/ > > Signed-off-by: Filipe Manana <fdmanana@suse.com> > > Should these patches be marked for stable (5.0+, but see below for > caveats about 5.0)? The bug affects 5.3 and 5.4 which are still active, > and dedupe is an important feature for some users. Usually I only mark things for stable that are critical: corruptions, crashes and memory leaks for example. I don't think this is a critical issue, since none of those things happen. It's certainly inconvenient to not have an extent fully deduplicated, but it's just that. If a maintainer wants to add it for stable, I'm fine with it. > > > --- > > fs/btrfs/ioctl.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > > index 3418decb9e61..c41c276ff272 100644 > > --- a/fs/btrfs/ioctl.c > > +++ b/fs/btrfs/ioctl.c > > @@ -3237,6 +3237,7 @@ static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1, > > static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > struct inode *dst, u64 dst_loff) > > { > > + const u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize; > > int ret; > > > > /* > > @@ -3244,7 +3245,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > * source range to serialize with relocation. > > */ > > btrfs_double_extent_lock(src, loff, dst, dst_loff, len); > > - ret = btrfs_clone(src, dst, loff, len, len, dst_loff, 1); > > + ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1); > > A heads-up for anyone backporting this to 5.0: this patch depends on > > 57a50e2506df Btrfs: remove no longer needed range length checks for deduplication For any kernel without that cleanup patch, backporting the first patch in the series (the one touching only fs/read_write.c) is enough. For any kernel with that cleanup patch, then both patches in the series are needed. Thanks. > > Simply resolving the git conflict without including 57a50e2506df produces > a kernel where dedupe rounds the size of the dst file up to the next > block boundary. This is because 57a50e2506df changes the value of > "len". Before 57a50e2506df, "len" is equivalent to "ALIGN(len, bs)" > at the btrfs_clone line; after 57a50e2506df, "len" is the unaligned > dedupe request length passed to the btrfs_extent_same_range function. > This changes the semantics of the btrfs_clone line significantly. > > 57a50e2506df is in 5.1, so 5.1+ kernels do not require any additional > patches. > > 4.20 and earlier don't have the bug, so don't need a fix. > > > btrfs_double_extent_unlock(src, loff, dst, dst_loff, len); > > > > return ret; > > -- > > 2.11.0 > >
On Tue, Jan 07, 2020 at 04:18:42PM +0000, Filipe Manana wrote: > On Sun, Dec 29, 2019 at 5:22 AM Zygo Blaxell > <ce3g8jdj@umail.furryterror.org> wrote: > > > > On Mon, Dec 16, 2019 at 06:26:56PM +0000, fdmanana@kernel.org wrote: > > > From: Filipe Manana <fdmanana@suse.com> > > > > > > Since btrfs was migrated to use the generic VFS helpers for clone and > > > deduplication, it stopped allowing for the last block of a file to be > > > deduplicated when the source file size is not sector size aligned (when > > > eof is somewhere in the middle of the last block). There are two reasons > > > for that: > > > > > > 1) The generic code always rounds down, to a multiple of the block size, > > > the range's length for deduplications. This means we end up never > > > deduplicating the last block when the eof is not block size aligned, > > > even for the safe case where the destination range's end offset matches > > > the destination file's size. That rounding down operation is done at > > > generic_remap_check_len(); > > > > > > 2) Because of that, the btrfs specific code does not expect anymore any > > > non-aligned range length's for deduplication and therefore does not > > > work if such nona-aligned length is given. > > > > > > This patch addresses that second part, and it depends on a patch that > > > fixes generic_remap_check_len(), in the VFS, which was submitted ealier > > > and has the following subject: > > > > > > "fs: allow deduplication of eof block into the end of the destination file" > > > > > > These two patches address reports from users that started seeing lower > > > deduplication rates due to the last block never being deduplicated when > > > the file size is not aligned to the filesystem's block size. > > > > > > Link: https://lore.kernel.org/linux-btrfs/2019-1576167349.500456@svIo.N5dq.dFFD/ > > > Signed-off-by: Filipe Manana <fdmanana@suse.com> > > > > Should these patches be marked for stable (5.0+, but see below for > > caveats about 5.0)? The bug affects 5.3 and 5.4 which are still active, > > and dedupe is an important feature for some users. > > Usually I only mark things for stable that are critical: corruptions, > crashes and memory leaks for example. > I don't think this is a critical issue, since none of those things > happen. It's certainly inconvenient to not have > an extent fully deduplicated, but it's just that. In btrfs the reference counting is done by extent and extents are immutable, so extents are either fully deduplicated, or not deduplicated at all. We have to dedupe every part of an extent, and if we fail to do so, no data space is saved while metadata usage increases for the new partial extent reference. This bug means the dedupe feature is not usable _at all_ for single-extent files with non-aligned EOF, and that is a significant problem for users that rely on dedupe to manage space usage on btrfs (e.g. for build servers where there are millions of duplicate odd-sized small files, and the space savings from working dedupe can be 90% or more). Doubling or tripling space usage for the same data is beyond inconvenience. It is possible to work around the bug in userspace and recover the space with clone, but there is no way to do it safely on live data without a working dedupe-range ioctl. > If a maintainer wants to add it for stable, I'm fine with it. At this point it would only affect 5.4--all the other short-term kernels are closed, and none of the LTS kernels need the patch--but it would be nice if 5.4 had working dedupe. > > > > > --- > > > fs/btrfs/ioctl.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > > > index 3418decb9e61..c41c276ff272 100644 > > > --- a/fs/btrfs/ioctl.c > > > +++ b/fs/btrfs/ioctl.c > > > @@ -3237,6 +3237,7 @@ static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1, > > > static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > > struct inode *dst, u64 dst_loff) > > > { > > > + const u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize; > > > int ret; > > > > > > /* > > > @@ -3244,7 +3245,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > > * source range to serialize with relocation. > > > */ > > > btrfs_double_extent_lock(src, loff, dst, dst_loff, len); > > > - ret = btrfs_clone(src, dst, loff, len, len, dst_loff, 1); > > > + ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1); > > > > A heads-up for anyone backporting this to 5.0: this patch depends on > > > > 57a50e2506df Btrfs: remove no longer needed range length checks for deduplication > > For any kernel without that cleanup patch, backporting the first patch > in the series (the one touching only fs/read_write.c) is enough. > For any kernel with that cleanup patch, then both patches in the > series are needed. > > Thanks. > > > > > Simply resolving the git conflict without including 57a50e2506df produces > > a kernel where dedupe rounds the size of the dst file up to the next > > block boundary. This is because 57a50e2506df changes the value of > > "len". Before 57a50e2506df, "len" is equivalent to "ALIGN(len, bs)" > > at the btrfs_clone line; after 57a50e2506df, "len" is the unaligned > > dedupe request length passed to the btrfs_extent_same_range function. > > This changes the semantics of the btrfs_clone line significantly. > > > > 57a50e2506df is in 5.1, so 5.1+ kernels do not require any additional > > patches. > > > > 4.20 and earlier don't have the bug, so don't need a fix. > > > > > btrfs_double_extent_unlock(src, loff, dst, dst_loff, len); > > > > > > return ret; > > > -- > > > 2.11.0 > > > >
On Tue, Jan 7, 2020 at 6:16 PM Zygo Blaxell <ce3g8jdj@umail.furryterror.org> wrote: > > On Tue, Jan 07, 2020 at 04:18:42PM +0000, Filipe Manana wrote: > > On Sun, Dec 29, 2019 at 5:22 AM Zygo Blaxell > > <ce3g8jdj@umail.furryterror.org> wrote: > > > > > > On Mon, Dec 16, 2019 at 06:26:56PM +0000, fdmanana@kernel.org wrote: > > > > From: Filipe Manana <fdmanana@suse.com> > > > > > > > > Since btrfs was migrated to use the generic VFS helpers for clone and > > > > deduplication, it stopped allowing for the last block of a file to be > > > > deduplicated when the source file size is not sector size aligned (when > > > > eof is somewhere in the middle of the last block). There are two reasons > > > > for that: > > > > > > > > 1) The generic code always rounds down, to a multiple of the block size, > > > > the range's length for deduplications. This means we end up never > > > > deduplicating the last block when the eof is not block size aligned, > > > > even for the safe case where the destination range's end offset matches > > > > the destination file's size. That rounding down operation is done at > > > > generic_remap_check_len(); > > > > > > > > 2) Because of that, the btrfs specific code does not expect anymore any > > > > non-aligned range length's for deduplication and therefore does not > > > > work if such nona-aligned length is given. > > > > > > > > This patch addresses that second part, and it depends on a patch that > > > > fixes generic_remap_check_len(), in the VFS, which was submitted ealier > > > > and has the following subject: > > > > > > > > "fs: allow deduplication of eof block into the end of the destination file" > > > > > > > > These two patches address reports from users that started seeing lower > > > > deduplication rates due to the last block never being deduplicated when > > > > the file size is not aligned to the filesystem's block size. > > > > > > > > Link: https://lore.kernel.org/linux-btrfs/2019-1576167349.500456@svIo.N5dq.dFFD/ > > > > Signed-off-by: Filipe Manana <fdmanana@suse.com> > > > > > > Should these patches be marked for stable (5.0+, but see below for > > > caveats about 5.0)? The bug affects 5.3 and 5.4 which are still active, > > > and dedupe is an important feature for some users. > > > > Usually I only mark things for stable that are critical: corruptions, > > crashes and memory leaks for example. > > I don't think this is a critical issue, since none of those things > > happen. It's certainly inconvenient to not have > > an extent fully deduplicated, but it's just that. > > In btrfs the reference counting is done by extent and extents are > immutable, so extents are either fully deduplicated, or not deduplicated > at all. We have to dedupe every part of an extent, and if we fail to > do so, no data space is saved while metadata usage increases for the > new partial extent reference. Yes, I know. That was explained in the cover letter, why allowing deduplication of the eof block is more important for btrfs than it is for xfs for example. > > This bug means the dedupe feature is not usable _at all_ for single-extent > files with non-aligned EOF, and that is a significant problem for users > that rely on dedupe to manage space usage on btrfs (e.g. for build > servers where there are millions of duplicate odd-sized small files, and > the space savings from working dedupe can be 90% or more). Doubling or > tripling space usage for the same data is beyond inconvenience. Sure, I understand that, I know how btrfs manages extents and I'm well familiar with its cloning/deduplication implementation. Still, it's not something I consider critical enough to get to stable, as there's no corruption, data loss or a crash. That doesn't mean the patches aren't going to stable branches, that depends on the maintainers of each subsystem (vfs, btrfs). Thanks. > > It is possible to work around the bug in userspace and recover the space > with clone, but there is no way to do it safely on live data without a > working dedupe-range ioctl. > > > If a maintainer wants to add it for stable, I'm fine with it. > > At this point it would only affect 5.4--all the other short-term kernels > are closed, and none of the LTS kernels need the patch--but it would be > nice if 5.4 had working dedupe. > > > > > > > > --- > > > > fs/btrfs/ioctl.c | 3 ++- > > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > > > > index 3418decb9e61..c41c276ff272 100644 > > > > --- a/fs/btrfs/ioctl.c > > > > +++ b/fs/btrfs/ioctl.c > > > > @@ -3237,6 +3237,7 @@ static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1, > > > > static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > > > struct inode *dst, u64 dst_loff) > > > > { > > > > + const u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize; > > > > int ret; > > > > > > > > /* > > > > @@ -3244,7 +3245,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, > > > > * source range to serialize with relocation. > > > > */ > > > > btrfs_double_extent_lock(src, loff, dst, dst_loff, len); > > > > - ret = btrfs_clone(src, dst, loff, len, len, dst_loff, 1); > > > > + ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1); > > > > > > A heads-up for anyone backporting this to 5.0: this patch depends on > > > > > > 57a50e2506df Btrfs: remove no longer needed range length checks for deduplication > > > > For any kernel without that cleanup patch, backporting the first patch > > in the series (the one touching only fs/read_write.c) is enough. > > For any kernel with that cleanup patch, then both patches in the > > series are needed. > > > > Thanks. > > > > > > > > Simply resolving the git conflict without including 57a50e2506df produces > > > a kernel where dedupe rounds the size of the dst file up to the next > > > block boundary. This is because 57a50e2506df changes the value of > > > "len". Before 57a50e2506df, "len" is equivalent to "ALIGN(len, bs)" > > > at the btrfs_clone line; after 57a50e2506df, "len" is the unaligned > > > dedupe request length passed to the btrfs_extent_same_range function. > > > This changes the semantics of the btrfs_clone line significantly. > > > > > > 57a50e2506df is in 5.1, so 5.1+ kernels do not require any additional > > > patches. > > > > > > 4.20 and earlier don't have the bug, so don't need a fix. > > > > > > > btrfs_double_extent_unlock(src, loff, dst, dst_loff, len); > > > > > > > > return ret; > > > > -- > > > > 2.11.0 > > > > > >
On Wed, Jan 08, 2020 at 11:42:05AM +0000, Filipe Manana wrote: > > > > Should these patches be marked for stable (5.0+, but see below for > > > > caveats about 5.0)? The bug affects 5.3 and 5.4 which are still active, > > > > and dedupe is an important feature for some users. > > > > > > Usually I only mark things for stable that are critical: corruptions, > > > crashes and memory leaks for example. > > > I don't think this is a critical issue, since none of those things > > > happen. It's certainly inconvenient to not have > > > an extent fully deduplicated, but it's just that. > > > > In btrfs the reference counting is done by extent and extents are > > immutable, so extents are either fully deduplicated, or not deduplicated > > at all. We have to dedupe every part of an extent, and if we fail to > > do so, no data space is saved while metadata usage increases for the > > new partial extent reference. > > Yes, I know. That was explained in the cover letter, why allowing > deduplication of the eof block is more important for btrfs than it is > for xfs for example. > > > > > This bug means the dedupe feature is not usable _at all_ for single-extent > > files with non-aligned EOF, and that is a significant problem for users > > that rely on dedupe to manage space usage on btrfs (e.g. for build > > servers where there are millions of duplicate odd-sized small files, and > > the space savings from working dedupe can be 90% or more). Doubling or > > tripling space usage for the same data is beyond inconvenience. > > Sure, I understand that, I know how btrfs manages extents and I'm well > familiar with its cloning/deduplication implementation. > > Still, it's not something I consider critical enough to get to stable, > as there's no corruption, data loss or a crash. > That doesn't mean the patches aren't going to stable branches, that > depends on the maintainers of each subsystem (vfs, btrfs). To me this looks like a usability bug and regression so I'm all for adding it to stable. Less serious fixes than corruption, data loss and crash land in stable kernels anyway, so if this fixes behaviour and usecases then it qualifies. I evaluate each patch for stable inclusion so the CC: stable is not required to be in the patch itself when posted, and late requests for inclusion to stable have been working well so we have the process in place.
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 3418decb9e61..c41c276ff272 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3237,6 +3237,7 @@ static void btrfs_double_extent_lock(struct inode *inode1, u64 loff1, static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, struct inode *dst, u64 dst_loff) { + const u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize; int ret; /* @@ -3244,7 +3245,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, * source range to serialize with relocation. */ btrfs_double_extent_lock(src, loff, dst, dst_loff, len); - ret = btrfs_clone(src, dst, loff, len, len, dst_loff, 1); + ret = btrfs_clone(src, dst, loff, len, ALIGN(len, bs), dst_loff, 1); btrfs_double_extent_unlock(src, loff, dst, dst_loff, len); return ret;