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

Commit 2e1ac88a authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

fib_trie: Rename tnode_child_length to child_length 



We are now checking the length of a key_vector instead of a tnode so it
makes sense to probably just rename this to child_length since it would
probably even be applicable to a leaf.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 754baf8d

net/ipv4/fib_trie.c

+29 −24
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ typedef unsigned int t_key; 
#define IS_TNODE(n) ((n)->bits)

#define IS_LEAF(n) (!(n)->bits)



#define get_index(_key, _kv) (((_key) ^ (_kv)->key) >> (_kv)->pos)



struct key_vector {

	struct rcu_head rcu;
@@ -177,11 +175,18 @@ static inline void node_set_parent(struct key_vector *n, struct key_vector *tp) 
/* This provides us with the number of children in this node, in the case of a

 * leaf this will return 0 meaning none of the children are accessible.

 */

static inline unsigned long tnode_child_length(const struct key_vector *tn)

static inline unsigned long child_length(const struct key_vector *tn)

{

	return (1ul << tn->bits) & ~(1ul);

}



static inline unsigned long get_index(t_key key, struct key_vector *kv)

{

	unsigned long index = key ^ kv->key;



	return index >> kv->pos;

}



static inline struct fib_table *trie_get_table(struct trie *t)

{

	unsigned long *tb_data = (unsigned long *)t;
@@ -374,7 +379,7 @@ static void put_child(struct key_vector *tn, unsigned long i, 
	struct key_vector *chi = get_child(tn, i);

	int isfull, wasfull;



	BUG_ON(i >= tnode_child_length(tn));

	BUG_ON(i >= child_length(tn));



	/* update emptyChildren, overflow into fullChildren */

	if (n == NULL && chi != NULL)
@@ -402,7 +407,7 @@ static void update_children(struct key_vector *tn) 
	unsigned long i;



	/* update all of the child parent pointers */

	for (i = tnode_child_length(tn); i;) {

	for (i = child_length(tn); i;) {

		struct key_vector *inode = get_child(tn, --i);



		if (!inode)
@@ -480,7 +485,7 @@ static struct key_vector __rcu **replace(struct trie *t, 
	cptr = tp ? tp->tnode : t->tnode;



	/* resize children now that oldtnode is freed */

	for (i = tnode_child_length(tn); i;) {

	for (i = child_length(tn); i;) {

		struct key_vector *inode = get_child(tn, --i);



		/* resize child node */
@@ -512,7 +517,7 @@ static struct key_vector __rcu **inflate(struct trie *t, 
	 * point to existing tnodes and the links between our allocated

	 * nodes.

	 */

	for (i = tnode_child_length(oldtnode), m = 1u << tn->pos; i;) {

	for (i = child_length(oldtnode), m = 1u << tn->pos; i;) {

		struct key_vector *inode = get_child(oldtnode, --i);

		struct key_vector *node0, *node1;

		unsigned long j, k;
@@ -562,7 +567,7 @@ static struct key_vector __rcu **inflate(struct trie *t, 
		tnode_free_append(tn, node0);



		/* populate child pointers in new nodes */

		for (k = tnode_child_length(inode), j = k / 2; j;) {

		for (k = child_length(inode), j = k / 2; j;) {

			put_child(node1, --j, get_child(inode, --k));

			put_child(node0, j, get_child(inode, j));

			put_child(node1, --j, get_child(inode, --k));
@@ -607,7 +612,7 @@ static struct key_vector __rcu **halve(struct trie *t, 
	 * point to existing tnodes and the links between our allocated

	 * nodes.

	 */

	for (i = tnode_child_length(oldtnode); i;) {

	for (i = child_length(oldtnode); i;) {

		struct key_vector *node1 = get_child(oldtnode, --i);

		struct key_vector *node0 = get_child(oldtnode, --i);

		struct key_vector *inode;
@@ -648,7 +653,7 @@ static void collapse(struct trie *t, struct key_vector *oldtnode) 
	unsigned long i;



	/* scan the tnode looking for that one child that might still exist */

	for (n = NULL, i = tnode_child_length(oldtnode); !n && i;)

	for (n = NULL, i = child_length(oldtnode); !n && i;)

		n = get_child(oldtnode, --i);



	/* compress one level */
@@ -670,7 +675,7 @@ static unsigned char update_suffix(struct key_vector *tn) 
	 * why we start with a stride of 2 since a stride of 1 would

	 * represent the nodes with suffix length equal to tn->pos

	 */

	for (i = 0, stride = 0x2ul ; i < tnode_child_length(tn); i += stride) {

	for (i = 0, stride = 0x2ul ; i < child_length(tn); i += stride) {

		struct key_vector *n = get_child(tn, i);



		if (!n || (n->slen <= slen))
@@ -703,12 +708,12 @@ static unsigned char update_suffix(struct key_vector *tn) 
 *

 * 'high' in this instance is the variable 'inflate_threshold'. It

 * is expressed as a percentage, so we multiply it with

 * tnode_child_length() and instead of multiplying by 2 (since the

 * child_length() and instead of multiplying by 2 (since the

 * child array will be doubled by inflate()) and multiplying

 * the left-hand side by 100 (to handle the percentage thing) we

 * multiply the left-hand side by 50.

 *

 * The left-hand side may look a bit weird: tnode_child_length(tn)

 * The left-hand side may look a bit weird: child_length(tn)

 * - tn->empty_children is of course the number of non-null children

 * in the current node. tn->full_children is the number of "full"

 * children, that is non-null tnodes with a skip value of 0.
@@ -718,10 +723,10 @@ static unsigned char update_suffix(struct key_vector *tn) 
 * A clearer way to write this would be:

 *

 * to_be_doubled = tn->full_children;

 * not_to_be_doubled = tnode_child_length(tn) - tn->empty_children -

 * not_to_be_doubled = child_length(tn) - tn->empty_children -

 *     tn->full_children;

 *

 * new_child_length = tnode_child_length(tn) * 2;

 * new_child_length = child_length(tn) * 2;

 *

 * new_fill_factor = 100 * (not_to_be_doubled + 2*to_be_doubled) /

 *      new_child_length;
@@ -738,23 +743,23 @@ static unsigned char update_suffix(struct key_vector *tn) 
 *      inflate_threshold * new_child_length

 *

 * expand not_to_be_doubled and to_be_doubled, and shorten:

 * 100 * (tnode_child_length(tn) - tn->empty_children +

 * 100 * (child_length(tn) - tn->empty_children +

 *    tn->full_children) >= inflate_threshold * new_child_length

 *

 * expand new_child_length:

 * 100 * (tnode_child_length(tn) - tn->empty_children +

 * 100 * (child_length(tn) - tn->empty_children +

 *    tn->full_children) >=

 *      inflate_threshold * tnode_child_length(tn) * 2

 *      inflate_threshold * child_length(tn) * 2

 *

 * shorten again:

 * 50 * (tn->full_children + tnode_child_length(tn) -

 * 50 * (tn->full_children + child_length(tn) -

 *    tn->empty_children) >= inflate_threshold *

 *    tnode_child_length(tn)

 *    child_length(tn)

 *

 */

static inline bool should_inflate(struct key_vector *tp, struct key_vector *tn)

{

	unsigned long used = tnode_child_length(tn);

	unsigned long used = child_length(tn);

	unsigned long threshold = used;



	/* Keep root node larger */
@@ -769,7 +774,7 @@ static inline bool should_inflate(struct key_vector *tp, struct key_vector *tn) 


static inline bool should_halve(struct key_vector *tp, struct key_vector *tn)

{

	unsigned long used = tnode_child_length(tn);

	unsigned long used = child_length(tn);

	unsigned long threshold = used;



	/* Keep root node larger */
@@ -783,7 +788,7 @@ static inline bool should_halve(struct key_vector *tp, struct key_vector *tn) 


static inline bool should_collapse(struct key_vector *tn)

{

	unsigned long used = tnode_child_length(tn);

	unsigned long used = child_length(tn);



	used -= tn->empty_children;
@@ -1874,7 +1879,7 @@ static struct key_vector *fib_trie_get_next(struct fib_trie_iter *iter) 
	pr_debug("get_next iter={node=%p index=%d depth=%d}\n",

		 iter->tnode, iter->index, iter->depth);

rescan:

	while (cindex < tnode_child_length(tn)) {

	while (cindex < child_length(tn)) {

		struct key_vector *n = get_child_rcu(tn, cindex);



		if (n) {