Skip to content

Commit

Permalink
radix-tree: rename indirect_to_ptr() to entry_to_node()
Browse files Browse the repository at this point in the history 
Mirrors the earlier commit introducing node_to_entry().

Also change the type returned to be a struct radix_tree_node pointer.
That lets us simplify a couple of places in the radix tree shrink &
extend paths where we could convert an entry into a pointer, modify the
node, then convert the pointer back into an entry.

Signed-off-by: Matthew Wilcox <[email protected]>
Cc: Konstantin Khlebnikov <[email protected]>
Cc: Kirill Shutemov <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Neil Brown <[email protected]>
Cc: Ross Zwisler <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@torvalds
Matthew Wilcox authored and torvalds committed May 21, 2016
1 parent a4db4dc commit 4dd6c09
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 37 deletions.
12 changes: 5 additions & 7 deletions include/linux/radix-tree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ radix_tree_chunk_size(struct radix_tree_iter *iter)
return (iter->next_index - iter->index) >> iter_shift(iter);
}

static inline void *indirect_to_ptr(void *ptr)
static inline struct radix_tree_node *entry_to_node(void *ptr)
{
return (void *)((unsigned long)ptr & ~RADIX_TREE_INTERNAL_NODE);
}
Expand All @@ -469,7 +469,7 @@ radix_tree_next_slot(void **slot, struct radix_tree_iter *iter, unsigned flags)
return NULL;
while (IS_ENABLED(CONFIG_RADIX_TREE_MULTIORDER) &&
radix_tree_is_indirect_ptr(slot[1])) {
if (indirect_to_ptr(slot[1]) == canon) {
if (entry_to_node(slot[1]) == canon) {
iter->tags >>= 1;
iter->index = __radix_tree_iter_add(iter, 1);
slot++;
Expand Down Expand Up @@ -499,12 +499,10 @@ radix_tree_next_slot(void **slot, struct radix_tree_iter *iter, unsigned flags)

if (IS_ENABLED(CONFIG_RADIX_TREE_MULTIORDER) &&
radix_tree_is_indirect_ptr(*slot)) {
if (indirect_to_ptr(*slot) == canon)
if (entry_to_node(*slot) == canon)
continue;
else {
iter->next_index = iter->index;
break;
}
iter->next_index = iter->index;
break;
}

if (likely(*slot))
Expand Down
48 changes: 21 additions & 27 deletions lib/radix-tree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@ static void dump_node(struct radix_tree_node *node, unsigned long index)
if (is_sibling_entry(node, entry)) {
pr_debug("radix sblng %p offset %ld val %p indices %ld-%ld\n",
entry, i,
*(void **)indirect_to_ptr(entry),
*(void **)entry_to_node(entry),
first, last);
} else if (!radix_tree_is_indirect_ptr(entry)) {
pr_debug("radix entry %p offset %ld indices %ld-%ld\n",
entry, i, first, last);
} else {
dump_node(indirect_to_ptr(entry), first);
dump_node(entry_to_node(entry), first);
}
}
}
Expand All @@ -249,7 +249,7 @@ static void radix_tree_dump(struct radix_tree_root *root)
root->gfp_mask >> __GFP_BITS_SHIFT);
if (!radix_tree_is_indirect_ptr(root->rnode))
return;
dump_node(indirect_to_ptr(root->rnode), 0);
dump_node(entry_to_node(root->rnode), 0);
}
#endif

Expand Down Expand Up @@ -422,7 +422,7 @@ static unsigned radix_tree_load_root(struct radix_tree_root *root,
*nodep = node;

if (likely(radix_tree_is_indirect_ptr(node))) {
node = indirect_to_ptr(node);
node = entry_to_node(node);
*maxindex = node_maxindex(node);
return node->shift + RADIX_TREE_MAP_SHIFT;
}
Expand Down Expand Up @@ -467,11 +467,8 @@ static int radix_tree_extend(struct radix_tree_root *root,
node->offset = 0;
node->count = 1;
node->parent = NULL;
if (radix_tree_is_indirect_ptr(slot)) {
slot = indirect_to_ptr(slot);
slot->parent = node;
slot = node_to_entry(slot);
}
if (radix_tree_is_indirect_ptr(slot))
entry_to_node(slot)->parent = node;
node->slots[0] = slot;
slot = node_to_entry(node);
rcu_assign_pointer(root->rnode, slot);
Expand Down Expand Up @@ -542,7 +539,7 @@ int __radix_tree_create(struct radix_tree_root *root, unsigned long index,
break;

/* Go a level down */
node = indirect_to_ptr(slot);
node = entry_to_node(slot);
offset = (index >> shift) & RADIX_TREE_MAP_MASK;
offset = radix_tree_descend(node, &slot, offset);
}
Expand Down Expand Up @@ -645,7 +642,7 @@ void *__radix_tree_lookup(struct radix_tree_root *root, unsigned long index,

if (node == RADIX_TREE_RETRY)
goto restart;
parent = indirect_to_ptr(node);
parent = entry_to_node(node);
shift -= RADIX_TREE_MAP_SHIFT;
offset = (index >> shift) & RADIX_TREE_MAP_MASK;
offset = radix_tree_descend(parent, &node, offset);
Expand Down Expand Up @@ -729,7 +726,7 @@ void *radix_tree_tag_set(struct radix_tree_root *root,
shift -= RADIX_TREE_MAP_SHIFT;
offset = (index >> shift) & RADIX_TREE_MAP_MASK;

parent = indirect_to_ptr(node);
parent = entry_to_node(node);
offset = radix_tree_descend(parent, &node, offset);
BUG_ON(!node);

Expand Down Expand Up @@ -777,7 +774,7 @@ void *radix_tree_tag_clear(struct radix_tree_root *root,
shift -= RADIX_TREE_MAP_SHIFT;
offset = (index >> shift) & RADIX_TREE_MAP_MASK;

parent = indirect_to_ptr(node);
parent = entry_to_node(node);
offset = radix_tree_descend(parent, &node, offset);
}

Expand Down Expand Up @@ -844,7 +841,7 @@ int radix_tree_tag_get(struct radix_tree_root *root,
shift -= RADIX_TREE_MAP_SHIFT;
offset = (index >> shift) & RADIX_TREE_MAP_MASK;

parent = indirect_to_ptr(node);
parent = entry_to_node(node);
offset = radix_tree_descend(parent, &node, offset);

if (!node)
Expand Down Expand Up @@ -904,7 +901,7 @@ void **radix_tree_next_chunk(struct radix_tree_root *root,
return NULL;

if (radix_tree_is_indirect_ptr(rnode)) {
rnode = indirect_to_ptr(rnode);
rnode = entry_to_node(rnode);
} else if (rnode) {
/* Single-slot tree */
iter->index = index;
Expand Down Expand Up @@ -963,7 +960,7 @@ void **radix_tree_next_chunk(struct radix_tree_root *root,
if (!radix_tree_is_indirect_ptr(slot))
break;

node = indirect_to_ptr(slot);
node = entry_to_node(slot);
shift -= RADIX_TREE_MAP_SHIFT;
offset = (index >> shift) & RADIX_TREE_MAP_MASK;
}
Expand Down Expand Up @@ -1048,7 +1045,7 @@ unsigned long radix_tree_range_tag_if_tagged(struct radix_tree_root *root,
return 1;
}

node = indirect_to_ptr(slot);
node = entry_to_node(slot);
shift -= RADIX_TREE_MAP_SHIFT;

for (;;) {
Expand All @@ -1063,7 +1060,7 @@ unsigned long radix_tree_range_tag_if_tagged(struct radix_tree_root *root,
goto next;
/* Sibling slots never have tags set on them */
if (radix_tree_is_indirect_ptr(slot)) {
node = indirect_to_ptr(slot);
node = entry_to_node(slot);
shift -= RADIX_TREE_MAP_SHIFT;
continue;
}
Expand Down Expand Up @@ -1322,7 +1319,7 @@ static unsigned long __locate(struct radix_tree_node *slot, void *item,
}
continue;
}
node = indirect_to_ptr(node);
node = entry_to_node(node);
if (is_sibling_entry(slot, node))
continue;
slot = node;
Expand Down Expand Up @@ -1367,7 +1364,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item)
break;
}

node = indirect_to_ptr(node);
node = entry_to_node(node);

max_index = node_maxindex(node);
if (cur_index > max_index) {
Expand Down Expand Up @@ -1403,7 +1400,7 @@ static inline bool radix_tree_shrink(struct radix_tree_root *root)

if (!radix_tree_is_indirect_ptr(to_free))
break;
to_free = indirect_to_ptr(to_free);
to_free = entry_to_node(to_free);

/*
* The candidate node has more than one child, or its child
Expand All @@ -1418,11 +1415,8 @@ static inline bool radix_tree_shrink(struct radix_tree_root *root)
if (!radix_tree_is_indirect_ptr(slot) && to_free->shift)
break;

if (radix_tree_is_indirect_ptr(slot)) {
slot = indirect_to_ptr(slot);
slot->parent = NULL;
slot = node_to_entry(slot);
}
if (radix_tree_is_indirect_ptr(slot))
entry_to_node(slot)->parent = NULL;

/*
* We don't need rcu_assign_pointer(), since we are simply
Expand Down Expand Up @@ -1481,7 +1475,7 @@ bool __radix_tree_delete_node(struct radix_tree_root *root,
struct radix_tree_node *parent;

if (node->count) {
if (node == indirect_to_ptr(root->rnode))
if (node == entry_to_node(root->rnode))
deleted |= radix_tree_shrink(root);
return deleted;
}
Expand Down
4 changes: 2 additions & 2 deletions tools/testing/radix-tree/test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static int verify_node(struct radix_tree_node *slot, unsigned int tag,
int i;
int j;

slot = indirect_to_ptr(slot);
slot = entry_to_node(slot);

/* Verify consistency at this level */
for (i = 0; i < RADIX_TREE_TAG_LONGS; i++) {
Expand Down Expand Up @@ -227,7 +227,7 @@ void tree_verify_min_height(struct radix_tree_root *root, int maxindex)
return;
}

node = indirect_to_ptr(node);
node = entry_to_node(node);
assert(maxindex <= node_maxindex(node));

shift = node->shift;
Expand Down
1 change: 0 additions & 1 deletion tools/testing/radix-tree/test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ void verify_tag_consistency(struct radix_tree_root *root, unsigned int tag);
extern int nr_allocated;

/* Normally private parts of lib/radix-tree.c */
void *indirect_to_ptr(void *ptr);
void radix_tree_dump(struct radix_tree_root *root);
int root_tag_get(struct radix_tree_root *root, unsigned int tag);
unsigned long node_maxindex(struct radix_tree_node *);
Expand Down

0 comments on commit 4dd6c09

Please sign in to comment.