CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Dec 15 09:35:25 UTC 2016

Modified Files:
        src/sys/dev/ic: hd64570.c midway.c
        src/sys/dev/pci: if_lmc.c
        src/sys/netisdn: i4b_ipr.c

Log Message:
Annotate bpf_mtap still running in Rx hardware interrupt with "XXX not in 
softint"


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netisdn/i4b_ipr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.50 src/sys/dev/ic/hd64570.c:1.51
--- src/sys/dev/ic/hd64570.c:1.50	Fri Jun 10 13:27:13 2016
+++ src/sys/dev/ic/hd64570.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64570.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: hd64570.c,v 1.51 2016/12/15 09:35:24 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.51 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -1574,7 +1574,7 @@ sca_frame_process(sca_port_t *scp)
 		return;
 	}
 
-	bpf_mtap(&scp->sp_if, m);
+	bpf_mtap(&scp->sp_if, m); /* XXX not in softint */
 
 	scp->sp_if.if_ipackets++;
 

Index: src/sys/dev/ic/midway.c
diff -u src/sys/dev/ic/midway.c:1.97 src/sys/dev/ic/midway.c:1.98
--- src/sys/dev/ic/midway.c:1.97	Fri Jun 10 13:27:13 2016
+++ src/sys/dev/ic/midway.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: midway.c,v 1.97 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: midway.c,v 1.98 2016/12/15 09:35:24 ozaki-r Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.97 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.98 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "opt_natm.h"
 
@@ -2766,7 +2766,7 @@ EN_INTR_TYPE en_intr(void *arg)
 	  ifp->if_ipackets++;
 #endif
 
-	  bpf_mtap(ifp, m);
+	  bpf_mtap(ifp, m); /* XXX not in softint */
 
 	  atm_input(ifp, &ah, m, sc->rxslot[slot].rxhand);
 	}

Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.61 src/sys/dev/pci/if_lmc.c:1.62
--- src/sys/dev/pci/if_lmc.c:1.61	Fri Jun 10 13:31:43 2016
+++ src/sys/dev/pci/if_lmc.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.61 2016/06/10 13:31:43 ozaki-r Exp $ */
+/* $NetBSD: if_lmc.c,v 1.62 2016/12/15 09:35:24 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. <bo...@boggs.palo-alto.ca.us>
@@ -74,7 +74,7 @@
  */
 
 # include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.61 2016/06/10 13:31:43 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.62 2016/12/15 09:35:24 ozaki-r Exp $");
 # include <sys/param.h>	/* OS version */
 # include "opt_inet.h"	/* INET6, INET */
 # include "opt_altq_enabled.h" /* ALTQ */
@@ -4294,7 +4294,7 @@ rxintr_cleanup(softc_t *sc)
     sc->status.cntrs.ipackets++;
 
     /* Berkeley Packet Filter */
-    LMC_BPF_MTAP(sc, first_mbuf);
+    LMC_BPF_MTAP(sc, first_mbuf); /* XXX not in softint */
 
     /* Give this good packet to the network stacks. */
     sc->quota--;
@@ -4446,7 +4446,7 @@ txintr_cleanup(softc_t *sc)
         sc->status.cntrs.opackets++;
 
         /* Berkeley Packet Filter */
-        LMC_BPF_MTAP(sc, m);
+        LMC_BPF_MTAP(sc, m); /* XXX not in softint */
 	}
 
       m_freem(m);

Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.39 src/sys/netisdn/i4b_ipr.c:1.40
--- src/sys/netisdn/i4b_ipr.c:1.39	Fri Jun 10 13:27:16 2016
+++ src/sys/netisdn/i4b_ipr.c	Thu Dec 15 09:35:24 2016
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
  *
- *	$Id: i4b_ipr.c,v 1.39 2016/06/10 13:27:16 ozaki-r Exp $
+ *	$Id: i4b_ipr.c,v 1.40 2016/12/15 09:35:24 ozaki-r Exp $
  *
  * $FreeBSD$
  *
@@ -59,7 +59,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.39 2016/06/10 13:27:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.40 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "irip.h"
 #include "opt_irip.h"
@@ -1070,7 +1070,7 @@ error:
 		mm.m_len = 4;
 		mm.m_data = (char *)&af;
 
-		bpf_mtap(&sc->sc_if, &mm);
+		bpf_mtap(&sc->sc_if, &mm); /* XXX not in softint */
 	}
 #endif /* NBPFILTER > 0  || NBPF > 0 */