From nobody Tue Jan 28 15:27:37 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 4Yj8L13K16z5lcdH; Tue, 28 Jan 2025 15:27:37 +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 4Yj8L12ksnz3k0D; Tue, 28 Jan 2025 15:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738078057; 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=FgArqTbnKCSQfP0grz0b3l5UpNSG0LZ3mU0IpraSTmY=; b=pyi/htCfkWBfpxD4UBIvnd4Kbz9GNJxzApULmQMP6Hp41R9poGf0YIWgLwbP+q2r3g841u zR8xThtnPujRkCpd9rrn3IESiGCaTLc4T6mMbnd61pVR0/0thmXoLzK2hEz9D4OnhqPaXw elSCfeooWzwtQyF2FQcskwO/RMQa41n1FH214ml2LwbP3Gja+Tnx30vkUpdkoYexptusAX bNYzXSudqcy8z3qAL/5Qg7nAu6iqqw7zbWmeQU/sryJYmoKR7w4MNYNSGeQvJ7yoYvnBOJ GSyjXdKW3gR9UiIvgGN6axiihr2wLIeuYR6y+EXlgmiuzJBsIss699UNqu5gTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738078057; 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=FgArqTbnKCSQfP0grz0b3l5UpNSG0LZ3mU0IpraSTmY=; b=rRA0rUSf08N/TBVElqobW/bSPdcyfhnNfM2X3EdmskxdDFbiddmOeahPmcJ+uKQkSl2LoT YJCeKrF36DYzWlvKKEt00Cfplue8XaVU/1yzloK1iLgzn8zDz04RlD6aAu6zM8swmKWWlG MJdTjLwGPk5AnCQhAXtbmGOwv9c7jZGEXQbz+xtw2O9RsF3UWm1yZ8ykmzhavTfvwA6tYw P+xRzpZNuizOsUkIjV6Kmdcan62wEyD7DdpxSjxkl3xcGQFk5sDuZ2U4Odb7r+F++AYIRG BL3nJoRpp+xFLhSVeTtan15yPR6EtgDtmtRBsQZ2DolBABuRyHvuBcBkoX3usw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738078057; a=rsa-sha256; cv=none; b=r7STzJ2IPju/5zDC41KAuqFw+qCeDO7N+zwNd25bJfmY84hgADkN6PXPT06gEkrlU5Nc7D iBZD9a+TJSFf6WLGPkmnFnTcrhK/NfrsQeyaIWvNq3+qjkKkyjXOva5F0+YozuMN/ZI7if ivx6ohUD35NDuOXQfR+NKo6P2iRHNdTvjKMajJccHh4ulXlXc+WdEpM6Uoc3GSjMGvw1x3 k7JNgPAlsiyd3wwmLagoePyo7SysHdRKZQ8AzAiCY+FMy5JYywAs/znOuHNqi0xYqTE59Q avMEaJK46ZOgsulwg+nAHg1cDRnq630nyZaR/dwRizaI638cTDz9PQu1pIEmiQ== 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 4Yj8L11zm1z59G; Tue, 28 Jan 2025 15:27:37 +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 50SFRbHv072217; Tue, 28 Jan 2025 15:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFRboV072213; Tue, 28 Jan 2025 15:27:37 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:27:37 GMT Message-Id: <202501281527.50SFRboV072213@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: 20374abf0ce8 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 20374abf0ce8228972f54795bf7ac6266be190ef Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=20374abf0ce8228972f54795bf7ac6266be190ef commit 20374abf0ce8228972f54795bf7ac6266be190ef Author: Zhenlei Huang AuthorDate: 2025-01-21 15:02:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-28 15:26:49 +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) (cherry picked from commit aa79996e605735dcd9b1bf83d6affefa404530d1) --- 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 2c1bfcc2e4da..827772063ede 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1812,6 +1812,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); @@ -1819,6 +1820,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; @@ -1826,8 +1828,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);