 @@ -1,36 +1,36 @@
-/*	$NetBSD: if_lagg.c,v 1.29 2022/01/12 01:21:36 riastradh Exp $	*/
+/*	$NetBSD: if_lagg.c,v 1.30 2022/01/12 08:23:53 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
  * Copyright (c) 2014, 2016 Marcelo Araujo <araujo@FreeBSD.org>
  * Copyright (c) 2021, Internet Initiative Japan Inc.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.29 2022/01/12 01:21:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.30 2022/01/12 08:23:53 yamaguchi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_lagg.h"
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cprng.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 @@ -92,27 +92,27 @@ static const struct lagg_proto lagg_prot
 		.pr_num = LAGG_PROTO_LACP,
 		.pr_attach = lacp_attach,
 		.pr_detach = lacp_detach,
 		.pr_up = lacp_up,
 		.pr_down = lacp_down,
 		.pr_transmit = lacp_transmit,
 		.pr_input = lacp_input,
 		.pr_allocport = lacp_allocport,
 		.pr_freeport = lacp_freeport,
 		.pr_startport = lacp_startport,
 		.pr_stopport = lacp_stopport,
 		.pr_protostat = lacp_protostat,
 		.pr_portstat = lacp_portstat,
-		.pr_linkstate = lacp_linkstate,
+		.pr_linkstate = lacp_linkstate_ifnet_locked,
 		.pr_ioctl = lacp_ioctl,
 	},
 	[LAGG_PROTO_FAILOVER] = {
 		.pr_num = LAGG_PROTO_FAILOVER,
 		.pr_attach = lagg_fail_attach,
 		.pr_detach = lagg_common_detach,
 		.pr_transmit = lagg_fail_transmit,
 		.pr_input = lagg_fail_input,
 		.pr_allocport = lagg_common_allocport,
 		.pr_freeport = lagg_common_freeport,
 		.pr_startport = lagg_common_startport,
 		.pr_stopport = lagg_common_stopport,
 		.pr_portstat = lagg_fail_portstat,
 @@ -1480,26 +1480,28 @@ lagg_proto_stopport(struct lagg_softc *s
+{
 	lagg_proto_portctrl(sc, lp, LAGG_PORTCTRL_STOP);
+}
 static void
 lagg_proto_linkstate(struct lagg_softc *sc, struct lagg_port *lp)
+{
 	struct lagg_variant *var;
 	struct psref psref;
 	lagg_proto pr;
 	int bound;
 	KASSERT(IFNET_LOCKED(lp->lp_ifp));
 	bound = curlwp_bind();
 	var = lagg_variant_getref(sc, &psref);
 	if (var == NULL) {
 		curlwp_bindx(bound);
 		return;
+	}
 	pr = var->lv_proto;
 	if (lagg_protos[pr].pr_linkstate)
 		lagg_protos[pr].pr_linkstate(var->lv_psc, lp);
 @@ -2682,26 +2684,28 @@ lagg_unconfig_promisc(struct lagg_softc
 static int
 lagg_port_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct lagg_softc *sc;
 	struct lagg_port *lp;
 	int error = 0;
 	u_int ifflags;
 	if ((lp = ifp->if_lagg) == NULL ||
 	    (sc = lp->lp_softc) == NULL) {
 		goto fallback;
+	}
 	KASSERT(IFNET_LOCKED(lp->lp_ifp));
 	switch (cmd) {
 	case SIOCSIFCAP:
 	case SIOCSIFMTU:
 	case SIOCSETHERCAP:
 		/* Do not allow the setting to be cahanged once joined */
 		error = EINVAL;
 		break;
 	case SIOCSIFFLAGS:
 		ifflags = ifp->if_flags;
 		error = LAGG_PORT_IOCTL(lp, cmd, data);
 		ifflags ^= ifp->if_flags;
 		if ((ifflags & (IFF_UP | IFF_RUNNING)) != 0) {
 @@ -2807,27 +2811,30 @@ lagg_linkstate_changed(void *xifp)
 	int s, bound;
 	s = pserialize_read_enter();
 	lp = atomic_load_consume(&ifp->if_lagg);
 	if (lp != NULL) {
 		bound = curlwp_bind();
 		lagg_port_getref(lp, &psref);
 	} else {
 		pserialize_read_exit(s);
 		return;
+	}
 	pserialize_read_exit(s);
 	IFNET_LOCK(lp->lp_ifp);
 	lagg_proto_linkstate(lp->lp_softc, lp);
 	IFNET_UNLOCK(lp->lp_ifp);
 	lagg_port_putref(lp, &psref);
 	curlwp_bindx(bound);
+}
 void
 lagg_port_getref(struct lagg_port *lp, struct psref *psref)
+{
 	psref_acquire(psref, &lp->lp_psref, lagg_port_psref_class);
+}
 void
 lagg_port_putref(struct lagg_port *lp, struct psref *psref)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_lagg_lacp.c,v 1.11 2022/01/06 12:09:42 riastradh Exp $	*/
+/*	$NetBSD: if_lagg_lacp.c,v 1.12 2022/01/12 08:23:53 yamaguchi Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c)2005 YAMAMOTO Takashi,
  * Copyright (c)2008 Andrew Thompson <thompsa@FreeBSD.org>
  * Copyright (c)2021 Internet Initiative Japan, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.11 2022/01/06 12:09:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.12 2022/01/12 08:23:53 yamaguchi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_lagg.h"
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/evcnt.h>
 #include <sys/kmem.h>
 #include <sys/pslist.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 @@ -202,28 +202,26 @@ static void	lacp_dprintf(const struct la
 	lacp_aggregator_str(_a, _b, _bs)
 #define __LACPDEBUGUSED
 #else
 #define LACP_DPRINTF(a)				__nothing
 #define LACP_PEERINFO_IDSTR(_pi, _b, _bs)	__nothing
 #define LACP_STATE_STR(_s, _b, _bs)		__nothing
 #define LACP_AGGREGATOR_STR(_a, _b, _bs)	__nothing
 #define __LACPDEBUGUSED __unused
 #endif
 #define LACP_LOCK(_sc)		mutex_enter(&(_sc)->lsc_lock)
 #define LACP_UNLOCK(_sc)	mutex_exit(&(_sc)->lsc_lock)
 #define LACP_LOCKED(_sc)	mutex_owned(&(_sc)->lsc_lock)
 #define LACP_LINKSTATE(_sc, _lp)			\
 	lacp_linkstate((struct lagg_proto_softc *)(_sc), (_lp))
 #define LACP_TIMER_ARM(_lacpp, _timer, _val)		\
 	(_lacpp)->lp_timer[(_timer)] = (_val)
 #define LACP_TIMER_DISARM(_lacpp, _timer)		\
 	LACP_TIMER_ARM((_lacpp), (_timer), 0)
 #define LACP_TIMER_ISARMED(_lacpp, _timer)		\
 	((_lacpp)->lp_timer[(_timer)] > 0)
 #define LACP_PTIMER_ARM(_sc, _timer, _val)		\
 	(_sc)->lsc_timer[(_timer)] = (_val)
 #define LACP_PTIMER_DISARM(_sc, _timer)			\
 	LACP_PTIMER_ARM((_sc), (_timer), 0)
 #define LACP_PTIMER_ISARMED(_sc, _timer)		\
 	((_sc)->lsc_timer[(_timer)] > 0)
 #define LACP_STATE_EQ(_s1, _s2, _mask)	(!ISSET((_s1) ^ (_s2), (_mask)))
 @@ -232,26 +230,27 @@ static void	lacp_dprintf(const struct la
 #define LACP_ISDUMPING(_sc)	(_sc)->lsc_dump_du
 #define LACP_PORTMAP_ACTIVE(_sc)			\
 	    atomic_load_consume(&(_sc)->lsc_activemap)
 #define LACP_PORTMAP_NEXT(_sc)				\
 	    (((LACP_PORTMAP_ACTIVE((_sc))) ^ 0x01) &0x01)
 #define LACP_SYS_PRI(_la)	ntohs((_la)->la_sid.sid_prio)
 #define LACP_TLV_PARSE(_du, _st, _name, _tlvlist)	\
 	    tlv_parse(&(_du)->_name,			\
 	    sizeof(_st) - offsetof(_st, _name),		\
 	    (_tlvlist))
 static void	lacp_tick(void *);
 static void	lacp_tick_work(struct lagg_work *, void *);
 static void	lacp_linkstate(struct lagg_proto_softc *, struct lagg_port *);
 static uint32_t	lacp_ifmedia2lacpmedia(u_int);
 static void	lacp_port_disable(struct lacp_softc *, struct lacp_port *);
 static void	lacp_port_enable(struct lacp_softc *, struct lacp_port *);
 static void	lacp_peerinfo_actor(struct lacp_softc *, struct lacp_port *,
 		    struct lacpdu_peerinfo *);
 static void	lacp_peerinfo_partner(struct lacp_port *,
 		    struct lacpdu_peerinfo *);
 static struct lagg_port *
 		lacp_select_tx_port(struct lacp_softc *, struct mbuf *,
 		    struct psref *);
 static void	lacp_suppress_distributing(struct lacp_softc *);
 static void	lacp_distributing_timer(struct lacp_softc *);
 @@ -663,43 +662,43 @@ lacp_allocport(struct lagg_proto_softc *
 	if (lacpp == NULL)
 		return ENOMEM;
 	lacpp->lp_added_multi = added_multi;
 	lagg_work_set(&lacpp->lp_work_smtx, lacp_sm_tx_work, lsc);
 	lagg_work_set(&lacpp->lp_work_marker, lacp_marker_work, lsc);
 	LACP_LOCK(lsc);
 	lacp_sm_port_init(lsc, lacpp, lp);
 	LACP_UNLOCK(lsc);
 	lp->lp_proto_ctx = (void *)lacpp;
 	lp->lp_prio = ntohs(lacpp->lp_actor.lpi_portprio);
-	LACP_LINKSTATE(lsc, lp);
+	lacp_linkstate(xlsc, lp);
 	return 0;
+}
 void
 lacp_startport(struct lagg_proto_softc *xlsc, struct lagg_port *lp)
+{
 	struct lacp_port *lacpp;
 	uint16_t prio;
 	lacpp = lp->lp_proto_ctx;
 	prio = (uint16_t)MIN(lp->lp_prio, UINT16_MAX);
 	lacpp->lp_actor.lpi_portprio = htons(prio);
-	LACP_LINKSTATE((struct lacp_softc *)xlsc, lp);
+	lacp_linkstate(xlsc, lp);
+}
 void
 lacp_stopport(struct lagg_proto_softc *xlsc, struct lagg_port *lp)
+{
 	struct lacp_softc *lsc;
 	struct lacp_port *lacpp;
 	int i;
 	lsc = (struct lacp_softc *)xlsc;
 	lacpp = lp->lp_proto_ctx;
 	KASSERT(LAGG_LOCKED(lsc->lsc_softc));
 @@ -811,47 +810,47 @@ lacp_portstat(struct lagg_proto_softc *x
 		llp->partner_key = ntohs(sid->sid_key);
+	}
 	llp->actor_portprio = ntohs(lacpp->lp_actor.lpi_portprio);
 	llp->actor_portno = ntohs(lacpp->lp_actor.lpi_portno);
 	llp->actor_state = lacpp->lp_actor.lpi_state;
 	llp->partner_portprio = ntohs(lacpp->lp_partner.lpi_portprio);
 	llp->partner_portno = ntohs(lacpp->lp_partner.lpi_portno);
 	llp->partner_state = lacpp->lp_partner.lpi_state;
+}
 void
-lacp_linkstate(struct lagg_proto_softc *xlsc, struct lagg_port *lp)
+lacp_linkstate_ifnet_locked(struct lagg_proto_softc *xlsc, struct lagg_port *lp)
+{
 	struct lacp_softc *lsc;
 	struct lacp_port *lacpp;
 	struct ifmediareq ifmr;
 	struct ifnet *ifp_port;
 	uint8_t old_state;
 	uint32_t media, old_media;
 	int error;
 	KASSERT(IFNET_LOCKED(lp->lp_ifp));
 	lsc = (struct lacp_softc *)xlsc;
 	ifp_port = lp->lp_ifp;
 	lacpp = lp->lp_proto_ctx;
 	media = LACP_MEDIA_DEFAULT;
 	memset(&ifmr, 0, sizeof(ifmr));
 	ifmr.ifm_count = 0;
 	IFNET_LOCK(ifp_port);
 	error = if_ioctl(ifp_port, SIOCGIFMEDIA, (void *)&ifmr);
 	IFNET_UNLOCK(ifp_port);
 	if (error == 0) {
 		media = lacp_ifmedia2lacpmedia(ifmr.ifm_active);
 	} else if (error != ENOTTY){
 		LACP_DPRINTF((lsc, lacpp,
 		    "SIOCGIFMEDIA failed (%d)\n", error));
 		return;
+	}
 	LACP_LOCK(lsc);
 	if (lsc->lsc_running) {
 		old_media = lacpp->lp_media;
 		old_state = lacpp->lp_actor.lpi_state;
 @@ -2634,13 +2633,24 @@ lacp_ifmedia2lacpmedia(u_int ifmedia)
 		rv = LACP_LINKSPEED_10G;
 		break;
 	default:
 		rv = LACP_LINKSPEED_UNKNOWN;
+	}
 	if (IFM_TYPE(ifmedia) == IFM_ETHER)
 		SET(rv, LACP_MEDIA_ETHER);
 	if ((ifmedia & IFM_FDX) != 0)
 		SET(rv, LACP_MEDIA_FDX);
 	return rv;
+}
 static void
 lacp_linkstate(struct lagg_proto_softc *xlsc, struct lagg_port *lp)
+{
 	IFNET_ASSERT_UNLOCKED(lp->lp_ifp);
 	IFNET_LOCK(lp->lp_ifp);
 	lacp_linkstate_ifnet_locked(xlsc, lp);
 	IFNET_UNLOCK(lp->lp_ifp);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_laggproto.h,v 1.9 2021/10/19 07:52:33 yamaguchi Exp $	*/
+/*	$NetBSD: if_laggproto.h,v 1.10 2022/01/12 08:23:53 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2021 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -189,28 +189,28 @@ struct lagg_softc {
  * - sc_var is protected by both pselialize (sc_psz) and psref (lv_psref)
  *    - Updates of sc_var is serialized by sc_lock
  * - Items in sc_ports is protected by both psref (lp_psref) and
  *   pserialize contained in struct lagg_proto_softc
  *   - details are discribed in if_laggport.c and if_lagg_lacp.c
  *   - Updates of items in sc_ports are serialized by sc_lock
  * - an instance referenced by lp_proto_ctx in struct lagg_port is
  *   protected by a lock in struct lagg_proto_softc
+ *
  * Locking order:
  * - IFNET_LOCK(sc_if) -> LAGG_LOCK -> ETHER_LOCK(sc_if) -> a lock in
  *   struct lagg_port_softc
  * - IFNET_LOCK(sc_if) -> LAGG_LOCK -> IFNET_LOCK(lp_ifp)
  * - IFNET_LOCK(lp_ifp) -> a lock in struct lagg_proto_softc
  * - Currently, there is no combination of following locks
  *   - IFNET_LOCK(lp_ifp) and a lock in struct lagg_proto_softc
  *   - IFNET_LOCK(lp_ifp) and ETHER_LOCK(sc_if)
  */
 #define LAGG_LOCK(_sc)		mutex_enter(&(_sc)->sc_lock)
 #define LAGG_UNLOCK(_sc)	mutex_exit(&(_sc)->sc_lock)
 #define LAGG_LOCKED(_sc)	mutex_owned(&(_sc)->sc_lock)
 #define LAGG_CLLADDR(_sc)	CLLADDR((_sc)->sc_if.if_sadl)
 #define	LAGG_PORTS_FOREACH(_sc, _lp)	\
     SIMPLEQ_FOREACH((_lp), &(_sc)->sc_ports, lp_entry)
 #define	LAGG_PORTS_FIRST(_sc)	SIMPLEQ_FIRST(&(_sc)->sc_ports)
 #define LAGG_PORTS_EMPTY(_sc)	SIMPLEQ_EMPTY(&(_sc)->sc_ports)
 #define LAGG_PORT_IOCTL(_lp, _cmd, _data)	\
 	(_lp)->lp_ioctl == NULL ? ENOTTY :	\
 @@ -310,16 +310,16 @@ void		lacp_detach(struct lagg_proto_soft
 int		lacp_up(struct lagg_proto_softc *);
 void		lacp_down(struct lagg_proto_softc *);
 int		lacp_transmit(struct lagg_proto_softc *, struct mbuf *);
 struct mbuf *	lacp_input(struct lagg_proto_softc *, struct lagg_port *,
 		    struct mbuf *);
 int		lacp_allocport(struct lagg_proto_softc *, struct lagg_port *);
 void		lacp_freeport(struct lagg_proto_softc *, struct lagg_port *);
 void		lacp_startport(struct lagg_proto_softc *, struct lagg_port *);
 void		lacp_stopport(struct lagg_proto_softc *, struct lagg_port *);
 void		lacp_protostat(struct lagg_proto_softc *,
 		    struct laggreqproto *);
 void		lacp_portstat(struct lagg_proto_softc *, struct lagg_port *,
 		    struct laggreqport *);
-void		lacp_linkstate(struct lagg_proto_softc *, struct lagg_port *);
+void		lacp_linkstate_ifnet_locked(struct lagg_proto_softc *, struct lagg_port *);
 int		lacp_ioctl(struct lagg_proto_softc *, struct laggreqproto *);
 #endif