mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
ec780bdb92
These are the latest patches that just landed upstream for 5.13, will be
backported by Greg into 5.10 (because of stable@), and are now in the
5.4 backport branch of wireguard: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
Cc: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tested-by: Stijn Segers <foss@volatilesystems.org>
(cherry picked from commit 2a3b2f59fe)
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Fri, 4 Jun 2021 17:17:33 +0200
|
|
Subject: [PATCH] wireguard: use synchronize_net rather than synchronize_rcu
|
|
|
|
commit 24b70eeeb4f46c09487f8155239ebfb1f875774a upstream.
|
|
|
|
Many of the synchronization points are sometimes called under the rtnl
|
|
lock, which means we should use synchronize_net rather than
|
|
synchronize_rcu. Under the hood, this expands to using the expedited
|
|
flavor of function in the event that rtnl is held, in order to not stall
|
|
other concurrent changes.
|
|
|
|
This fixes some very, very long delays when removing multiple peers at
|
|
once, which would cause some operations to take several minutes.
|
|
|
|
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
Cc: stable@vger.kernel.org
|
|
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/peer.c | 6 +++---
|
|
drivers/net/wireguard/socket.c | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/peer.c
|
|
+++ b/drivers/net/wireguard/peer.c
|
|
@@ -88,7 +88,7 @@ static void peer_make_dead(struct wg_pee
|
|
/* Mark as dead, so that we don't allow jumping contexts after. */
|
|
WRITE_ONCE(peer->is_dead, true);
|
|
|
|
- /* The caller must now synchronize_rcu() for this to take effect. */
|
|
+ /* The caller must now synchronize_net() for this to take effect. */
|
|
}
|
|
|
|
static void peer_remove_after_dead(struct wg_peer *peer)
|
|
@@ -160,7 +160,7 @@ void wg_peer_remove(struct wg_peer *peer
|
|
lockdep_assert_held(&peer->device->device_update_lock);
|
|
|
|
peer_make_dead(peer);
|
|
- synchronize_rcu();
|
|
+ synchronize_net();
|
|
peer_remove_after_dead(peer);
|
|
}
|
|
|
|
@@ -178,7 +178,7 @@ void wg_peer_remove_all(struct wg_device
|
|
peer_make_dead(peer);
|
|
list_add_tail(&peer->peer_list, &dead_peers);
|
|
}
|
|
- synchronize_rcu();
|
|
+ synchronize_net();
|
|
list_for_each_entry_safe(peer, temp, &dead_peers, peer_list)
|
|
peer_remove_after_dead(peer);
|
|
}
|
|
--- a/drivers/net/wireguard/socket.c
|
|
+++ b/drivers/net/wireguard/socket.c
|
|
@@ -430,7 +430,7 @@ void wg_socket_reinit(struct wg_device *
|
|
if (new4)
|
|
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);
|
|
}
|