From nobody Tue Jan 28 15:23:13 2025 X-Original-To: dev-commits-src-branches@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 4Yj8Dx4fgQz5lc8d; Tue, 28 Jan 2025 15:23:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj8Dx430Zz3jHD; Tue, 28 Jan 2025 15:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077793; 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=iG1lcuIe2NMlCd+L6SxkrtZzRK7G/SVdOohzc0YoeQE=; b=nbVodl+p6TwP/2eHBwPvclrTLzkzne1UfKrk2PJCJYQehBovP3GBHefPGcYBCO+LHeUzA2 n9gRD3HQN4o2RsiR4TpOwgZ9ObW7+I1twUnaNezq3ozh/7BqUtNBKW8AjuEm8ANgDepin5 8F+nwJo93mEKIUb2NvaD2mO9dlmlDm/bFKun5fCJ2RBk/6rdx4DjEuBU4/Pxze00Uomx4B Mf/s3isSlR6zrDW79zgQPkOB/73LeFBcZpSNT7793/QuG0vfqpt705U/AvJFDPmsy+XyQK GI+H4LpjIOT+iDjllFzafbc3/sIb6JgG2mIFTTf3QwUubHDkUlGxYLRS6R4JCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077793; 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=iG1lcuIe2NMlCd+L6SxkrtZzRK7G/SVdOohzc0YoeQE=; b=RCSwqFe0iln1L++wUJRgnJRjJuRpyqeb9S7kMbkfjqwpjP8G7Q7j/Krqq2f5rhEW6+LmLn jZV+GYLGiFqe6lJ5eua8YXKW+mIh/CUxP+QCgvMX6Sv1P/j+MUbvgV1lhPp+LlCrHVRwWP qEO7xPNsstDXu291sf1G9zqlRR749ZGSy2AoTXhpedoTXbSriOnI9ganROJ9Hb/ui9KjEq EXdLgcMUUnk9zFvo5TVAYpFJyP2cql0okvwLWisV9RUIExM09vibSQgH2uMaZ+wFezpawQ fosy+xT9ZeIP5KuOD7GaE9IDRk/D/f5gu+Mu32p8fHFnPZwYnx+zQlJTagjLfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738077793; a=rsa-sha256; cv=none; b=iqcVVW2QK1/Yb98fuVbr+2yrzMN2HZJWupK6ssViVucD8UTRSPP2v/JZmGVr8sBbKPSRik KxAzmAXhT6VCydY8bUU+FtGn7p0kPpYRtk/aLy3TO5mGlhCL2eKQg0w/l8WM2BFWS/ek51 3bCt4d+fWfBLuwbCK51llFoedU07Zfnh23wimCXRUcYlF8ZmgijwO7GYaMOAJcF3aN0j78 R4+wuWdCj/8DhCEanJ1SdwhAAD7ywpb2N0bcI0YQI/dVooU/uUYriZewH4Sf0Dvm0O/fHw vKWUzmpD1BQvlG2M96JyiKdIdl7IlSMnn3mJyH883SZKQx8CJ51r6UHKwBL15w== 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 4Yj8Dx3f9Sz55m; Tue, 28 Jan 2025 15:23:13 +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 50SFND2c070815; Tue, 28 Jan 2025 15:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFNDW6070812; Tue, 28 Jan 2025 15:23:13 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:23:13 GMT Message-Id: <202501281523.50SFNDW6070812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: aa79996e6057 - stable/14 - if_vxlan(4): Invoke vxlan_stop event handler only when the interface is configured List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aa79996e605735dcd9b1bf83d6affefa404530d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=aa79996e605735dcd9b1bf83d6affefa404530d1 commit aa79996e605735dcd9b1bf83d6affefa404530d1 Author: Zhenlei Huang AuthorDate: 2025-01-21 15:02:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-28 15:22:15 +0000 if_vxlan(4): Invoke vxlan_stop event handler only when the interface is configured It is harmless but pointless to invoke vxlan_stop event handler when the interface was not previously configured. This change will also prevent an assert panic from t4_vxlan_stop_handler(). Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48494 (cherry picked from commit 960c5bb0f6bf44aeb09fa14fd0f82c2e82ebe2e2) --- sys/net/if_vxlan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 2bde1d894a3b..0bbb3e0bcf9c 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1814,6 +1814,7 @@ vxlan_teardown_locked(struct vxlan_softc *sc) { struct ifnet *ifp; struct vxlan_socket *vso; + bool running; sx_assert(&vxlan_sx, SA_XLOCKED); VXLAN_LOCK_WASSERT(sc); @@ -1821,6 +1822,7 @@ vxlan_teardown_locked(struct vxlan_softc *sc) ifp = sc->vxl_ifp; ifp->if_flags &= ~IFF_UP; + running = (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0; ifp->if_drv_flags &= ~IFF_DRV_RUNNING; callout_stop(&sc->vxl_callout); vso = sc->vxl_sock; @@ -1828,8 +1830,10 @@ vxlan_teardown_locked(struct vxlan_softc *sc) VXLAN_WUNLOCK(sc); if_link_state_change(ifp, LINK_STATE_DOWN); - EVENTHANDLER_INVOKE(vxlan_stop, ifp, sc->vxl_src_addr.in4.sin_family, - ntohs(sc->vxl_src_addr.in4.sin_port)); + if (running) + EVENTHANDLER_INVOKE(vxlan_stop, ifp, + sc->vxl_src_addr.in4.sin_family, + ntohs(sc->vxl_src_addr.in4.sin_port)); if (vso != NULL) { vxlan_socket_remove_softc(vso, sc);