 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ipsec.c,v 1.25 2019/11/01 04:28:14 knakahara Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.26 2020/01/29 04:34:10 thorpej Exp $  */
 /*
  * Copyright (c) 2017 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.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND 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 FOUNDATION 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_ipsec.c,v 1.25 2019/11/01 04:28:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.26 2020/01/29 04:34:10 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 @@ -528,27 +528,27 @@ if_ipsec_output(struct ifnet *ifp, struc
 		IF_DROP(&ifp->if_snd);
 		m_freem(m);
 		goto end;
+	}
 #endif
 	error = if_ipsec_out_direct(var, m, dst->sa_family);
 end:
 	if_ipsec_putref_variant(var, &psref);
 	curlwp_bindx(bound);
 noref_end:
 	if (error)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	return error;
+}
 static inline int
 if_ipsec_out_direct(struct ipsec_variant *var, struct mbuf *m, int family)
+{
 	struct ifnet *ifp = &var->iv_softc->ipsec_if;
 	int error;
 	int len;
 	KASSERT(if_ipsec_heldref_variant(var));
 	KASSERT(var->iv_output != NULL);
 @@ -556,28 +556,27 @@ if_ipsec_out_direct(struct ipsec_variant
 	len = m->m_pkthdr.len;
 	/* input DLT_NULL frame to BPF */
 	bpf_mtap(ifp, m, BPF_D_OUT);
 	/* grab and chop off inner af type */
 	/* XXX need pullup? */
 	m_adj(m, sizeof(int));
 	error = var->iv_output(var, family, m);
 	if (error)
 		return error;
-	ifp->if_opackets++;
+	if_statadd2(ifp, if_opackets, 1, if_obytes, len);
 	ifp->if_obytes += len;
 	return 0;
+}
 void
 if_ipsec_input(struct mbuf *m, int af, struct ifnet *ifp)
+{
 	KASSERT(ifp != NULL);
 	m_set_rcvif(m, ifp);
 	bpf_mtap_af(ifp, af, m, BPF_D_IN);
 @@ -599,42 +598,41 @@ if_ipsec_in_enqueue(struct mbuf *m, int
 	 */
 	switch (af) {
 #ifdef INET
 	case AF_INET:
 		pktq = ip_pktq;
 		break;
 #endif
 #ifdef INET6
 	case AF_INET6:
 		pktq = ip6_pktq;
 		break;
 #endif
 	default:
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		m_freem(m);
 		return;
+	}
 #if 1
 	const u_int h = curcpu()->ci_index;
 #else
 	const uint32_t h = pktq_rps_hash(m);
 #endif
 	pktlen = m->m_pkthdr.len;
 	if (__predict_true(pktq_enqueue(pktq, m, h))) {
-		ifp->if_ibytes += pktlen;
+		if_statadd2(ifp, if_ibytes, pktlen, if_ipackets, 1);
 		ifp->if_ipackets++;
 	} else {
-		ifp->if_iqdrops++;
+		if_statinc(ifp, if_iqdrops);
 		m_freem(m);
+	}
 	return;
+}
 static inline int
 if_ipsec_check_salen(struct sockaddr *addr)
+{
 	switch (addr->sa_family) {
 #ifdef INET
 	case AF_INET:

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_tun.c,v 1.157 2019/12/13 14:13:55 maxv Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.158 2020/01/29 04:34:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
  * Nottingham University 1987.
+ *
  * This source may be freely distributed, however I would be interested
  * in any changes that are made.
+ *
  * This driver takes packets off the IP i/f and hands them up to a
  * user process to have its wicked way with. This driver has its
  * roots in a similar driver written by Phil Cockcroft (formerly) at
  * UCL. This driver is based much more on read/write/poll mode of
  * operation though.
  */
 /*
  * tun - tunnel software network interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.157 2019/12/13 14:13:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.158 2020/01/29 04:34:10 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 @@ -249,33 +249,26 @@ tunattach0(struct tun_softc *tp)
 	ifp = &tp->tun_if;
 	ifp->if_softc = tp;
 	ifp->if_mtu = TUNMTU;
 	ifp->if_ioctl = tun_ioctl;
 	ifp->if_output = tun_output;
 #ifdef ALTQ
 	ifp->if_start = tunstart;
 #endif
 	ifp->if_flags = IFF_POINTOPOINT;
 	ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
 	ifp->if_type = IFT_TUNNEL;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	ifp->if_collisions = 0;
 	ifp->if_ierrors = 0;
 	ifp->if_oerrors = 0;
 	ifp->if_ipackets = 0;
 	ifp->if_opackets = 0;
 	ifp->if_ibytes   = 0;
 	ifp->if_obytes   = 0;
 	ifp->if_dlt = DLT_NULL;
 	IFQ_SET_READY(&ifp->if_snd);
 	if_attach(ifp);
 	if_alloc_sadl(ifp);
 	bpf_attach(ifp, DLT_NULL, sizeof(uint32_t));
+}
 static int
 tun_clone_destroy(struct ifnet *ifp)
+{
 	struct tun_softc *tp = (void *)ifp;
 	bool zombie = false;
 @@ -602,33 +595,32 @@ tun_output(struct ifnet *ifp, struct mbu
 #ifdef INET
 			if (dst->sa_family != AF_INET)
 #endif
+			{
 				error = EAFNOSUPPORT;
 				goto out;
+			}
+		}
 		/* FALLTHROUGH */
 	case AF_UNSPEC:
 		mlen = m0->m_pkthdr.len;
 		IFQ_ENQUEUE(&ifp->if_snd, m0, error);
 		if (error) {
-			ifp->if_collisions++;
+			if_statinc(ifp, if_collisions);
 			error = EAFNOSUPPORT;
 			m0 = NULL;
 			goto out;
+		}
-		ifp->if_opackets++;
+		if_statadd2(ifp, if_opackets, 1, if_obytes, mlen);
 		ifp->if_obytes += mlen;
 		break;
 #endif
 	default:
 		error = EAFNOSUPPORT;
 		goto out;
+	}
 	mutex_enter(&tp->tun_lock);
 	if (tp->tun_flags & TUN_RWAIT) {
 		tp->tun_flags &= ~TUN_RWAIT;
 		cv_broadcast(&tp->tun_cv);
+	}
 	if (tp->tun_flags & TUN_ASYNC && tp->tun_pgid)
 @@ -818,27 +810,27 @@ tunread(dev_t dev, struct uio *uio, int
 	/* Copy the mbuf chain */
 	while (m0 && uio->uio_resid > 0 && error == 0) {
 		len = uimin(uio->uio_resid, m0->m_len);
 		if (len != 0)
 			error = uiomove(mtod(m0, void *), len, uio);
 		m0 = m = m_free(m0);
+	}
 	if (m0) {
 		TUNDEBUG("Dropping mbuf\n");
 		m_freem(m0);
+	}
 	if (error)
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 	return error;
 out:
 	mutex_exit(&tp->tun_lock);
 	return error;
+}
 /*
  * the cdevsw write interface - an atomic write is a packet - or else!
  */
 int
 @@ -936,55 +928,54 @@ tunwrite(dev_t dev, struct uio *uio, int
 		mp = &m->m_next;
 		if (error == 0 && uio->uio_resid > 0) {
 			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
+			}
 			mlen = MLEN;
+		}
+	}
 	if (error) {
 		if (top != NULL)
 			m_freem(top);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto out0;
+	}
 	top->m_pkthdr.len = tlen;
 	m_set_rcvif(top, ifp);
 	bpf_mtap_af(ifp, dst.sa_family, top, BPF_D_IN);
 	if ((error = pfil_run_hooks(ifp->if_pfil, &top, ifp, PFIL_IN)) != 0)
 		goto out0;
 	if (top == NULL)
 		goto out0;
 	mutex_enter(&tp->tun_lock);
 	if ((tp->tun_flags & TUN_INITED) == 0) {
 		/* Interface was destroyed */
 		error = ENXIO;
 		goto out;
+	}
 	if (__predict_false(!pktq_enqueue(pktq, top, 0))) {
-		ifp->if_collisions++;
+		if_statinc(ifp, if_collisions);
 		mutex_exit(&tp->tun_lock);
 		error = ENOBUFS;
 		m_freem(top);
 		goto out0;
+	}
-	ifp->if_ipackets++;
+	if_statadd2(ifp, if_ipackets, 1, if_ibytes, tlen);
 	ifp->if_ibytes += tlen;
 out:
 	mutex_exit(&tp->tun_lock);
 out0:
 	return error;
+}
 #ifdef ALTQ
 /*
  * Start packet transmission on the interface.
  * when the interface queue is rate-limited by ALTQ or TBR,
  * if_start is needed to drain packets from the queue in order
  * to notify readers when outgoing packets become ready.
  */