kevin/linux
1
Fork 0
Code

lib/generic-radix-tree.c: add preallocation

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-08-10 23:14:44 -04:00
parent f659463381
commit b3f9da79e7
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/linux/generic-radix-tree.h
View File

@ -41,6 +41,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/math.h> #include <linux/math.h>
#include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
struct genradix_root; struct genradix_root;
@ -81,6 +82,10 @@ static inline struct genradix_node *genradix_root_to_node(struct genradix_root *
return (void *) ((unsigned long) r & ~GENRADIX_DEPTH_MASK); return (void *) ((unsigned long) r & ~GENRADIX_DEPTH_MASK);
} }
struct __genradix {
struct genradix_root *root;
};
struct genradix_node { struct genradix_node {
union { union {
/* Interior node: */ /* Interior node: */
@ -91,9 +96,15 @@ struct genradix_node {
}; };
}; };
struct __genradix { static inline struct genradix_node *genradix_alloc_node(gfp_t gfp_mask)
struct genradix_root *root; {
}; return kzalloc(GENRADIX_NODE_SIZE, gfp_mask);
}
static inline void genradix_free_node(struct genradix_node *node)
{
kfree(node);
}
/* /*
* NOTE: currently, sizeof(_type) must not be larger than GENRADIX_NODE_SIZE: * NOTE: currently, sizeof(_type) must not be larger than GENRADIX_NODE_SIZE:
@ -209,7 +220,8 @@ void *__genradix_ptr(struct __genradix *, size_t);
__genradix_ptr(&(_radix)->tree, \ __genradix_ptr(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx))) __genradix_idx_to_offset(_radix, _idx)))
void *__genradix_ptr_alloc(struct __genradix *, size_t, gfp_t); void *__genradix_ptr_alloc(struct __genradix *, size_t,
struct genradix_node **, gfp_t);
#define genradix_ptr_alloc_inlined(_radix, _idx, _gfp) \ #define genradix_ptr_alloc_inlined(_radix, _idx, _gfp) \
(__genradix_cast(_radix) \ (__genradix_cast(_radix) \
@ -217,7 +229,15 @@ void *__genradix_ptr_alloc(struct __genradix *, size_t, gfp_t);
__genradix_idx_to_offset(_radix, _idx)) ?: \ __genradix_idx_to_offset(_radix, _idx)) ?: \
__genradix_ptr_alloc(&(_radix)->tree, \ __genradix_ptr_alloc(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx), \ __genradix_idx_to_offset(_radix, _idx), \
_gfp))) NULL, _gfp)))
#define genradix_ptr_alloc_preallocated_inlined(_radix, _idx, _new_node, _gfp)\
(__genradix_cast(_radix) \
(__genradix_ptr_inlined(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx)) ?: \
__genradix_ptr_alloc(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx), \
_new_node, _gfp)))
/** /**
* genradix_ptr_alloc - get a pointer to a genradix entry, allocating it * genradix_ptr_alloc - get a pointer to a genradix entry, allocating it
@ -232,7 +252,13 @@ void *__genradix_ptr_alloc(struct __genradix *, size_t, gfp_t);
(__genradix_cast(_radix) \ (__genradix_cast(_radix) \
__genradix_ptr_alloc(&(_radix)->tree, \ __genradix_ptr_alloc(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx), \ __genradix_idx_to_offset(_radix, _idx), \
_gfp)) NULL, _gfp))
#define genradix_ptr_alloc_preallocated(_radix, _idx, _new_node, _gfp)\
(__genradix_cast(_radix) \
__genradix_ptr_alloc(&(_radix)->tree, \
__genradix_idx_to_offset(_radix, _idx), \
_new_node, _gfp))
struct genradix_iter { struct genradix_iter {
size_t offset; size_t offset;

16
lib/generic-radix-tree.c
View File

@ -15,27 +15,21 @@ void *__genradix_ptr(struct __genradix *radix, size_t offset)
} }
EXPORT_SYMBOL(__genradix_ptr); EXPORT_SYMBOL(__genradix_ptr);
static inline struct genradix_node *genradix_alloc_node(gfp_t gfp_mask)
{
return kzalloc(GENRADIX_NODE_SIZE, gfp_mask);
}
static inline void genradix_free_node(struct genradix_node *node)
{
kfree(node);
}
/* /*
* Returns pointer to the specified byte @offset within @radix, allocating it if * Returns pointer to the specified byte @offset within @radix, allocating it if
* necessary - newly allocated slots are always zeroed out: * necessary - newly allocated slots are always zeroed out:
*/ */
void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset, void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset,
struct genradix_node **preallocated,
gfp_t gfp_mask) gfp_t gfp_mask)
{ {
struct genradix_root *v = READ_ONCE(radix->root); struct genradix_root *v = READ_ONCE(radix->root);
struct genradix_node *n, *new_node = NULL; struct genradix_node *n, *new_node = NULL;
unsigned level; unsigned level;
if (preallocated)
swap(new_node, *preallocated);
/* Increase tree depth if necessary: */ /* Increase tree depth if necessary: */
while (1) { while (1) {
struct genradix_root *r = v, *new_root; struct genradix_root *r = v, *new_root;
@ -219,7 +213,7 @@ int __genradix_prealloc(struct __genradix *radix, size_t size,
size_t offset; size_t offset;
for (offset = 0; offset < size; offset += GENRADIX_NODE_SIZE) for (offset = 0; offset < size; offset += GENRADIX_NODE_SIZE)
if (!__genradix_ptr_alloc(radix, offset, gfp_mask)) if (!__genradix_ptr_alloc(radix, offset, NULL, gfp_mask))
return -ENOMEM; return -ENOMEM;
return 0; return 0;