From nobody Thu Aug 21 14:22:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c75Bc2fSxz6506p; Thu, 21 Aug 2025 14:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c75Bb64dkz43fj; Thu, 21 Aug 2025 14:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uRd75cbWXo3js+NHecg9HhA43K1uYyfwhqPC1Y+5qsI=; b=SeNjMG41+Y/NkfO1His03G4j+xRPDdl2BoNHjDv7atQRPNPQQZbhXw3kFOIOOveuiL7mXV wPMSh3OAAGYZ+YDng6KbbN2iDQTIZGaHYVA9xSh0KiNzNTDMIhnTlVTTfXpXElPgt8J6hR D8p855U9jDgEEUPZdcMcPeVRgHb76faaOZeGF2fkZaF6ILz3hnaUj5mNpKU3MWT/O191Mu /8oho/m4fYck3yKru3/bgGdwXz1l8/WoDpU8B4VsoAV63l/w7oeE01PEsVfhiGiOahNFxB n62fnqdhn2DYwmeRUxELBvciOpH0LQ87XamXI0wiW6LaOsY94wOSKQ5rfQr86Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755786167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uRd75cbWXo3js+NHecg9HhA43K1uYyfwhqPC1Y+5qsI=; b=cbq3npuu77WOz1KKWVQ/pwPhTockYgKrHQgODaZPe6EBmB4SPatcXTRisRsishAKdXfM9u qkLzErH/L1zaMN2FxaC8AsNrvJvFcQyX18NFvAIe3m7wMo+6itDZYXU8LwqsCy885pCTuP NZHcNFWfaJQZb7w1wfs3kaALH9Ri9HmHrD5PTQNxSXqnQPY6Ua8roEBrz6Uap1pOpX28y7 Nt9RNpIg1CKRgHpd4xFQKsVFabGOE/h8rrk8jtc75IgfJqd5XRz0xJ7DoCzBdBn53cMFxx lYdY2TSbgGPJIMp0S1cYlM509CD5+mDACbesXNxWFDWcPblF915dkUEfF3fgRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755786167; a=rsa-sha256; cv=none; b=xRjEdPkYoNEh4G1GsrHxUgFdq+BPvQrOQ+bikGXBCGoaX+85UDKkad6HGUwRx8oz2IIEtT 3NHK7XJwpxmW0Kr4byGSWKBqb5Ti2tqTyv6xZOrvaRyen+jNv5/qp6bLiIojwXXVMIRSpE Svb4nKrUhTLvVRPGimbTXaK2R9DBL4dOWQV/WG3khQGopcjCK9/wkoWQcYToehBboWBl5N BDJ7JXy1caHotQK/2OR8lT/e1VbVsvaePFas79iNxLe3QNYBJAFeSSM6xClJWsBVfdrFpK yqHqrWODzMk8x1+1VaHPx++mlprLUemJ6hLYiDgDVkeYVExPP4vLnzLtfP1kIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c75Bb5fsNz13YQ; Thu, 21 Aug 2025 14:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57LEMlYH092929; Thu, 21 Aug 2025 14:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LEMl95092926; Thu, 21 Aug 2025 14:22:47 GMT (envelope-from git) Date: Thu, 21 Aug 2025 14:22:47 GMT Message-Id: <202508211422.57LEMl95092926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 274bf7c8ae7e - main - if_tuntap: make SIOCIFDESTROY interruptible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274bf7c8ae7e7b51853cd541481985f0e687f10e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=274bf7c8ae7e7b51853cd541481985f0e687f10e commit 274bf7c8ae7e7b51853cd541481985f0e687f10e Author: Kyle Evans AuthorDate: 2025-08-21 14:21:41 +0000 Commit: Kyle Evans CommitDate: 2025-08-21 14:22:44 +0000 if_tuntap: make SIOCIFDESTROY interruptible There's no good justification to permanently hang a thread until the tunnel can be destroyed. Make it interruptible so that the admin can ^C it and remedy the situation if something erroneously has the tunnel open, rather than forcing them to open another shell to resolve it. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D39740 --- sys/net/if_tuntap.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 5e6f65c04b2f..275581ea2d4e 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -615,19 +615,34 @@ out: CURVNET_RESTORE(); } -static void -tun_destroy(struct tuntap_softc *tp) +static int +tun_destroy(struct tuntap_softc *tp, bool may_intr) { + int error; TUN_LOCK(tp); + MPASS((tp->tun_flags & TUN_DYING) == 0); tp->tun_flags |= TUN_DYING; - if (tp->tun_busy != 0) - cv_wait_unlock(&tp->tun_cv, &tp->tun_mtx); - else - TUN_UNLOCK(tp); + error = 0; + while (tp->tun_busy != 0) { + if (may_intr) + error = cv_wait_sig(&tp->tun_cv, &tp->tun_mtx); + else + cv_wait(&tp->tun_cv, &tp->tun_mtx); + if (error != 0) { + tp->tun_flags &= ~TUN_DYING; + TUN_UNLOCK(tp); + return (error); + } + } + TUN_UNLOCK(tp); CURVNET_SET(TUN2IFP(tp)->if_vnet); + mtx_lock(&tunmtx); + TAILQ_REMOVE(&tunhead, tp, tun_list); + mtx_unlock(&tunmtx); + /* destroy_dev will take care of any alias. */ destroy_dev(tp->tun_dev); seldrain(&tp->tun_rsel); @@ -648,6 +663,8 @@ tun_destroy(struct tuntap_softc *tp) cv_destroy(&tp->tun_cv); free(tp, M_TUN); CURVNET_RESTORE(); + + return (0); } static int @@ -655,12 +672,7 @@ tun_clone_destroy(struct if_clone *ifc __unused, struct ifnet *ifp, uint32_t fla { struct tuntap_softc *tp = ifp->if_softc; - mtx_lock(&tunmtx); - TAILQ_REMOVE(&tunhead, tp, tun_list); - mtx_unlock(&tunmtx); - tun_destroy(tp); - - return (0); + return (tun_destroy(tp, true)); } static void @@ -702,9 +714,9 @@ tun_uninit(const void *unused __unused) mtx_lock(&tunmtx); while ((tp = TAILQ_FIRST(&tunhead)) != NULL) { - TAILQ_REMOVE(&tunhead, tp, tun_list); mtx_unlock(&tunmtx); - tun_destroy(tp); + /* tun_destroy() will remove it from the tailq. */ + tun_destroy(tp, false); mtx_lock(&tunmtx); } mtx_unlock(&tunmtx);