btrfs: use kvzalloc for EXTENT_SAME temporary data
David Sterba
maintainerPATCH v2 1/1 btrfs: use kvzalloc for EXTENT_SAME temporary data
The dedupe range is 16 MiB, with 4 KiB pages and 8 byte pointers, the arrays can be 32KiB large. To avoid allocation failures due to fragmented memory, use the allocation with fallback to vmalloc.
The arrays are allocated and freed only inside btrfs_extent_same and reused for all the ranges.
---
Based on git://github.com/kdave/btrfs-devel.git ext/timofey/dedupe-16mb-limit
v2:
- use kvmalloc_array
- use __GFP_ZERO, as there's no kvzalloc_array
- check that there are no other frees missed,
see https://patchwork.kernel.org/patch/10374941/ for reference
fs/btrfs/ioctl.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/btrfs/ioctl.c +9 -7
@@ -3178,12 +3178,13 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,* locking. We use an array for the page pointers. Size of the array is * bounded by len, which is in turn bounded by BTRFS_MAX_DEDUPE_LEN. */ - cmp.src_pages =kcalloc (num_pages,sizeof (struct page *),GFP_KERNEL ); - cmp.dst_pages =kcalloc (num_pages,sizeof (struct page *),GFP_KERNEL ); + cmp.src_pages =kvmalloc_array (num_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_ZERO); + cmp.dst_pages =kvmalloc_array (num_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_ZERO);if (!cmp.src_pages || !cmp.dst_pages) { -kfree (cmp.src_pages); -kfree (cmp.dst_pages); -return -ENOMEM ; + ret = -ENOMEM ; + goto out_free; }if (same_inode)
@@ -3211,8 +3212,9 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,else btrfs_double_inode_unlock (src, dst); -kfree (cmp.src_pages); -kfree (cmp.dst_pages); +out_free: +kvfree (cmp.src_pages); +kvfree (cmp.dst_pages);return ret; }
Signature · 1 line
2.16.2
Quoted 8 lines · David Sterba
The dedupe range is 16 MiB, with 4 KiB pages and 8 byte pointers, the arrays can be 32KiB large. To avoid allocation failures due to fragmented memory, use the allocation with fallback to vmalloc.
The arrays are allocated and freed only inside
btrfs_extent_sameand reused for all the ranges.Signed-off-by David Sterba <[email protected]>
LGTM:
Quoted 49 lines
---
Based on
git://github.com/kdave/btrfs-devel.gitext/timofey/dedupe-16mb-limitv2:
- usekvmalloc_array
- use__GFP_ZERO, as there's nokvzalloc_array
- check that there are no other frees missed,
see https://patchwork.kernel.org/patch/10374941/ for referencefs/btrfs/ioctl.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)fs/btrfs/ioctl.c +9
-7@@ -3178,12 +3178,13 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,* locking. We use an array for the page pointers. Size of the array is * bounded by len, which is in turn bounded by BTRFS_MAX_DEDUPE_LEN. */ - cmp.src_pages =kcalloc (num_pages,sizeof (struct page *),GFP_KERNEL ); - cmp.dst_pages =kcalloc (num_pages,sizeof (struct page *),GFP_KERNEL ); + cmp.src_pages =kvmalloc_array (num_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_ZERO); + cmp.dst_pages =kvmalloc_array (num_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_ZERO);if (!cmp.src_pages || !cmp.dst_pages) { -kfree (cmp.src_pages); -kfree (cmp.dst_pages); -return -ENOMEM ; + ret = -ENOMEM ; + goto out_free; }if (same_inode)@@ -3211,8 +3212,9 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen,else btrfs_double_inode_unlock (src, dst); -kfree (cmp.src_pages); -kfree (cmp.dst_pages); +out_free: +kvfree (cmp.src_pages); +kvfree (cmp.dst_pages);return ret; }