Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26fb1589 authored by Jeff Moyer's avatar Jeff Moyer Committed by Linus Torvalds
Browse files

fix the max path calculation in radix-tree.c 



A while back, Nick Piggin introduced a patch to reduce the node memory
usage for small files (commit cfd9b7df):

-#define RADIX_TREE_MAP_SHIFT	6
+#define RADIX_TREE_MAP_SHIFT	(CONFIG_BASE_SMALL ? 4 : 6)

Unfortunately, he didn't take into account the fact that the
calculation of the maximum path was based on an assumption of having
to round up:

#define RADIX_TREE_MAX_PATH (RADIX_TREE_INDEX_BITS/RADIX_TREE_MAP_SHIFT + 2)

So, if CONFIG_BASE_SMALL is set, you will end up with a
RADIX_TREE_MAX_PATH that is one greater than necessary.  The practical
upshot of this is just a bit of wasted memory (one long in the
height_to_maxindex array, an extra pre-allocated radix tree node per
cpu, and extra stack usage in a couple of functions), but it seems
worth getting right.

It's also worth noting that I never build with CONFIG_BASE_SMALL.
What I did to test this was duplicate the code in a small user-space
program and check the results of the calculations for max path and the
contents of the height_to_maxindex array.

Signed-off-by: default avatarJeff Moyer <jmoyer@redhat.com>
Acked-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a4b0672d

lib/radix-tree.c

+17 −4
Original line number Diff line number Diff line
@@ -60,9 +60,14 @@ struct radix_tree_path { 
};



#define RADIX_TREE_INDEX_BITS  (8 /* CHAR_BIT */ * sizeof(unsigned long))

#define RADIX_TREE_MAX_PATH (RADIX_TREE_INDEX_BITS/RADIX_TREE_MAP_SHIFT + 2)

#define RADIX_TREE_MAX_PATH (DIV_ROUND_UP(RADIX_TREE_INDEX_BITS, \

					  RADIX_TREE_MAP_SHIFT))



static unsigned long height_to_maxindex[RADIX_TREE_MAX_PATH] __read_mostly;

/*

 * The height_to_maxindex array needs to be one deeper than the maximum

 * path as height 0 holds only 1 entry.

 */

static unsigned long height_to_maxindex[RADIX_TREE_MAX_PATH + 1] __read_mostly;



/*

 * Radix tree node cache.
@@ -492,7 +497,11 @@ EXPORT_SYMBOL(radix_tree_tag_set); 
void *radix_tree_tag_clear(struct radix_tree_root *root,

			unsigned long index, unsigned int tag)

{

	struct radix_tree_path path[RADIX_TREE_MAX_PATH], *pathp = path;

	/*

	 * The radix tree path needs to be one longer than the maximum path

	 * since the "list" is null terminated.

	 */

	struct radix_tree_path path[RADIX_TREE_MAX_PATH + 1], *pathp = path;

	struct radix_tree_node *slot = NULL;

	unsigned int height, shift;
@@ -934,7 +943,11 @@ static inline void radix_tree_shrink(struct radix_tree_root *root) 
 */

void *radix_tree_delete(struct radix_tree_root *root, unsigned long index)

{

	struct radix_tree_path path[RADIX_TREE_MAX_PATH], *pathp = path;

	/*

	 * The radix tree path needs to be one longer than the maximum path

	 * since the "list" is null terminated.

	 */

	struct radix_tree_path path[RADIX_TREE_MAX_PATH + 1], *pathp = path;

	struct radix_tree_node *slot = NULL;

	struct radix_tree_node *to_free;

	unsigned int height, shift;