kevin/linux
1
Fork 0
Code

bcachefs: darray: convert to alloc_hooks()

Browse Source 
better memory allocation profiling support

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-08-22 03:50:22 -04:00
parent 848c3ff882
commit a803fa551d
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/bcachefs/darray.c
View File

@ -4,12 +4,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "darray.h" #include "darray.h"
int __bch2_darray_resize(darray_char *d, size_t element_size, size_t new_size, gfp_t gfp) int __bch2_darray_resize_noprof(darray_char *d, size_t element_size, size_t new_size, gfp_t gfp)
{ {
if (new_size > d->size) { if (new_size > d->size) {
new_size = roundup_pow_of_two(new_size); new_size = roundup_pow_of_two(new_size);
void *data = kvmalloc_array(new_size, element_size, gfp); void *data = kvmalloc_array_noprof(new_size, element_size, gfp);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;

24
fs/bcachefs/darray.h
View File

@ -22,29 +22,23 @@ struct { \
typedef DARRAY(char) darray_char; typedef DARRAY(char) darray_char;
typedef DARRAY(char *) darray_str; typedef DARRAY(char *) darray_str;
int __bch2_darray_resize(darray_char *, size_t, size_t, gfp_t); int __bch2_darray_resize_noprof(darray_char *, size_t, size_t, gfp_t);
static inline int __darray_resize(darray_char *d, size_t element_size, #define __bch2_darray_resize(...) alloc_hooks(__bch2_darray_resize_noprof(__VA_ARGS__))
size_t new_size, gfp_t gfp)
{ #define __darray_resize(_d, _element_size, _new_size, _gfp) \
return unlikely(new_size > d->size) (unlikely((_new_size) > (_d)->size) \
? __bch2_darray_resize(d, element_size, new_size, gfp) ? __bch2_darray_resize((_d), (_element_size), (_new_size), (_gfp))\
: 0; : 0)
}
#define darray_resize_gfp(_d, _new_size, _gfp) \ #define darray_resize_gfp(_d, _new_size, _gfp) \
unlikely(__darray_resize((darray_char *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp)) __darray_resize((darray_char *) (_d), sizeof((_d)->data[0]), (_new_size), _gfp)
#define darray_resize(_d, _new_size) \ #define darray_resize(_d, _new_size) \
darray_resize_gfp(_d, _new_size, GFP_KERNEL) darray_resize_gfp(_d, _new_size, GFP_KERNEL)
static inline int __darray_make_room(darray_char *d, size_t t_size, size_t more, gfp_t gfp)
{
return __darray_resize(d, t_size, d->nr + more, gfp);
}
#define darray_make_room_gfp(_d, _more, _gfp) \ #define darray_make_room_gfp(_d, _more, _gfp) \
__darray_make_room((darray_char *) (_d), sizeof((_d)->data[0]), (_more), _gfp) darray_resize_gfp((_d), (_d)->nr + (_more), _gfp)
#define darray_make_room(_d, _more) \ #define darray_make_room(_d, _more) \
darray_make_room_gfp(_d, _more, GFP_KERNEL) darray_make_room_gfp(_d, _more, GFP_KERNEL)