Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

radix-tree: fix radix_tree_dump() for multi-order entries

Browse Source 
- Print which indices are covered by every leaf entry
 - Print sibling entries
 - Print the node pointer instead of the slot entry
 - Build by default in userspace, and make it accessible to the test-suite

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ross Zwisler 2016-05-20 17:02:55 -07:00 committed by Linus Torvalds
parent 070c5ac274
commit 0796c58325
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/radix-tree.c
View File

@ -215,27 +215,36 @@ radix_tree_find_next_bit(const unsigned long *addr,
return size;
}
#if 0
static void dump_node(void *slot, int height, int offset)
#ifndef __KERNEL__
static void dump_node(struct radix_tree_node *node, unsigned offset,
unsigned shift, unsigned long index)
{
struct radix_tree_node *node;
int i;
unsigned long i;
if (!slot)
return;
if (height == 0) {
pr_debug("radix entry %p offset %d\n", slot, offset);
return;
}
node = indirect_to_ptr(slot);
pr_debug("radix node: %p offset %d tags %lx %lx %lx path %x count %d parent %p\n",
slot, offset, node->tags[0][0], node->tags[1][0],
node->tags[2][0], node->path, node->count, node->parent);
node, offset,
node->tags[0][0], node->tags[1][0], node->tags[2][0],
node->path, node->count, node->parent);
for (i = 0; i < RADIX_TREE_MAP_SIZE; i++)
dump_node(node->slots[i], height - 1, i);
for (i = 0; i < RADIX_TREE_MAP_SIZE; i++) {
unsigned long first = index | (i << shift);
unsigned long last = first | ((1UL << shift) - 1);
void *entry = node->slots[i];
if (!entry)
continue;
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),
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), i,
shift - RADIX_TREE_MAP_SHIFT, first);
}
}
}
/* For debug */
@ -246,7 +255,8 @@ 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(root->rnode, root->height, 0);
dump_node(indirect_to_ptr(root->rnode), 0,
(root->height - 1) * RADIX_TREE_MAP_SHIFT, 0);
}
#endif

1
tools/testing/radix-tree/test.h
View File

@ -40,5 +40,6 @@ 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 radix_tree_maxindex(unsigned int height);