* [PATCH] btrfs: Use kvzalloc instead of kzalloc/vmalloc in alloc_bitmap
@ 2017-05-25 19:18 Vinnie Magro
2017-05-25 21:27 ` Omar Sandoval
0 siblings, 1 reply; 3+ messages in thread
From: Vinnie Magro @ 2017-05-25 19:18 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba
Cc: linux-btrfs, linux-kernel, kernel-team, Vinnie Magro
Replace alloc_bitmap with call to kvzalloc. kvzalloc preserves the
same fallback heuristic.
Signed-off-by: Vinnie Magro <vmagro@fb.com>
---
fs/btrfs/free-space-tree.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index fc0bd84..9e87129 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -151,25 +151,6 @@ static inline u32 free_space_bitmap_size(u64 size, u32 sectorsize)
return DIV_ROUND_UP((u32)div_u64(size, sectorsize), BITS_PER_BYTE);
}
-static u8 *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_NOWARN);
- if (mem)
- return mem;
-
- return __vmalloc(bitmap_size, GFP_NOFS | __GFP_ZERO, PAGE_KERNEL);
-}
-
int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group,
@@ -189,7 +170,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
bitmap_size = free_space_bitmap_size(block_group->key.offset,
fs_info->sectorsize);
- bitmap = alloc_bitmap(bitmap_size);
+ bitmap = kvzalloc(bitmap_size, GFP_NOFS);
if (!bitmap) {
ret = -ENOMEM;
goto out;
@@ -330,7 +311,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
bitmap_size = free_space_bitmap_size(block_group->key.offset,
fs_info->sectorsize);
- bitmap = alloc_bitmap(bitmap_size);
+ bitmap = kvzalloc(bitmap_size, GFP_NOFS);
if (!bitmap) {
ret = -ENOMEM;
goto out;
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: Use kvzalloc instead of kzalloc/vmalloc in alloc_bitmap
2017-05-25 19:18 [PATCH] btrfs: Use kvzalloc instead of kzalloc/vmalloc in alloc_bitmap Vinnie Magro
@ 2017-05-25 21:27 ` Omar Sandoval
2017-05-26 16:12 ` David Sterba
0 siblings, 1 reply; 3+ messages in thread
From: Omar Sandoval @ 2017-05-25 21:27 UTC (permalink / raw)
To: Vinnie Magro
Cc: Chris Mason, Josef Bacik, David Sterba, linux-btrfs, linux-kernel,
kernel-team
On Thu, May 25, 2017 at 12:18:02PM -0700, Vinnie Magro wrote:
> Replace alloc_bitmap with call to kvzalloc. kvzalloc preserves the
> same fallback heuristic.
Looks good, thanks.
Reviewed-by: Omar Sandoval <osandov@fb.com>
> Signed-off-by: Vinnie Magro <vmagro@fb.com>
> ---
> fs/btrfs/free-space-tree.c | 23 ++---------------------
> 1 file changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
> index fc0bd84..9e87129 100644
> --- a/fs/btrfs/free-space-tree.c
> +++ b/fs/btrfs/free-space-tree.c
> @@ -151,25 +151,6 @@ static inline u32 free_space_bitmap_size(u64 size, u32 sectorsize)
> return DIV_ROUND_UP((u32)div_u64(size, sectorsize), BITS_PER_BYTE);
> }
>
> -static u8 *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_NOWARN);
> - if (mem)
> - return mem;
> -
> - return __vmalloc(bitmap_size, GFP_NOFS | __GFP_ZERO, PAGE_KERNEL);
> -}
> -
> int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
> struct btrfs_fs_info *fs_info,
> struct btrfs_block_group_cache *block_group,
> @@ -189,7 +170,7 @@ int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
>
> bitmap_size = free_space_bitmap_size(block_group->key.offset,
> fs_info->sectorsize);
> - bitmap = alloc_bitmap(bitmap_size);
> + bitmap = kvzalloc(bitmap_size, GFP_NOFS);
> if (!bitmap) {
> ret = -ENOMEM;
> goto out;
> @@ -330,7 +311,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
>
> bitmap_size = free_space_bitmap_size(block_group->key.offset,
> fs_info->sectorsize);
> - bitmap = alloc_bitmap(bitmap_size);
> + bitmap = kvzalloc(bitmap_size, GFP_NOFS);
> if (!bitmap) {
> ret = -ENOMEM;
> goto out;
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs: Use kvzalloc instead of kzalloc/vmalloc in alloc_bitmap
2017-05-25 21:27 ` Omar Sandoval
@ 2017-05-26 16:12 ` David Sterba
0 siblings, 0 replies; 3+ messages in thread
From: David Sterba @ 2017-05-26 16:12 UTC (permalink / raw)
To: Omar Sandoval
Cc: Vinnie Magro, Chris Mason, Josef Bacik, David Sterba, linux-btrfs,
linux-kernel, kernel-team
On Thu, May 25, 2017 at 02:27:21PM -0700, Omar Sandoval wrote:
> On Thu, May 25, 2017 at 12:18:02PM -0700, Vinnie Magro wrote:
> > Replace alloc_bitmap with call to kvzalloc. kvzalloc preserves the
> > same fallback heuristic.
>
> Looks good, thanks.
>
> Reviewed-by: Omar Sandoval <osandov@fb.com>
Added to queue, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-26 16:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-25 19:18 [PATCH] btrfs: Use kvzalloc instead of kzalloc/vmalloc in alloc_bitmap Vinnie Magro
2017-05-25 21:27 ` Omar Sandoval
2017-05-26 16:12 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).