2021-03-02 08:24:45 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
From: Wei Yongjun <weiyongjun1@huawei.com>
|
|
|
|
|
Date: Sun, 15 Dec 2019 22:08:04 +0100
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] wireguard: allowedips: use kfree_rcu() instead of call_rcu()
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
|
|
|
|
|
commit d89ee7d5c73af15c1c6f12b016cdf469742b5726 upstream.
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireguard/allowedips.c | 7 +------
|
|
|
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireguard/allowedips.c
|
|
|
|
|
+++ b/drivers/net/wireguard/allowedips.c
|
|
|
|
|
@@ -31,11 +31,6 @@ static void copy_and_assign_cidr(struct
|
|
|
|
|
#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 a
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
