[src/trunk]: src/sys/netinet6 Get rid of unnecessary splsoftnet

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

details:   https://anonhg.NetBSD.org/src/rev/3c6a0efeba51
branches:  trunk
changeset: 821926:3c6a0efeba51
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Feb 22 07:05:47 2017 +0000

description:
Get rid of unnecessary splsoftnet

diffstat:

 sys/netinet6/nd6_rtr.c |  27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diffs (110 lines):

diff -r e36bb1a3e4b0 -r 3c6a0efeba51 sys/netinet6/nd6_rtr.c
--- a/sys/netinet6/nd6_rtr.c    Wed Feb 22 07:05:04 2017 +0000
+++ b/sys/netinet6/nd6_rtr.c    Wed Feb 22 07:05:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6_rtr.c,v 1.132 2017/02/22 03:02:55 ozaki-r Exp $    */
+/*     $NetBSD: nd6_rtr.c,v 1.133 2017/02/22 07:05:47 ozaki-r Exp $    */
 /*     $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $        */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.132 2017/02/22 03:02:55 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.133 2017/02/22 07:05:47 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -463,7 +463,6 @@
                struct sockaddr_in6 sin6;
                struct sockaddr sa;
        } def, mask, gate;
-       int s;
        int error;
 
        memset(&def, 0, sizeof(def));
@@ -478,14 +477,15 @@
        gate.sin6.sin6_scope_id = 0;    /* XXX */
 #endif
 
-       s = splsoftnet();
+#ifndef NET_MPSAFE
+       KASSERT(mutex_owned(softnet_lock));
+#endif
        error = rtrequest_newmsg(RTM_ADD, &def.sa, &gate.sa, &mask.sa,
            RTF_GATEWAY);
        if (error == 0) {
                nd6_numroutes++;
                newdr->installed = 1;
        }
-       splx(s);
        return;
 }
 
@@ -956,7 +956,7 @@
        struct nd_prefix **newp)
 {
        struct nd_prefix *newpr = NULL;
-       int i, s;
+       int i;
        int error;
        struct in6_ifextra *ext = prc->ndprc_ifp->if_afdata[AF_INET6];
 
@@ -996,10 +996,8 @@
                    newpr->ndpr_mask.s6_addr32[i];
        }
 
-       s = splsoftnet();
        /* link ndpr_entry to nd_prefix list */
        ND_PREFIX_LIST_INSERT_HEAD(newpr);
-       splx(s);
 
        /* ND_OPT_PI_FLAG_ONLINK processing */
        if (newpr->ndpr_raf_onlink) {
@@ -1067,7 +1065,6 @@
 nd6_prelist_remove(struct nd_prefix *pr)
 {
        struct nd_pfxrouter *pfr, *next;
-       int s;
        struct in6_ifextra *ext = pr->ndpr_ifp->if_afdata[AF_INET6];
 
        ND6_ASSERT_WLOCK();
@@ -1075,7 +1072,6 @@
 
        nd6_invalidate_prefix(pr);
 
-       s = splsoftnet();
        /* unlink ndpr_entry from nd_prefix list */
        ND_PREFIX_LIST_REMOVE(pr);
 
@@ -1093,7 +1089,6 @@
                            "%s\n", pr->ndpr_ifp->if_xname);
                }
        }
-       splx(s);
 
        free(pr, M_IP6NDP);
 
@@ -2222,16 +2217,16 @@
 void
 nd6_rt_flush(struct in6_addr *gateway, struct ifnet *ifp)
 {
-       int s = splsoftnet();
+
+#ifndef NET_MPSAFE
+       KASSERT(mutex_owned(softnet_lock));
+#endif
 
        /* We'll care only link-local addresses */
-       if (!IN6_IS_ADDR_LINKLOCAL(gateway)) {
-               splx(s);
+       if (!IN6_IS_ADDR_LINKLOCAL(gateway))
                return;
-       }
 
        rt_delete_matched_entries(AF_INET6, rt6_deleteroute_matcher, gateway);
-       splx(s);
 }
 
 static int