[src/trunk]: src/sys Annotate bpf_mtap still running in Rx hardware interrupt...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/349ad1f33173
branches:  trunk
changeset: 349585:349ad1f33173
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Dec 15 09:35:24 2016 +0000

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

diffstat:

 sys/dev/ic/hd64570.c  |  6 +++---
 sys/dev/ic/midway.c   |  6 +++---
 sys/dev/pci/if_lmc.c  |  8 ++++----
 sys/netisdn/i4b_ipr.c |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (120 lines):

diff -r 0b409617c729 -r 349ad1f33173 sys/dev/ic/hd64570.c
--- a/sys/dev/ic/hd64570.c      Thu Dec 15 09:33:25 2016 +0000
+++ b/sys/dev/ic/hd64570.c      Thu Dec 15 09:35:24 2016 +0000
@@ -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 @@
                return;
        }
 
-       bpf_mtap(&scp->sp_if, m);
+       bpf_mtap(&scp->sp_if, m); /* XXX not in softint */
 
        scp->sp_if.if_ipackets++;
 
diff -r 0b409617c729 -r 349ad1f33173 sys/dev/ic/midway.c
--- a/sys/dev/ic/midway.c       Thu Dec 15 09:33:25 2016 +0000
+++ b/sys/dev/ic/midway.c       Thu Dec 15 09:35:24 2016 +0000
@@ -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 @@
          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);
        }
diff -r 0b409617c729 -r 349ad1f33173 sys/dev/pci/if_lmc.c
--- a/sys/dev/pci/if_lmc.c      Thu Dec 15 09:33:25 2016 +0000
+++ b/sys/dev/pci/if_lmc.c      Thu Dec 15 09:35:24 2016 +0000
@@ -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. <boggs%boggs.palo-alto.ca.us@localhost>
@@ -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 @@
     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 @@
         sc->status.cntrs.opackets++;
 
         /* Berkeley Packet Filter */
-        LMC_BPF_MTAP(sc, m);
+        LMC_BPF_MTAP(sc, m); /* XXX not in softint */
        }
 
       m_freem(m);
diff -r 0b409617c729 -r 349ad1f33173 sys/netisdn/i4b_ipr.c
--- a/sys/netisdn/i4b_ipr.c     Thu Dec 15 09:33:25 2016 +0000
+++ b/sys/netisdn/i4b_ipr.c     Thu Dec 15 09:35:24 2016 +0000
@@ -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 @@
                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 */