Skip to contentSkip to conversation

ovpn: batch socket release to call synchronize_net() once

PATCH New Marco Baffo 1 participant 1 message Jul 29

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ovpn: batch socket release to call synchronize_net() once

unlock_ovpn() released each queued peer's socket via ovpn_socket_release(), which runs a synchronize_rcu() per call before freeing the socket. Tearing down N peers serializes N grace periods.

Split ovpn_socket_release() around the grace period. The new ovpn_socket_release_prepare() detaches peer->sock and drops the ref, returning the socket once its refcount hits zero. ovpn_socket_release_finish() frees it afterwards. unlock_ovpn() now prepares all sockets, waits once, then finishes them and drops the peer refs. The wait is skipped when nothing needs freeing. ovpn_socket_release() chains both halves to keep its behaviour.

Switch synchronize_rcu() to synchronize_net() while at it.

---
 drivers/net/ovpn/peer.c   | 22 +++++++--
 drivers/net/ovpn/socket.c | 96 +++++++++++++++++++++++++++------------
 drivers/net/ovpn/socket.h |  4 ++
 3 files changed, 87 insertions(+), 35 deletions(-)
drivers/net/ovpn/peer.c +17 -5
index a21d02ac715e..c2110d8435e6 100644
@@ -26,15 +26,27 @@ static void unlock_ovpn(struct ovpn_priv *ovpn,
 			 struct llist_head *release_list)
 	__releases(&ovpn->lock)
 {
-	struct ovpn_peer *peer, *next;
+	struct ovpn_peer *peer, *next_peer;
+	struct ovpn_socket *sock, *next_sock;
+	LIST_HEAD(sock_release_list);
 
 	spin_unlock_bh(&ovpn->lock);
 
-	llist_for_each_entry_safe(peer, next, release_list->first,
-				  release_entry) {
-		ovpn_socket_release(peer);
-		ovpn_peer_put(peer);
+	llist_for_each_entry(peer, release_list->first, release_entry) {
+		sock = ovpn_socket_release_prepare(peer);
+		if (!sock)
+			continue;
+		list_add_tail(&sock->release_entry, &sock_release_list);
 	}
+
+	if (!list_empty(&sock_release_list))
+		synchronize_net();
+
+	list_for_each_entry_safe(sock, next_sock, &sock_release_list, release_entry)
+		ovpn_socket_release_finish(sock);
+
+	llist_for_each_entry_safe(peer, next_peer, release_list->first, release_entry)
+		ovpn_peer_put(peer);
 }
 
 /**
drivers/net/ovpn/socket.c +66 -30

117 lines not on this page · raw message

drivers/net/ovpn/socket.h +4 -0
index 4afcec71040d..b4c7aa9b6179 100644
@@ -24,6 +24,7 @@ struct ovpn_peer;
  * @peer: unique peer transmitting over this socket (TCP only)
  * @sk: the low level sock object
  * @refcount: amount of contexts currently referencing this object
+ * @release_entry: entry for the deferred release list
  * @work: member used to schedule release routine (it may block)
  * @tcp_tx_work: work for deferring outgoing packet processing (TCP only)
  */
@@ -38,6 +39,7 @@ struct ovpn_socket {
 
 	struct sock *sk;
 	struct kref refcount;
+	struct list_head release_entry;
 	struct work_struct work;
 	struct work_struct tcp_tx_work;
 };
@@ -45,5 +47,7 @@ struct ovpn_socket {
 struct ovpn_socket *ovpn_socket_new(struct socket *sock,
 				    struct ovpn_peer *peer);
 void ovpn_socket_release(struct ovpn_peer *peer);
+struct ovpn_socket *ovpn_socket_release_prepare(struct ovpn_peer *peer);
+void ovpn_socket_release_finish(struct ovpn_socket *sock);
 
 #endif /* _NET_OVPN_SOCK_H_ */
Signature · 8 lines
2.43.0



_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel