Sat Aug 9 09:43:49 2014 UTC ()

Count packets in if_shmem

ok @pooka


(ozaki-r)

diff -r1.61 -r1.62 src/sys/rump/net/lib/libshmif/if_shmem.c

--- src/sys/rump/net/lib/libshmif/if_shmem.c 2014/05/28 20:57:22	1.61
+++ src/sys/rump/net/lib/libshmif/if_shmem.c 2014/08/09 09:43:49	1.62

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $	*/
+/*	$NetBSD: if_shmem.c,v 1.62 2014/08/09 09:43:49 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation.
+ *
  * 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
 @@ -18,27 +18,27 @@
  * 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_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.62 2014/08/09 09:43:49 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/vmem.h>
 #include <sys/cprng.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -556,26 +556,27 @@ shmif_start(struct ifnet *ifp)
 			dataoff = shmif_buswrite(busmem, dataoff,
 			    mtod(m, void *), m->m_len, &wrap);
+		}
 		KASSERT(pktwrote == pktsize);
 		if (wrap) {
 			busmem->shm_gen++;
 			DPRINTF(("bus generation now %" PRIu64 "\n",
 			    busmem->shm_gen));
+		}
 		shmif_unlockbus(busmem);
 		m_freem(m0);
 		wrote = true;
 		ifp->if_opackets++;
 		DPRINTF(("shmif_start: send %d bytes at off %d\n",
 		    pktsize, busmem->shm_last));
+	}
 	ifp->if_flags &= ~IFF_OACTIVE;
 	/* wakeup? */
 	if (wrote) {
 		dowakeup(sc);
+	}
+}
 @@ -745,26 +746,27 @@ shmif_rcv(void *arg)
 		if (memcmp(eth->ether_dhost, CLLADDR(ifp->if_sadl),
 		    ETHER_ADDR_LEN) == 0) {
 			passup = true;
 		} else if (ETHER_IS_MULTICAST(eth->ether_dhost)) {
 			passup = true;
 		} else if (ifp->if_flags & IFF_PROMISC) {
 			m->m_flags |= M_PROMISC;
 			passup = true;
 		} else {
 			passup = false;
+		}
 		if (passup) {
 			ifp->if_ipackets++;
 			KERNEL_LOCK(1, NULL);
 			bpf_mtap(ifp, m);
 			ifp->if_input(ifp, m);
 			KERNEL_UNLOCK_ONE(NULL);
 			m = NULL;
+		}
 		/* else: reuse mbuf for a future packet */
+	}
 	m_freem(m);
 	m = NULL;
 	if (!sc->sc_dying)
 		goto reup;