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

Commit 789aaa03 authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: wireguard: allowedips: use kfree_rcu() instead of call_rcu() 



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: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit d89ee7d5c73af15c1c6f12b016cdf469742b5726)
Bug: 152722841
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8a50d841105381849825c9cf0185dad55a33fc36
parent 69b3f7a3

drivers/net/wireguard/allowedips.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

				}

			}