From nobody Wed Apr 24 13:17:09 2024 X-Original-To: dev-commits-src-main@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 4VPffF2swlz5HL4d; Wed, 24 Apr 2024 13:17:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPffF0z8Nz4L9b; Wed, 24 Apr 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964629; 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=k6UZqfSDHpR1KEuMVYkIM0zzSiko82KQkeEQc0Uudtw=; b=gNIDUAw4ip7zIhQyQcmVRkboq908/PlFBlauB/1YgCbOI6p+PCnnkmr4dQLfFcrD005J/n kAxxAKNxYk0OOKF4fV/IM1bkzsrE1BtT/BLxRHN9LBjChZ2lsvcgO/E8g2C/2D8o1TXLJV YWPSDYWfMGB4JuCzh53XrykGhDBauqsCrYv+KzZDdOAA3ufTW6KlNOXrNXyhyFTkx+oDdL OkIXXSXGKaqDG6xr7Pba/PVS9SDt0gTfnu3xh+U805FWOEuAxUMMH+LNNYRo2eceQ1mUht nwbFSDDVJGHeoog1i1PfvoJzqMyYKdoOUpnMZwjBEzbVStY9AsyAqU1MrsayxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964629; a=rsa-sha256; cv=none; b=G3UU5i3wZwe5egk0b8ikfjfRYsmTNAxVr3DpeDyDPtMVD/k7vYoGp/mr3qWXP98UKmZJSu nIc6T6A0c+9F44LKhnTltgzWH1J2+n3d8i8uATHOQKkaA+EaMi4NmTTggWlWiP1EEw/m4l CQz0lveJ6cPpnK6ckt5jm9u4Oii9cZjUFHWw7n0faaYm9oYLHO30TvnxEl6aanEskUXMg/ SNJvXXRuCL9CTqGR8xSwx9wve9lSQjAgD89oPXrpV2ZyTMCx3JX0Lzp40SwC1sig5zsymw MG4rNFRrlQzYj+Z/eB13OI6N2vYi9q8nyqfQBjIwxBbdcfPRl6m7yGgyUWL2tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964629; 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=k6UZqfSDHpR1KEuMVYkIM0zzSiko82KQkeEQc0Uudtw=; b=OWtEUCcQ8NF5dCygmczAq40woPB90G0cj6vZ8Akv0ja9Ul1H1qAqtcyelBtbA+V0yy2Cw6 7GxDZKxW7uDkxM/squim18EGi7BzGShTrlZ6vOHTL23NgI7C2824GRyljPGzBmVynIvFyz IWNfLEi1nTO6khMs2g//WS31OF6EEXBFtrUJLjUYK7aCFfFATpcS/ZSSBpGIHLsobnb5D/ ImhYzQVWXUcyKrpUb2N59dRBvuNnPHBLkGCKzWafkjuBPogwhiZXy+Fx8Yb5OxdYAYHz4I 2GRCibemXgtnJJARVCIpf2CvhnMK+t7ua0MIaFtlhI+PgKkMpGwxsZrN4sYcyw== 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 4VPffF0b1JzHHl; Wed, 24 Apr 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ODH9MM053230; Wed, 24 Apr 2024 13:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODH921053227; Wed, 24 Apr 2024 13:17:09 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:09 GMT Message-Id: <202404241317.43ODH921053227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bb2ab7a374b9 - main - ng_pipe: Remove node when all hooks are disconnected List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb2ab7a374b9d81f8368acc506c9700af20a22d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2ab7a374b9d81f8368acc506c9700af20a22d6 commit bb2ab7a374b9d81f8368acc506c9700af20a22d6 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:51:40 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:44:50 +0000 ng_pipe: Remove node when all hooks are disconnected This is the behavior described in the man page. Signed-off-by: Martin Vahlensieck Discussed with: glebius Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index c2424e3db48a..7afaf24f5914 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -936,6 +936,7 @@ ngp_disconnect(hook_p hook) struct hookinfo *const hinfo = NG_HOOK_PRIVATE(hook); struct ngp_fifo *ngp_f; struct ngp_hdr *ngp_h; + priv_p priv; KASSERT(hinfo != NULL, ("%s: null info", __FUNCTION__)); hinfo->hook = NULL; @@ -962,6 +963,12 @@ ngp_disconnect(hook_p hook) if (hinfo->ber_p) free(hinfo->ber_p, M_NG_PIPE); + /* Destroy the node if all hooks are disconnected */ + priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); + + if (priv->upper.hook == NULL && priv->lower.hook == NULL) + ng_rmnode_self(NG_HOOK_NODE(hook)); + return (0); }