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: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
|
|
|
Date: Fri, 14 Feb 2020 23:57:23 +0100
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] wireguard: socket: remove extra call to synchronize_net
|
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 1fbc33b0a7feb6ca72bf7dc8a05d81485ee8ee2e upstream.
|
|
|
|
|
|
|
|
|
|
synchronize_net() is a wrapper around synchronize_rcu(), so there's no
|
|
|
|
|
point in having synchronize_net and synchronize_rcu back to back,
|
|
|
|
|
despite the documentation comment suggesting maybe it's somewhat useful,
|
|
|
|
|
"Wait for packets currently being received to be done." This commit
|
|
|
|
|
removes the extra call.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
|
|
|
Reviewed-by: Eric Dumazet <edumazet@google.com>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireguard/socket.c | 1 -
|
|
|
|
|
1 file changed, 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireguard/socket.c
|
|
|
|
|
+++ b/drivers/net/wireguard/socket.c
|
|
|
|
|
@@ -432,7 +432,6 @@ void wg_socket_reinit(struct wg_device *
|
|
|
|
|
wg->incoming_port = ntohs(inet_sk(new4)->inet_sport);
|
|
|
|
|
mutex_unlock(&wg->socket_update_lock);
|
|
|
|
|
synchronize_rcu();
|
|
|
|
|
- synchronize_net();
|
|
|
|
|
sock_free(old4);
|
|
|
|
|
sock_free(old6);
|
|
|
|
|
}
|
