 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.c,v 1.529.2.1.2.4 2023/11/16 05:13:13 thorpej Exp $	*/
+/*	$NetBSD: if.c,v 1.529.2.1.2.5 2023/11/16 14:45:40 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008, 2023 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by William Studenmund and Jason R. Thorpe.
+ *
  * 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.
 @@ -80,27 +80,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.529.2.1.2.4 2023/11/16 05:13:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.529.2.1.2.5 2023/11/16 14:45:40 thorpej Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_atalk.h"
 #include "opt_wlan.h"
 #include "opt_net_mpsafe.h"
 #include "opt_mrouting.h"
 #endif
 #define	__IFQ_PRIVATE
 #include <sys/param.h>
 @@ -221,27 +221,27 @@ static int if_cloners_count;
 pfil_head_t *			if_pfil __read_mostly;
 static kauth_listener_t if_listener;
 static int doifioctl(struct socket *, u_long, void *, struct lwp *);
 static void sysctl_sndq_setup(struct sysctllog **, const char *,
     struct ifqueue *);
 static void if_slowtimo_intr(void *);
 static void if_slowtimo_work(struct work *, void *);
 static int sysctl_if_watchdog(SYSCTLFN_PROTO);
 static void sysctl_watchdog_setup(struct ifnet *);
 static void if_attachdomain1(struct ifnet *);
 static int ifconf(u_long, void *);
-static int if_transmit(struct ifnet *, struct mbuf *);
+static int if_transmit_default(struct ifnet *, struct mbuf *);
 static int if_clone_create(const char *);
 static int if_clone_destroy(const char *);
 static void if_link_state_change_work(struct work *, void *);
 static void if_up_locked(struct ifnet *);
 static void _if_down(struct ifnet *);
 static void if_down_deactivated(struct ifnet *);
 struct if_percpuq {
 	struct ifnet	*ipq_ifp;
 	void		*ipq_si;
 	struct percpu	*ipq_ifqs;	/* struct ifqueue */
 };
 @@ -799,27 +799,27 @@ if_register(ifnet_t *ifp)
 		mutex_init(&isd->isd_lock, MUTEX_DEFAULT, IPL_SOFTCLOCK);
 		callout_init(&isd->isd_ch, CALLOUT_MPSAFE);
 		callout_setfunc(&isd->isd_ch, if_slowtimo_intr, ifp);
 		isd->isd_ifp = ifp;
 		ifp->if_slowtimo_data = isd;
 		if_slowtimo_intr(ifp);
 		sysctl_watchdog_setup(ifp);
+	}
 	if (ifp->if_transmit == NULL || ifp->if_transmit == if_nulltransmit)
-		ifp->if_transmit = if_transmit;
+		ifp->if_transmit = if_transmit_default;
 	IFNET_GLOBAL_LOCK();
 	TAILQ_INSERT_TAIL(&ifnet_list, ifp, if_list);
 	IFNET_WRITER_INSERT_TAIL(ifp);
 	IFNET_GLOBAL_UNLOCK();
+}
 /*
  * The if_percpuq framework
+ *
  * It allows network device drivers to execute the network stack
  * in softint (so called softint-based if_input). It utilizes
  * softint and percpu ifqueue. It doesn't distribute any packets
 @@ -1057,27 +1057,27 @@ if_deferred_start_softint(void *arg)
 static void
 if_deferred_start_common(struct ifnet *ifp)
+{
 	const int s = splnet();
 	if_start_lock(ifp);
 	splx(s);
+}
 static inline bool
 if_snd_is_used(struct ifnet *ifp)
+{
 	return ALTQ_IS_ENABLED(&ifp->if_snd) ||
-	    ifp->if_transmit == if_transmit ||
+	    ifp->if_transmit == if_transmit_default ||
 	    ifp->if_transmit == NULL ||
 	    ifp->if_transmit == if_nulltransmit;
+}
 /*
  * Schedule deferred if_start.
  */
 void
 if_schedule_deferred_start(struct ifnet *ifp)
+{
 	KASSERT(ifp->if_deferred_start != NULL);
 @@ -3755,58 +3755,26 @@ ifreq_setaddr(u_long cmd, struct ifreq *
 	if (len < sa->sa_len)
 		return EFBIG;
 	memset(&ifr->ifr_addr, 0, len);
 	sockaddr_copy(&ifr->ifr_addr, len, sa);
 	if (cmd != ocmd)
 		IFREQN2O_43(oifr, ifr);
 	return 0;
+}
 /*
  * wrapper function for the drivers which doesn't have if_transmit().
  */
 static int
 if_transmit(struct ifnet *ifp, struct mbuf *m)
 	int error;
 	size_t pktlen = m->m_pkthdr.len;
 	bool mcast = (m->m_flags & M_MCAST) != 0;
 	const int s = splnet();
 	IFQ_ENQUEUE(&ifp->if_snd, m, error);
 	if (error != 0) {
 		/* mbuf is already freed */
 		goto out;
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	if_statadd_ref(nsr, if_obytes, pktlen);
 	if (mcast)
 		if_statinc_ref(nsr, if_omcasts);
 	IF_STAT_PUTREF(ifp);
 	if ((ifp->if_flags & IFF_OACTIVE) == 0)
 		if_start_lock(ifp);
 out:
 	splx(s);
 	return error;
 /*
  * ifq_init --
+ *
  *	Initialize an interface queue.
  */
 void
 ifq_init(struct ifqueue * const ifq, unsigned int maxqlen)
+{
 #ifdef ALTQ
 	/*
 	 * ALTQ data can be allocated via IFQ_SET_READY() which
 	 * can be called before if_initialize(), which in turn
 	 * calls ifq_init().  Preserve it.
 	 */
 @@ -4391,69 +4359,131 @@ ifq_classify_packet(struct ifqueue * con
 				(m)->m_pkthdr.pattr_class =
 				    (*altq->altq_classify)
 					(altq->altq_clfier, m, af);
+			}
 			m->m_pkthdr.pattr_af = af;
 			m->m_pkthdr.pattr_hdr = mtod(m, void *);
+		}
 		KERNEL_UNLOCK_ONE(NULL);
+	}
 	mutex_exit((ifq)->ifq_lock);
 #endif /* ALTQ */
+}
 #ifdef ALTQ
 static void
-ifq_lock2(struct ifqueue * const ifq0, struct ifqueue * const ifq1)
+if_transmit_tail(struct ifnet *ifp, size_t pktlen, bool mcast)
+{
-	KASSERT(ifq0 != ifq1);
+	const int s = splnet();			/* XXX */
 	if (ifq0 < ifq1) {
-		mutex_enter(ifq0->ifq_lock);
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-		mutex_enter(ifq1->ifq_lock);
+	if_statadd_ref(nsr, if_obytes, pktlen);
-	} else {
+	if (mcast)
-		mutex_enter(ifq1->ifq_lock);
+		if_statinc_ref(nsr, if_omcasts);
-		mutex_enter(ifq0->ifq_lock);
+	IF_STAT_PUTREF(ifp);
 	if ((ifp->if_flags & IFF_OACTIVE) == 0)
 		if_start_lock(ifp);
 	splx(s);
+}
 /*
  * wrapper function for the drivers which doesn't have if_transmit().
  */
 static int
 if_transmit_default(struct ifnet *ifp, struct mbuf *m)
+{
 	int error;
 	size_t pktlen = m->m_pkthdr.len;
 	bool mcast = (m->m_flags & M_MCAST) != 0;
 	error = ifq_put(&ifp->if_snd, m);
 	if (error == 0) {
 		if_transmit_tail(ifp, pktlen, mcast);
+	}
 	return error;
+}
 #endif /* ALTQ */
 /*
  * Queue message on interface, and start output if interface
  * not yet active.
  */
 int
 if_enqueue(struct ifnet *ifp, struct mbuf *m)
+{
 	int error;
 	kmsan_check_mbuf(m);
 #ifdef ALTQ
-	KERNEL_LOCK(1, NULL);
+	mutex_enter(ifp->if_snd.ifq_lock);
-	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
+	if (__predict_false(ALTQ_IS_ENABLED(&ifp->if_snd))) {
-		error = if_transmit(ifp, m);
+		size_t pktlen = m->m_pkthdr.len;
-		KERNEL_UNLOCK_ONE(NULL);
+		bool mcast = (m->m_flags & M_MCAST) != 0;
-	} else {
+		int error;
 		/*
 		 * All of this amounts to an elaborate ifq_put_slow()
 		 * that kicks the output queue.
 		 */
 		mutex_exit(ifp->if_snd.ifq_lock);
 		KERNEL_LOCK(1, NULL);
 		mutex_enter(ifp->if_snd.ifq_lock);
 		if (__predict_true(ALTQ_IS_ENABLED(&ifp->if_snd))) {
 			ALTQ_ENQUEUE(&ifp->if_snd, m, error);
 			KERNEL_UNLOCK_ONE(NULL);
 			goto finish;
+		}
 		KERNEL_UNLOCK_ONE(NULL);
 		error = (*ifp->if_transmit)(ifp, m);
-		/* mbuf is already freed */
+		if (__predict_true(ifp->if_transmit == if_transmit_default)) {
 			if (__predict_false(IF_QFULL(&ifp->if_snd))) {
 				error = ENOBUFS;
 			} else {
 				IF_ENQUEUE(&ifp->if_snd, m);
 				error = 0;
+			}
  finish:
  			if (__predict_false(error != 0)) {
 				ifp->if_snd.ifq_drops++;
 				mutex_exit(ifp->if_snd.ifq_lock);
 				m_freem(m);
 				return error;
+			}
 			mutex_exit(ifp->if_snd.ifq_lock);
 			if_transmit_tail(ifp, pktlen, mcast);
 			return 0;
+		}
+	}
-#else /* !ALTQ */
+	mutex_exit(ifp->if_snd.ifq_lock);
-	error = (*ifp->if_transmit)(ifp, m);
+#endif /* ALTQ */
 	/* mbuf is already freed */
 #endif /* !ALTQ */
-	return error;
+	return (*ifp->if_transmit)(ifp, m);
+}
 #ifdef ALTQ
 static void
 ifq_lock2(struct ifqueue * const ifq0, struct ifqueue * const ifq1)
+{
 	KASSERT(ifq0 != ifq1);
 	if (ifq0 < ifq1) {
 		mutex_enter(ifq0->ifq_lock);
 		mutex_enter(ifq1->ifq_lock);
 	} else {
 		mutex_enter(ifq1->ifq_lock);
 		mutex_enter(ifq0->ifq_lock);
+	}
+}
 #endif /* ALTQ */
 /*
  * Queue message on interface, possibly using a second fast queue
+ *
  * N.B. Unlike ifq_enqueue(), this does *not* start transmission on
  * the interface.
  */
 int
 if_enqueue2(struct ifnet *ifp, struct ifqueue *ifq, struct mbuf *m)
+{
 	struct ifqueue * const ifq0 = &ifp->if_snd;
 	int error = 0;