Skip to content

Commit

Permalink
btrfs: tweak free space tree bitmap allocation
Browse files Browse the repository at this point in the history
The requested bitmap size varies, observed numbers were < 4K up to 16K.
Using vmalloc unconditionally would be too heavy, we'll try contiguous
allocations first and fall back to vmalloc if there's no contig memory.

Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
David Sterba committed Jan 22, 2016
1 parent 8cce83b commit 79b134a
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions fs/btrfs/free-space-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,20 @@ static inline u32 free_space_bitmap_size(u64 size, u32 sectorsize)

static unsigned long *alloc_bitmap(u32 bitmap_size)
{
void *mem;

/*
* The allocation size varies, observed numbers were < 4K up to 16K.
* Using vmalloc unconditionally would be too heavy, we'll try
* contiguous allocations first.
*/
if (bitmap_size <= PAGE_SIZE)
return kzalloc(bitmap_size, GFP_NOFS);

mem = kzalloc(bitmap_size, GFP_NOFS | __GFP_HIGHMEM | __GFP_NOWARN);
if (mem)
return mem;

return __vmalloc(bitmap_size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO,
PAGE_KERNEL);
}
Expand Down Expand Up @@ -289,7 +303,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,

ret = 0;
out:
vfree(bitmap);
kvfree(bitmap);
if (ret)
btrfs_abort_transaction(trans, root, ret);
return ret;
Expand Down Expand Up @@ -438,7 +452,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,

ret = 0;
out:
vfree(bitmap);
kvfree(bitmap);
if (ret)
btrfs_abort_transaction(trans, root, ret);
return ret;
Expand Down

0 comments on commit 79b134a

Please sign in to comment.