From nobody Tue Jan 21 15:03:05 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 4Ycr6x6Clxz5lCsS; Tue, 21 Jan 2025 15:03:05 +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 4Ycr6x5J2Fz47Lt; Tue, 21 Jan 2025 15:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737471785; 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=SObyVv2tYMTyiC8PI//TTmwYZYbAgVgcTJcOwkebbMk=; b=cWvuUj0QOJhjNdRhMOqnqafFhH9adozsGzMFSveOPouWsk02bvoexj1VeGUg40yjLs02EI BB8f8yWJw9Kcmn65vao0J4uNolNpzlXf0QNFXj1Ph+94PTXZuUa8in/Qtx/ZbYaDCMMPRG CbsrQYG8HiEkcNxMr2fVTwFSEGLgCq4ymopOP2UQWL445Bkq63u1YYTTw8VZvhDRmuGjDA dy/q50YE+Q9JZnXBgIl62d7TXb1Agw65IZUbpxmjuKU2HqcVsbpYuwXTVUftbQ1ZvnC6G1 22ld/8YY8o/IO/gUNxzHxZ1x+HEivuLxf35tSLwY7FBMp8Ckq0rJjDTkCfmkew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737471785; 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=SObyVv2tYMTyiC8PI//TTmwYZYbAgVgcTJcOwkebbMk=; b=wLaQsvw58jdsWxKFXv8qfu3dLKsgUjdG6CVEeOJardtbW1+WTD6J/QdLpDxhTZ24jPjZO4 8eicHjNLPdziZXvtODHomFilr0cTnbNiSSnjKipgsriSBBswXth37xPMEVAjUshlIKuzrP j1D+FJgoBgopiWQTNY/ENEQG2JADt1ZnV5ZxNKbkvjBa8hpu7u2ocdqp5tUfgeeY+t+rmn PTTSCNiTsH7sfeFRmZlNBjYlYfSmM9/3iZ9XD49S0wt4qH5Wj6e0gsW6grXrH+5XNScabv IHsg9F3+4BSA0/R3vhRWorWYYLvqbQfl4WbkTfTDlPP+vbb11NKklm3b4VZdRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737471785; a=rsa-sha256; cv=none; b=kIcawiUC8iiZLfHcgoNUqol7+I/2wSv+d+pEVjWjrbOCnq4rdT1sTYEIji2ynpV3g+hbl/ VrHPul2nQmbw1baxzoMkLGmnsfgaEHacx/ATd5L+Tk8oMgL5GfotmdZxANJuYpbj22gVDg qBP7ANR+XXU/E+2TbO/RKxqwDeq4ugARlJAIgFNOsfpgPLFu1kDR9ZVaBuMeA5EAt1bRD7 nULoqwh/3Xr7aZNeeF0iE+3kxtBI+6Kr3JZKaDUVF/Bz7Dt2ziw2NZk5Yt1X39vBy5cHhU nAH43vRiilby4EEGVG+sFwbDgISGvHw+PZlOtYYHKVXnB32pBuplKcnmjztN+A== 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 4Ycr6x4bSFz19Y7; Tue, 21 Jan 2025 15:03:05 +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 50LF35mb059089; Tue, 21 Jan 2025 15:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50LF35JT059086; Tue, 21 Jan 2025 15:03:05 GMT (envelope-from git) Date: Tue, 21 Jan 2025 15:03:05 GMT Message-Id: <202501211503.50LF35JT059086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 960c5bb0f6bf - main - if_vxlan(4): Invoke vxlan_stop event handler only when the interface is configured 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960c5bb0f6bf44aeb09fa14fd0f82c2e82ebe2e2 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=960c5bb0f6bf44aeb09fa14fd0f82c2e82ebe2e2 commit 960c5bb0f6bf44aeb09fa14fd0f82c2e82ebe2e2 Author: Zhenlei Huang AuthorDate: 2025-01-21 15:02:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-21 15:02:13 +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 --- 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 bb2de793550f..b7af304e3126 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1813,6 +1813,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); @@ -1820,6 +1821,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; @@ -1827,8 +1829,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);