From nobody Fri May 20 04:39:40 2022 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 B81FC1AE7D37; Fri, 20 May 2022 04:39:40 +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 4L4DXX4V50z4sGw; Fri, 20 May 2022 04:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653021580; 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=T90coYLf8emxHzDMiTY5AxZOJ8YuA4Pr8VJFsPmYxXA=; b=AFp9QZI8IiE/QdoZzgjJcgytBdWetps4nk8D4rOfqlkfVMfDMbVnIl38q5lBvyV54q5YZ1 bQbF3ukf8iwHr9zg8M28N1zDeSGBOO3tlUfzRGYTiB+olEL6h55Y5lyYaLIO/Qz/eutPaI Ll/J7wToPbG53eZ2t32SGpQy6wlqjQXENJm/hr6+eNmQ9Ngl0azaptSYY1kHJpnZX1RiqJ DMiAtetIZN1ke3W8AJfrZV2LOLuIA11pUku16ozaS+ubhB0nTdOfBc2HX0V60ByY5Kus6b cVv9PklTJBMFcyJTuPt7V2SQLP4PX/mrCVfyfC24zpfnwubnDwIkxR2JbWVDcg== 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 7678738AF; Fri, 20 May 2022 04:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24K4defZ017159; Fri, 20 May 2022 04:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K4deMn017158; Fri, 20 May 2022 04:39:40 GMT (envelope-from git) Date: Fri, 20 May 2022 04:39:40 GMT Message-Id: <202205200439.24K4deMn017158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: f2ab91608440 - main - [vlan + lagg] add IFNET_EVENT_UPDATE_BAUDRATE event 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2ab91608440338e5574eff098ad4f69e4541a1d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653021580; 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=T90coYLf8emxHzDMiTY5AxZOJ8YuA4Pr8VJFsPmYxXA=; b=KDdeuj/VkGJKR/GbOK9svd1uihGFVxMyr/DbRDdDzgc4t44cg5wtvhbuln74CnDc9Sn1Nv dv0AXhfqS2Wck74YLgCU1TvpO/MY49msDF1GQthbrFmVvxs6dlcsm8BfMGWOPFE33o4vgC qM4S8PJ5BrSbUD83iK0wrQYfa5Nat+GgUm2wDePi+/HBEWhnYJt2H/dVsI3N8YA2a4trFc OwMLQo1F5hCMQ1pjFugklniZZvVZKlPxbFDSC+E7bm66b/bJRGDheCYspV7ZJUJkx+QBTw lnFIUt8mvg62g2R0xnFY0pg+aaaUOg2htfCoUf0pfKaAPbnDjR7lqWd7OJ+41w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653021580; a=rsa-sha256; cv=none; b=F75WkinWKU02TdeC0zHH0yRW0y+wBilBtm9t/I9i7VLw/+pzB0DAnQ2fyEo00JM46iK/Jh 0yg+NVWzUuF0B6GaXbWW1v6cLqORglTh/Sl983VMPPtnlBAcPuSNngSHDE9iDWfYMMmo8Z gAbpAv4Ar5Zpxpxkxjfh1b12rtuxWuCF/GA43CSPSI4UaDxAumf7p2j9nmvAQj5XbK1ZPv 6Yap9gid9X37KIiXiyZ5bUkvPlqLGRXzUFw3dXpOdXBS2JRFJ5FYDNnOoW1jvm8o94Rr96 /KsbugnjEIFTtUZcGHGHNg/Bjp/6c8oHPSI26yB8vsM4XoJtXrF9XlXdIfoVBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=f2ab91608440338e5574eff098ad4f69e4541a1d commit f2ab91608440338e5574eff098ad4f69e4541a1d Author: Andrey V. Elsukov AuthorDate: 2022-05-19 06:02:27 +0000 Commit: Wojciech Macek CommitDate: 2022-05-20 04:38:43 +0000 [vlan + lagg] add IFNET_EVENT_UPDATE_BAUDRATE event use it to update if_baudrate for vlan interfaces created on the LACP lagg. Differential revision: https://reviews.freebsd.org/D33405 --- sys/net/ieee8023ad_lacp.c | 2 ++ sys/net/if_var.h | 1 + sys/net/if_vlan.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 1e2e638fcdf5..6656ebb2b400 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1090,6 +1090,8 @@ lacp_update_portmap(struct lacp_softc *lsc) speed = lacp_aggregator_bandwidth(la); } sc->sc_ifp->if_baudrate = speed; + EVENTHANDLER_INVOKE(ifnet_event, sc->sc_ifp, + IFNET_EVENT_UPDATE_BAUDRATE); /* switch the active portmap over */ atomic_store_rel_int(&lsc->lsc_activemap, newmap); diff --git a/sys/net/if_var.h b/sys/net/if_var.h index e054c613e9e6..2c09795c6b36 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -515,6 +515,7 @@ EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t); #define IFNET_EVENT_UP 0 #define IFNET_EVENT_DOWN 1 #define IFNET_EVENT_PCP 2 /* priority code point, PCP */ +#define IFNET_EVENT_UPDATE_BAUDRATE 3 typedef void (*ifnet_event_fn)(void *, struct ifnet *ifp, int event); EVENTHANDLER_DECLARE(ifnet_event, ifnet_event_fn); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 2bb5284c2129..dc7a5fcb0c73 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -221,6 +221,7 @@ static MALLOC_DEFINE(M_VLAN, vlanname, "802.1Q Virtual LAN Interface"); static eventhandler_tag ifdetach_tag; static eventhandler_tag iflladdr_tag; +static eventhandler_tag ifevent_tag; /* * if_vlan uses two module-level synchronizations primitives to allow concurrent @@ -327,6 +328,7 @@ static int vlan_clone_destroy(struct if_clone *, struct ifnet *); static void vlan_ifdetach(void *arg, struct ifnet *ifp); static void vlan_iflladdr(void *arg, struct ifnet *ifp); +static void vlan_ifevent(void *arg, struct ifnet *ifp, int event); static void vlan_lladdr_fn(void *arg, int pending); @@ -673,6 +675,34 @@ vlan_setmulti(struct ifnet *ifp) return (0); } +/* + * A handler for interface ifnet events. + */ +static void +vlan_ifevent(void *arg __unused, struct ifnet *ifp, int event) +{ + struct epoch_tracker et; + struct ifvlan *ifv; + struct ifvlantrunk *trunk; + + if (event != IFNET_EVENT_UPDATE_BAUDRATE) + return; + + NET_EPOCH_ENTER(et); + trunk = ifp->if_vlantrunk; + if (trunk == NULL) { + NET_EPOCH_EXIT(et); + return; + } + + TRUNK_WLOCK(trunk); + VLAN_FOREACH(ifv, trunk) { + ifv->ifv_ifp->if_baudrate = ifp->if_baudrate; + } + TRUNK_WUNLOCK(trunk); + NET_EPOCH_EXIT(et); +} + /* * A handler for parent interface link layer address changes. * If the parent interface link layer address is changed we @@ -886,6 +916,10 @@ vlan_modevent(module_t mod, int type, void *data) vlan_iflladdr, NULL, EVENTHANDLER_PRI_ANY); if (iflladdr_tag == NULL) return (ENOMEM); + ifevent_tag = EVENTHANDLER_REGISTER(ifnet_event, + vlan_ifevent, NULL, EVENTHANDLER_PRI_ANY); + if (ifevent_tag == NULL) + return (ENOMEM); VLAN_LOCKING_INIT(); vlan_input_p = vlan_input; vlan_link_state_p = vlan_link_state; @@ -916,6 +950,7 @@ vlan_modevent(module_t mod, int type, void *data) #endif EVENTHANDLER_DEREGISTER(ifnet_departure_event, ifdetach_tag); EVENTHANDLER_DEREGISTER(iflladdr_event, iflladdr_tag); + EVENTHANDLER_DEREGISTER(ifnet_event, ifevent_tag); vlan_input_p = NULL; vlan_link_state_p = NULL; vlan_trunk_cap_p = NULL;