From patchwork Fri Jul 3 17:35:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 5090 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1887:b0:869:83bc:8c48 with SMTP id r7csp2437745max; Fri, 3 Jul 2026 10:35:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AHgh+RqG1FO+OsM9WNjF8ljYi7wjRA5BVOJcjVLlEv8Y80/8tJpUc62ubqX3DlhKRqE2+RDeYdA+94Tsv0g=@openvpn.net X-Received: by 2002:a05:6871:3a23:b0:447:2ca4:918 with SMTP id 586e51a60fabf-44d18432fd4mr211939fac.33.1783100144049; Fri, 03 Jul 2026 10:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1783100144; cv=none; d=google.com; s=arc-20260327; b=bRah25zRCOqCMFhuNmDbAFxJ0bCCwNvMxqxBl40JUG0fQ3dNd2QzDVI3MWdjM7PwCY GqHOrOXN5o2pI8qdx26BCeDVfNZooh0z2NXPHh+7oEXbnANJyI175lo5v3G1YutUVxLs FdqcRnIKNtKZg74v2VRNWCBp++bx/fhPtHzX6wOmp2b3Veh7IY74UGM6BdZMAs86RxHy JOXRTKLIHvuT+p41C80gBbqReM7lOk68OtEstc+omZY/uRVMXSP1et4P3rt7gpZm71y+ BxYVsTsy9Kr71335p2pgigheMLcQLVJbrdWQBG8GGB+DccvOeHq5tRjbax5ayJgjjz7t /AMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=ygnNk7NscrXvvw0GfPQmsOzHQeFUZX2aUSXq4216ls4=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=KhMuVbfDbkGKL1lcyqj8K1Yq0Ev1J7/UIrKwxRZSScRU/1+zHeBSNnfnjHu9M9BJhR 4IwI79weq3SNQO98CHZ8owfP7fTBkJQRXJsdboMVOn0IuuK5hqcqFsUFzYeyOUYeGkVR oa1roau/1VGgGYYDm8beJxbyqwTk0OA8AQxaVdepL+1XMq5LKJ5xGaemGobBfibr+D7y 7B20E1d51GkOdmNiITFS6qAcVdMYstfTPhEzkr7vXr+bupGq+HQKzgIzkSBeYXQDFU0Q r/OdRbEthBO2RIEk/KCKEnRsKwC6EiCIA5vMQCBUMaJ7z0715/k5eUEJGudxDzBvU7Mu VhSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=CY41Ls8h; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=btGkTR33; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=CCRJ8vlZ; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=lfhkTJSb; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-44cfbb224c2si2061770fac.171.2026.07.03.10.35.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2026 10:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=CY41Ls8h; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=btGkTR33; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=CCRJ8vlZ; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=lfhkTJSb; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ygnNk7NscrXvvw0GfPQmsOzHQeFUZX2aUSXq4216ls4=; b=CY41Ls8hdZxSjRROT0Mdq1x7ck KMKDxx5Wut/E+iefjMLwnnpfveM8dup8/vpSzl+uSgpo3DMJqbqVsr49y5PMdXFEZbhYdIRJPZnq6 feT1rSK0wBPgNdSz7NU0nf67DbBuoJCNCOMl6cJr/gTSLVWa4m/9vYMoZP1ispNHYqP8=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wfhnf-00068k-9V; Fri, 03 Jul 2026 17:35:39 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wfhnd-00068b-7T for openvpn-devel@lists.sourceforge.net; Fri, 03 Jul 2026 17:35:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AL2ttyRF7x+2MOi01b0OtmwVVZQqH11xtCLGPHnMNjk=; b=btGkTR33cz//UAulg3ZhkV86sc BjvyESzcFH7BFnKz1FvMWR0WnPR5Y/TGU6EXFQ0vqHX+D7d2hYe6JLWTYgJiQubk4Gqw3RyDYZerW 5QRXyzOBSEB2bAM3V7XAHoyZ0j30qwNUDnwu3/8JQIDoXlVJKPtWVd1avbQ7VhqTyzLo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=AL2ttyRF7x+2MOi01b0OtmwVVZQqH11xtCLGPHnMNjk=; b=CCRJ8vlZtDBxmAUYcZZ2CgL4ew brjj1Lp++y5ks9Lj7xrNtrKmgZT4jPxIC3SEoMYqrdrIqozINkoa1wO5I/mbH9s6NftH0y+Nek64l CjtxuR/9/UYCDpJSXUMMdbMPwTQ6DwV6k2Z17OTmL+cwmMnQ1icr9Cw8vpCOeqieOe70=; Received: from mout-b-105.mailbox.org ([195.10.208.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wfhna-000734-UM for openvpn-devel@lists.sourceforge.net; Fri, 03 Jul 2026 17:35:37 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-b-105.mailbox.org (Postfix) with ESMTPS id 4gsLVp39VqzB0XZ; Fri, 3 Jul 2026 19:35:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1783100114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AL2ttyRF7x+2MOi01b0OtmwVVZQqH11xtCLGPHnMNjk=; b=lfhkTJSbCP8k9euq98NSvcbvs0MJqD6A+jbtdMXPE84r1fSFWtllt939OolPNMr447HU++ 8JDfMqzk70HpudiEmumi96DA7qydRSutOFT5wCmdqFA4UfBtdEPMoYTRZzMphFmijADY7v ML3J0ErPqMSt2ZqLY3Lrq8RU6bbHdUX/djeL9Qw2FOmKwm+yAsiLGSQUlksLMCJsQJfHq6 GOsEl+ZhQP5pCwF8aFxuP2ZT21iCArltt/M5k2AzN2TxIqTCoU3vriHCx4YL98/SH4IGLp XmWQHxWHqhPz68eI3AXNaIGppTukeBBis+sfsVagZv+xHBuwS503P6OzbJeMeA== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::102 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Jul 2026 19:35:00 +0200 Message-ID: <6edfcc51e0855bfd34286b86d4e7f26bb3bcd3f7.1783099626.git.ralf@mandelbit.com> In-Reply-To: <981d2ea51cca45138210aa52c6e5a0e55c0da7a0.1783099626.git.ralf@mandelbit.com> References: <981d2ea51cca45138210aa52c6e5a0e55c0da7a0.1783099626.git.ralf@mandelbit.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gsLVp39VqzB0XZ X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: ovpn queues several work items whose callbacks execute module text. These works currently run on the global system workqueues, so module exit has no driver-owned drain point that guarantees the callba [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1wfhna-000734-UM Subject: [Openvpn-devel] [PATCH ovpn net v4 2/3] ovpn: run deferred work on a module-owned workqueue X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1869716016653255244 X-GMAIL-MSGID: 1869716016653255244 ovpn queues several work items whose callbacks execute module text. These works currently run on the global system workqueues, so module exit has no driver-owned drain point that guarantees the callbacks have fully returned before the module text can be freed. Object references protect the objects used by the callbacks, but they do not prove that a workqueue function has returned. In particular, a worker can drop the final reference that unblocks device teardown while it is still executing ovpn code. Add a module-owned workqueue and queue all ovpn work items on it. Destroy the workqueue during module exit, after unregistering the rtnl link ops and netlink family and before the final RCU barrier, so no ovpn work item can outlive the module text. The per-device delayed keepalive work remains explicitly disabled during netdev teardown (disable_delayed_work_sync in ndo_uninit), since destroy_workqueue does not flush delayed work that is still only pending on its timer. Fixes: 3ecfd9349f40 ("ovpn: implement keepalive mechanism") Fixes: 11851cbd60ea ("ovpn: implement TCP transport") Signed-off-by: Ralf Lici --- Changes since v3 https://lore.kernel.org/openvpn-devel/49f38f89340e18ed30543d3990a7a7e20595b6af.1783080055.git.ralf@mandelbit.com/ - Replace the RCU-deferred peer netdev reference release with a module-owned workqueue that drains all ovpn work callbacks before module text can be freed. drivers/net/ovpn/main.c | 20 ++++++++++++++++++-- drivers/net/ovpn/ovpnpriv.h | 4 ++++ drivers/net/ovpn/peer.c | 8 ++++---- drivers/net/ovpn/tcp.c | 9 ++++----- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/net/ovpn/main.c b/drivers/net/ovpn/main.c index 9993c1dfe471..984b35398c36 100644 --- a/drivers/net/ovpn/main.c +++ b/drivers/net/ovpn/main.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,9 @@ #include "tcp.h" #include "udp.h" +/* module-owned workqueue on which all ovpn-specific work is queued */ +struct workqueue_struct *ovpn_wq; + static void ovpn_priv_free(struct net_device *net) { struct ovpn_priv *ovpn = netdev_priv(net); @@ -233,11 +237,18 @@ static struct rtnl_link_ops ovpn_link_ops = { static int __init ovpn_init(void) { - int err = rtnl_link_register(&ovpn_link_ops); + int err; + ovpn_wq = alloc_workqueue("ovpn", 0, 0); + if (!ovpn_wq) { + pr_err("ovpn: cannot allocate workqueue\n"); + return -ENOMEM; + } + + err = rtnl_link_register(&ovpn_link_ops); if (err) { pr_err("ovpn: can't register rtnl link ops: %d\n", err); - return err; + goto destroy_wq; } err = ovpn_nl_register(); @@ -252,6 +263,9 @@ static int __init ovpn_init(void) unreg_rtnl: rtnl_link_unregister(&ovpn_link_ops); +destroy_wq: + destroy_workqueue(ovpn_wq); + ovpn_wq = NULL; return err; } @@ -259,6 +273,8 @@ static __exit void ovpn_cleanup(void) { ovpn_nl_unregister(); rtnl_link_unregister(&ovpn_link_ops); + destroy_workqueue(ovpn_wq); + ovpn_wq = NULL; rcu_barrier(); } diff --git a/drivers/net/ovpn/ovpnpriv.h b/drivers/net/ovpn/ovpnpriv.h index 5898f6adada7..84499140e4bd 100644 --- a/drivers/net/ovpn/ovpnpriv.h +++ b/drivers/net/ovpn/ovpnpriv.h @@ -15,6 +15,10 @@ #include #include +struct workqueue_struct; + +extern struct workqueue_struct *ovpn_wq; + /** * struct ovpn_peer_collection - container of peers for MultiPeer mode * @by_id: table of peers index by ID diff --git a/drivers/net/ovpn/peer.c b/drivers/net/ovpn/peer.c index a09d61296425..976a5de13c80 100644 --- a/drivers/net/ovpn/peer.c +++ b/drivers/net/ovpn/peer.c @@ -61,7 +61,7 @@ void ovpn_peer_keepalive_set(struct ovpn_peer *peer, u32 interval, u32 timeout) /* now that interval and timeout have been changed, kick * off the worker so that the next delay can be recomputed */ - mod_delayed_work(system_percpu_wq, &peer->ovpn->keepalive_work, 0); + mod_delayed_work(ovpn_wq, &peer->ovpn->keepalive_work, 0); } /** @@ -1285,7 +1285,7 @@ static time64_t ovpn_peer_keepalive_work_single(struct ovpn_peer *peer, netdev_dbg(peer->ovpn->dev, "sending keepalive to peer %u\n", peer->id); - if (schedule_work(&peer->keepalive_work)) + if (queue_work(ovpn_wq, &peer->keepalive_work)) ovpn_peer_hold(peer); } @@ -1377,8 +1377,8 @@ void ovpn_peer_keepalive_work(struct work_struct *work) netdev_dbg(ovpn->dev, "scheduling keepalive work: now=%llu next_run=%llu delta=%llu\n", next_run, now, next_run - now); - schedule_delayed_work(&ovpn->keepalive_work, - (next_run - now) * HZ); + queue_delayed_work(ovpn_wq, &ovpn->keepalive_work, + (next_run - now) * HZ); } unlock_ovpn(ovpn, &release_list); } diff --git a/drivers/net/ovpn/tcp.c b/drivers/net/ovpn/tcp.c index 433bd07a4f1b..475f560ca5b1 100644 --- a/drivers/net/ovpn/tcp.c +++ b/drivers/net/ovpn/tcp.c @@ -151,7 +151,7 @@ static void ovpn_tcp_rcv(struct strparser *strp, struct sk_buff *skb) /* take reference for deferred peer deletion. should never fail */ if (WARN_ON(!ovpn_peer_hold(peer))) goto err_nopeer; - schedule_work(&peer->tcp.defer_del_work); + queue_work(ovpn_wq, &peer->tcp.defer_del_work); ovpn_dev_dstats_rx_dropped(peer->ovpn->dev); err_nopeer: kfree_skb(skb); @@ -283,12 +283,11 @@ static void ovpn_tcp_send_sock(struct ovpn_peer *peer, struct sock *sk) * stream therefore we abort the connection */ ovpn_peer_hold(peer); - schedule_work(&peer->tcp.defer_del_work); + queue_work(ovpn_wq, &peer->tcp.defer_del_work); /* we bail out immediately and keep tx_in_progress set * to true. This way we prevent more TX attempts - * which would lead to more invocations of - * schedule_work() + * which would lead to more invocations of queue_work() */ return; } @@ -485,7 +484,7 @@ static void ovpn_tcp_write_space(struct sock *sk) rcu_read_lock(); sock = rcu_dereference_sk_user_data(sk); if (likely(sock && sock->peer)) { - schedule_work(&sock->tcp_tx_work); + queue_work(ovpn_wq, &sock->tcp_tx_work); sock->peer->tcp.sk_cb.sk_write_space(sk); } rcu_read_unlock();