From: Alexander Duyck <alexander.h.duyck@redhat.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net
Subject: [net-next PATCH 3/9] fib_trie: replace tnode_get_child functions with get_child macros
Date: Thu, 05 Mar 2015 14:50:48 -0800 [thread overview]
Message-ID: <20150305225047.1642.59727.stgit@ahduyck-vm-fedora20> (raw)
In-Reply-To: <20150305224208.1642.34205.stgit@ahduyck-vm-fedora20>
I am replacing the tnode_get_child call with get_child since we are
techically pulling the child out of a key_vector now and not a tnode.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
---
net/ipv4/fib_trie.c | 58 ++++++++++++++++++++-------------------------------
1 file changed, 23 insertions(+), 35 deletions(-)
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index e8a99c6..c9b24e8 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -158,9 +158,11 @@ static struct kmem_cache *trie_leaf_kmem __read_mostly;
/* caller must hold RTNL */
#define node_parent(n) rtnl_dereference((n)->parent)
+#define get_child(tn, i) rtnl_dereference((tn)->tnode[i])
/* caller must hold RCU read lock or RTNL */
#define node_parent_rcu(n) rcu_dereference_rtnl((n)->parent)
+#define get_child_rcu(tn, i) rcu_dereference_rtnl((tn)->tnode[i])
/* wrapper for rcu_assign_pointer */
static inline void node_set_parent(struct key_vector *n, struct key_vector *tp)
@@ -179,20 +181,6 @@ static inline unsigned long tnode_child_length(const struct key_vector *tn)
return (1ul << tn->bits) & ~(1ul);
}
-/* caller must hold RTNL */
-static inline struct key_vector *tnode_get_child(struct key_vector *tn,
- unsigned long i)
-{
- return rtnl_dereference(tn->tnode[i]);
-}
-
-/* caller must hold RCU read lock or RTNL */
-static inline struct key_vector *tnode_get_child_rcu(struct key_vector *tn,
- unsigned long i)
-{
- return rcu_dereference_rtnl(tn->tnode[i]);
-}
-
static inline struct fib_table *trie_get_table(struct trie *t)
{
unsigned long *tb_data = (unsigned long *)t;
@@ -382,7 +370,7 @@ static inline int tnode_full(struct key_vector *tn, struct key_vector *n)
static void put_child(struct key_vector *tn, unsigned long i,
struct key_vector *n)
{
- struct key_vector *chi = tnode_get_child(tn, i);
+ struct key_vector *chi = get_child(tn, i);
int isfull, wasfull;
BUG_ON(i >= tnode_child_length(tn));
@@ -414,7 +402,7 @@ static void update_children(struct key_vector *tn)
/* update all of the child parent pointers */
for (i = tnode_child_length(tn); i;) {
- struct key_vector *inode = tnode_get_child(tn, --i);
+ struct key_vector *inode = get_child(tn, --i);
if (!inode)
continue;
@@ -492,7 +480,7 @@ static struct key_vector __rcu **replace(struct trie *t,
/* resize children now that oldtnode is freed */
for (i = tnode_child_length(tn); i;) {
- struct key_vector *inode = tnode_get_child(tn, --i);
+ struct key_vector *inode = get_child(tn, --i);
/* resize child node */
if (tnode_full(tn, inode))
@@ -524,7 +512,7 @@ static struct key_vector __rcu **inflate(struct trie *t,
* nodes.
*/
for (i = tnode_child_length(oldtnode), m = 1u << tn->pos; i;) {
- struct key_vector *inode = tnode_get_child(oldtnode, --i);
+ struct key_vector *inode = get_child(oldtnode, --i);
struct key_vector *node0, *node1;
unsigned long j, k;
@@ -543,8 +531,8 @@ static struct key_vector __rcu **inflate(struct trie *t,
/* An internal node with two children */
if (inode->bits == 1) {
- put_child(tn, 2 * i + 1, tnode_get_child(inode, 1));
- put_child(tn, 2 * i, tnode_get_child(inode, 0));
+ put_child(tn, 2 * i + 1, get_child(inode, 1));
+ put_child(tn, 2 * i, get_child(inode, 0));
continue;
}
@@ -574,10 +562,10 @@ static struct key_vector __rcu **inflate(struct trie *t,
/* populate child pointers in new nodes */
for (k = tnode_child_length(inode), j = k / 2; j;) {
- put_child(node1, --j, tnode_get_child(inode, --k));
- put_child(node0, j, tnode_get_child(inode, j));
- put_child(node1, --j, tnode_get_child(inode, --k));
- put_child(node0, j, tnode_get_child(inode, 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));
+ put_child(node0, j, get_child(inode, j));
}
/* link new nodes to parent */
@@ -619,8 +607,8 @@ static struct key_vector __rcu **halve(struct trie *t,
* nodes.
*/
for (i = tnode_child_length(oldtnode); i;) {
- struct key_vector *node1 = tnode_get_child(oldtnode, --i);
- struct key_vector *node0 = tnode_get_child(oldtnode, --i);
+ struct key_vector *node1 = get_child(oldtnode, --i);
+ struct key_vector *node0 = get_child(oldtnode, --i);
struct key_vector *inode;
/* At least one of the children is empty */
@@ -660,7 +648,7 @@ static void collapse(struct trie *t, struct key_vector *oldtnode)
/* scan the tnode looking for that one child that might still exist */
for (n = NULL, i = tnode_child_length(oldtnode); !n && i;)
- n = tnode_get_child(oldtnode, --i);
+ n = get_child(oldtnode, --i);
/* compress one level */
tp = node_parent(oldtnode);
@@ -682,7 +670,7 @@ static unsigned char update_suffix(struct key_vector *tn)
* represent the nodes with suffix length equal to tn->pos
*/
for (i = 0, stride = 0x2ul ; i < tnode_child_length(tn); i += stride) {
- struct key_vector *n = tnode_get_child(tn, i);
+ struct key_vector *n = get_child(tn, i);
if (!n || (n->slen <= slen))
continue;
@@ -941,7 +929,7 @@ static struct key_vector *fib_find_node(struct trie *t,
break;
pn = n;
- n = tnode_get_child_rcu(n, index);
+ n = get_child_rcu(n, index);
}
*tp = pn;
@@ -999,7 +987,7 @@ static int fib_insert_node(struct trie *t, struct key_vector *tp,
/* retrieve child from parent node */
if (tp)
- n = tnode_get_child(tp, get_index(key, tp));
+ n = get_child(tp, get_index(key, tp));
else
n = rcu_dereference_rtnl(t->tnode[0]);
@@ -1287,7 +1275,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
cindex = index;
}
- n = tnode_get_child_rcu(n, index);
+ n = get_child_rcu(n, index);
if (unlikely(!n))
goto backtrace;
}
@@ -1526,7 +1514,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key)
cindex = idx;
/* descend into the next child */
- n = tnode_get_child_rcu(pn, cindex++);
+ n = get_child_rcu(pn, cindex++);
}
/* this loop will search for the next leaf with a greater key */
@@ -1544,7 +1532,7 @@ static struct key_vector *leaf_walk_rcu(struct key_vector **tn, t_key key)
}
/* grab the next available node */
- n = tnode_get_child_rcu(pn, cindex++);
+ n = get_child_rcu(pn, cindex++);
if (!n)
continue;
@@ -1610,7 +1598,7 @@ backtrace:
}
/* grab the next available node */
- n = tnode_get_child(pn, cindex);
+ n = get_child(pn, cindex);
} while (!n);
}
@@ -1803,7 +1791,7 @@ static struct key_vector *fib_trie_get_next(struct fib_trie_iter *iter)
iter->tnode, iter->index, iter->depth);
rescan:
while (cindex < tnode_child_length(tn)) {
- struct key_vector *n = tnode_get_child_rcu(tn, cindex);
+ struct key_vector *n = get_child_rcu(tn, cindex);
if (n) {
if (IS_LEAF(n)) {
next prev parent reply other threads:[~2015-03-05 22:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 22:50 [net-next PATCH 0/9] The rest of the FIB patches (add key_vector to fib_table) Alexander Duyck
2015-03-05 22:50 ` [net-next PATCH 1/9] fib_trie: Return pointer to tnode pointer in resize/inflate/halve Alexander Duyck
2015-03-05 22:50 ` [net-next PATCH 2/9] fib_trie: Rename tnode to key_vector Alexander Duyck
2015-03-05 22:50 ` Alexander Duyck [this message]
2015-03-05 22:50 ` [net-next PATCH 4/9] fib_trie: Rename tnode_child_length to child_length Alexander Duyck
2015-03-05 22:51 ` [net-next PATCH 5/9] fib_trie: Add tnode struct as a container for fields not needed in key_vector Alexander Duyck
2015-03-06 13:17 ` Sergei Shtylyov
2015-03-06 16:13 ` Alexander Duyck
2015-03-05 22:51 ` [net-next PATCH 6/9] fib_trie: Move rcu from key_vector to tnode, add accessors Alexander Duyck
2015-03-05 22:51 ` [net-next PATCH 7/9] fib_trie: Pull empty_children and full_children into tnode Alexander Duyck
2015-03-05 22:51 ` [net-next PATCH 8/9] fib_trie: Move parent from key_vector to tnode Alexander Duyck
2015-03-05 22:51 ` [net-next PATCH 9/9] fib_trie: Add key vector to root, return parent key_vector in resize Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150305225047.1642.59727.stgit@ahduyck-vm-fedora20 \
--to=alexander.h.duyck@redhat.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox