wireguard: allowedips: use kfree_rcu() instead of call_rcu()
authorWei Yongjun <weiyongjun1@huawei.com>
Sun, 15 Dec 2019 21:08:04 +0000 (22:08 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Dec 2019 03:22:22 +0000 (19:22 -0800)
The callback function of call_rcu() just calls a kfree(), so we
can use kfree_rcu() instead of call_rcu() + callback function.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/allowedips.c

index 72667d5399c34c66c876d627505183662f327221..121d9ea0f13584f801ab895753e936c0a12f0028 100644 (file)
@@ -31,11 +31,6 @@ static void copy_and_assign_cidr(struct allowedips_node *node, const u8 *src,
 #define CHOOSE_NODE(parent, key) \
        parent->bit[(key[parent->bit_at_a] >> parent->bit_at_b) & 1]
 
-static void node_free_rcu(struct rcu_head *rcu)
-{
-       kfree(container_of(rcu, struct allowedips_node, rcu));
-}
-
 static void push_rcu(struct allowedips_node **stack,
                     struct allowedips_node __rcu *p, unsigned int *len)
 {
@@ -112,7 +107,7 @@ static void walk_remove_by_peer(struct allowedips_node __rcu **top,
                                if (!node->bit[0] || !node->bit[1]) {
                                        rcu_assign_pointer(*nptr, DEREF(
                                               &node->bit[!REF(node->bit[0])]));
-                                       call_rcu(&node->rcu, node_free_rcu);
+                                       kfree_rcu(node, rcu);
                                        node = DEREF(nptr);
                                }
                        }