Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.149.4.5 retrieving revision 1.172 diff -u -p -r1.149.4.5 -r1.172 --- src/sys/netinet6/ip6_input.c 2016/04/22 15:44:18 1.149.4.5 +++ src/sys/netinet6/ip6_input.c 2017/01/16 07:33:36 1.172 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.149.4.5 2016/04/22 15:44:18 skrll Exp $ */ +/* $NetBSD: ip6_input.c,v 1.172 2017/01/16 07:33:36 ryo Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.149.4.5 2016/04/22 15:44:18 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.172 2017/01/16 07:33:36 ryo Exp $"); #ifdef _KERNEL_OPT #include "opt_gateway.h" @@ -70,6 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_compat_netbsd.h" +#include "opt_net_mpsafe.h" #endif #include @@ -87,6 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, #include #include #include +#include #include #include @@ -133,7 +135,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, extern struct domain inet6domain; u_char ip6_protox[IPPROTO_MAX]; -struct in6_ifaddr *in6_ifaddr; pktqueue_t *ip6_pktq __read_mostly; int ip6_forward_srcrt; /* XXX */ @@ -144,6 +145,8 @@ pfil_head_t *inet6_pfil_hook; percpu_t *ip6stat_percpu; +percpu_t *ip6_forward_rt_percpu __cacheline_aligned; + static void ip6_init2(void); static void ip6intr(void *); static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *); @@ -153,6 +156,14 @@ static int ip6_process_hopopts(struct mb static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); static void sysctl_net_inet6_ip6_setup(struct sysctllog **); +#ifdef NET_MPSAFE +#define SOFTNET_LOCK() mutex_enter(softnet_lock) +#define SOFTNET_UNLOCK() mutex_exit(softnet_lock) +#else +#define SOFTNET_LOCK() KASSERT(mutex_owned(softnet_lock)) +#define SOFTNET_UNLOCK() KASSERT(mutex_owned(softnet_lock)) +#endif + /* * IP6 initialization: fill in IP6 protocol switch table. * All protocols not implemented in kernel go to raw IP6 protocol handler. @@ -163,6 +174,8 @@ ip6_init(void) const struct ip6protosw *pr; int i; + in6_init(); + sysctl_net_inet6_ip6_setup(NULL); pr = (const struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW); if (pr == 0) @@ -193,6 +206,10 @@ ip6_init(void) KASSERT(inet6_pfil_hook != NULL); ip6stat_percpu = percpu_alloc(sizeof(uint64_t) * IP6_NSTATS); + + ip6_forward_rt_percpu = percpu_alloc(sizeof(struct route)); + if (ip6_forward_rt_percpu == NULL) + panic("failed to alllocate ip6_forward_rt_percpu"); } static void @@ -215,26 +232,35 @@ ip6intr(void *arg __unused) { struct mbuf *m; +#ifndef NET_MPSAFE mutex_enter(softnet_lock); +#endif while ((m = pktq_dequeue(ip6_pktq)) != NULL) { - const ifnet_t *ifp = m->m_pkthdr.rcvif; + struct psref psref; + struct ifnet *rcvif = m_get_rcvif_psref(m, &psref); + if (rcvif == NULL) { + m_freem(m); + continue; + } /* * Drop the packet if IPv6 is disabled on the interface. */ - if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) { + if ((ND_IFINFO(rcvif)->flags & ND6_IFF_IFDISABLED)) { + m_put_rcvif_psref(rcvif, &psref); m_freem(m); continue; } - ip6_input(m); + ip6_input(m, rcvif); + m_put_rcvif_psref(rcvif, &psref); } +#ifndef NET_MPSAFE mutex_exit(softnet_lock); +#endif } -extern struct route ip6_forward_rt; - void -ip6_input(struct mbuf *m) +ip6_input(struct mbuf *m, struct ifnet *rcvif) { struct ip6_hdr *ip6; int hit, off = sizeof(struct ip6_hdr), nest; @@ -243,11 +269,12 @@ ip6_input(struct mbuf *m) int nxt, ours = 0, rh_present = 0; struct ifnet *deliverifp = NULL; int srcrt = 0; - const struct rtentry *rt; + struct rtentry *rt = NULL; union { struct sockaddr dst; struct sockaddr_in6 dst6; } u; + struct route *ro; /* * make sure we don't have onion peering information into m_tag. @@ -265,19 +292,18 @@ ip6_input(struct mbuf *m) } else { #define M2MMAX 32 if (m->m_next) { - if (m->m_flags & M_LOOP) { + if (m->m_flags & M_LOOP) /*XXX*/ IP6_STATINC(IP6_STAT_M2M + lo0ifp->if_index); - } else if (m->m_pkthdr.rcvif->if_index < M2MMAX) { - IP6_STATINC(IP6_STAT_M2M + - m->m_pkthdr.rcvif->if_index); - } else + else if (rcvif->if_index < M2MMAX) + IP6_STATINC(IP6_STAT_M2M + rcvif->if_index); + else IP6_STATINC(IP6_STAT_M2M); } else IP6_STATINC(IP6_STAT_M1); #undef M2MMAX } - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_receive); + in6_ifstat_inc(rcvif, ifs6_in_receive); IP6_STATINC(IP6_STAT_TOTAL); /* @@ -287,19 +313,17 @@ ip6_input(struct mbuf *m) * IPv6 header is in the first mbuf of the chain. */ if (IP6_HDR_ALIGNED_P(mtod(m, void *)) == 0) { - struct ifnet *inifp = m->m_pkthdr.rcvif; if ((m = m_copyup(m, sizeof(struct ip6_hdr), (max_linkhdr + 3) & ~3)) == NULL) { /* XXXJRT new stat, please */ IP6_STATINC(IP6_STAT_TOOSMALL); - in6_ifstat_inc(inifp, ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); return; } } else if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) { - struct ifnet *inifp = m->m_pkthdr.rcvif; if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) { IP6_STATINC(IP6_STAT_TOOSMALL); - in6_ifstat_inc(inifp, ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); return; } } @@ -308,7 +332,7 @@ ip6_input(struct mbuf *m) if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { IP6_STATINC(IP6_STAT_BADVERS); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); goto bad; } @@ -338,8 +362,7 @@ ip6_input(struct mbuf *m) struct in6_addr odst; odst = ip6->ip6_dst; - if (pfil_run_hooks(inet6_pfil_hook, &m, m->m_pkthdr.rcvif, - PFIL_IN) != 0) + if (pfil_run_hooks(inet6_pfil_hook, &m, rcvif, PFIL_IN) != 0) return; if (m == NULL) return; @@ -350,9 +373,14 @@ ip6_input(struct mbuf *m) IP6_STATINC(IP6_STAT_NXTHIST + ip6->ip6_nxt); #ifdef ALTQ - if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) { - /* packet is dropped by traffic conditioner */ - return; + if (altq_input != NULL) { + SOFTNET_LOCK(); + if ((*altq_input)(m, AF_INET6) == 0) { + SOFTNET_UNLOCK(); + /* packet is dropped by traffic conditioner */ + return; + } + SOFTNET_UNLOCK(); } #endif @@ -365,7 +393,7 @@ ip6_input(struct mbuf *m) * XXX: "badscope" is not very suitable for a multicast source. */ IP6_STATINC(IP6_STAT_BADSCOPE); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); + in6_ifstat_inc(rcvif, ifs6_in_addrerr); goto bad; } /* @@ -383,7 +411,7 @@ ip6_input(struct mbuf *m) if (IN6_IS_ADDR_V4MAPPED(&ip6->ip6_src) || IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst)) { IP6_STATINC(IP6_STAT_BADSCOPE); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); + in6_ifstat_inc(rcvif, ifs6_in_addrerr); goto bad; } #if 0 @@ -397,7 +425,7 @@ ip6_input(struct mbuf *m) if (IN6_IS_ADDR_V4COMPAT(&ip6->ip6_src) || IN6_IS_ADDR_V4COMPAT(&ip6->ip6_dst)) { IP6_STATINC(IP6_STAT_BADSCOPE); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); + in6_ifstat_inc(rcvif, ifs6_in_addrerr); goto bad; } #endif @@ -410,7 +438,7 @@ ip6_input(struct mbuf *m) * to the usage conflict. * in6_setscope() then also checks and rejects the cases where src or * dst are the loopback address and the receiving interface - * is not loopback. + * is not loopback. */ if (__predict_false( m_makewritable(&m, 0, sizeof(struct ip6_hdr), M_DONTWAIT))) @@ -420,24 +448,25 @@ ip6_input(struct mbuf *m) IP6_STATINC(IP6_STAT_BADSCOPE); /* XXX */ goto bad; } - if (in6_setscope(&ip6->ip6_src, m->m_pkthdr.rcvif, NULL) || - in6_setscope(&ip6->ip6_dst, m->m_pkthdr.rcvif, NULL)) { + if (in6_setscope(&ip6->ip6_src, rcvif, NULL) || + in6_setscope(&ip6->ip6_dst, rcvif, NULL)) { IP6_STATINC(IP6_STAT_BADSCOPE); goto bad; } + ro = percpu_getref(ip6_forward_rt_percpu); /* * Multicast check */ if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { struct in6_multi *in6m = 0; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mcast); + in6_ifstat_inc(rcvif, ifs6_in_mcast); /* * See if we belong to the destination multicast group on the * arrival interface. */ - IN6_LOOKUP_MULTI(ip6->ip6_dst, m->m_pkthdr.rcvif, in6m); + IN6_LOOKUP_MULTI(ip6->ip6_dst, rcvif, in6m); if (in6m) ours = 1; else if (!ip6_mrouter) { @@ -445,10 +474,10 @@ ip6_input(struct mbuf *m) ip6s[IP6_STAT_NOTMEMBER]++; ip6s[IP6_STAT_CANTFORWARD]++; IP6_STAT_PUTREF(); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); - goto bad; + in6_ifstat_inc(rcvif, ifs6_in_discard); + goto bad_unref; } - deliverifp = m->m_pkthdr.rcvif; + deliverifp = rcvif; goto hbhcheck; } @@ -457,7 +486,7 @@ ip6_input(struct mbuf *m) /* * Unicast check */ - rt = rtcache_lookup2(&ip6_forward_rt, &u.dst, 1, &hit); + rt = rtcache_lookup2(ro, &u.dst, 1, &hit); if (hit) IP6_STATINC(IP6_STAT_FORWARD_CACHEHIT); else @@ -492,18 +521,20 @@ ip6_input(struct mbuf *m) * packets to a tentative, duplicated, or somehow invalid * address must not be accepted. */ - if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) { + if (!(ia6->ia6_flags & (IN6_IFF_NOTREADY | IN6_IFF_DETACHED))) { /* this address is ready */ ours = 1; deliverifp = ia6->ia_ifp; /* correct? */ goto hbhcheck; } else { /* address is not ready, so discard the packet. */ + char ip6bufs[INET6_ADDRSTRLEN]; + char ip6bufd[INET6_ADDRSTRLEN]; nd6log(LOG_INFO, "packet to an unready address %s->%s\n", - ip6_sprintf(&ip6->ip6_src), - ip6_sprintf(&ip6->ip6_dst)); + ip6_sprintf(ip6bufs, &ip6->ip6_src), + ip6_sprintf(ip6bufd, &ip6->ip6_dst)); - goto bad; + goto bad_unref; } } @@ -530,9 +561,7 @@ ip6_input(struct mbuf *m) * working right. */ struct ifaddr *ifa; - IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) { - if (ifa->ifa_addr == NULL) - continue; /* just for safety */ + IFADDR_READER_FOREACH(ifa, rcvif) { if (ifa->ifa_addr->sa_family != AF_INET6) continue; if (IN6_ARE_ADDR_EQUAL(IFA_IN6(ifa), &ip6->ip6_dst)) { @@ -550,8 +579,8 @@ ip6_input(struct mbuf *m) */ if (!ip6_forwarding) { IP6_STATINC(IP6_STAT_CANTFORWARD); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); - goto bad; + in6_ifstat_inc(rcvif, ifs6_in_discard); + goto bad_unref; } hbhcheck: @@ -563,8 +592,10 @@ ip6_input(struct mbuf *m) */ if (deliverifp && ip6_getdstifaddr(m) == NULL) { struct in6_ifaddr *ia6; + int s = pserialize_read_enter(); ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); + /* Depends on ip6_setdstifaddr never sleep */ if (ia6 != NULL && ip6_setdstifaddr(m, ia6) == NULL) { /* * XXX maybe we should drop the packet here, @@ -572,6 +603,7 @@ ip6_input(struct mbuf *m) * to the upper layers. */ } + pserialize_read_exit(s); } /* @@ -585,8 +617,10 @@ ip6_input(struct mbuf *m) if (ip6_hopopts_input(&plen, &rtalert, &m, &off)) { #if 0 /*touches NULL pointer*/ - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); + in6_ifstat_inc(rcvif, ifs6_in_discard); #endif + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); return; /* m have already been freed */ } @@ -605,17 +639,21 @@ ip6_input(struct mbuf *m) * (non-zero) payload length to the variable plen. */ IP6_STATINC(IP6_STAT_BADOPTIONS); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_discard); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, (char *)&ip6->ip6_plen - (char *)ip6); + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); return; } IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, sizeof(struct ip6_hdr), sizeof(struct ip6_hbh)); if (hbh == NULL) { IP6_STATINC(IP6_STAT_TOOSHORT); + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); return; } KASSERT(IP6_HDR_ALIGNED_P(hbh)); @@ -638,8 +676,8 @@ ip6_input(struct mbuf *m) */ if (m->m_pkthdr.len - sizeof(struct ip6_hdr) < plen) { IP6_STATINC(IP6_STAT_TOOSHORT); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated); - goto bad; + in6_ifstat_inc(rcvif, ifs6_in_truncated); + goto bad_unref; } if (m->m_pkthdr.len > sizeof(struct ip6_hdr) + plen) { if (m->m_len == m->m_pkthdr.len) { @@ -661,16 +699,25 @@ ip6_input(struct mbuf *m) * ip6_mforward() returns a non-zero value, the packet * must be discarded, else it may be accepted below. */ - if (ip6_mrouter && ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) { - IP6_STATINC(IP6_STAT_CANTFORWARD); - m_freem(m); - return; - } - if (!ours) { - m_freem(m); - return; + if (ip6_mrouter != NULL) { + int error; + + SOFTNET_LOCK(); + error = ip6_mforward(ip6, rcvif, m); + SOFTNET_UNLOCK(); + + if (error != 0) { + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); + IP6_STATINC(IP6_STAT_CANTFORWARD); + goto bad; + } } + if (!ours) + goto bad_unref; } else if (!ours) { + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); ip6_forward(m, srcrt); return; } @@ -689,8 +736,8 @@ ip6_input(struct mbuf *m) if (IN6_IS_ADDR_V4MAPPED(&ip6->ip6_src) || IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst)) { IP6_STATINC(IP6_STAT_BADSCOPE); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); - goto bad; + in6_ifstat_inc(rcvif, ifs6_in_addrerr); + goto bad_unref; } /* @@ -699,20 +746,28 @@ ip6_input(struct mbuf *m) #ifdef IFA_STATS if (deliverifp != NULL) { struct in6_ifaddr *ia6; + int s = pserialize_read_enter(); ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); if (ia6) ia6->ia_ifa.ifa_data.ifad_inbytes += m->m_pkthdr.len; + pserialize_read_exit(s); } #endif IP6_STATINC(IP6_STAT_DELIVERED); in6_ifstat_inc(deliverifp, ifs6_in_deliver); nest = 0; + if (rt != NULL) { + rtcache_unref(rt, ro); + rt = NULL; + } + percpu_putref(ip6_forward_rt_percpu); + rh_present = 0; while (nxt != IPPROTO_DONE) { if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) { IP6_STATINC(IP6_STAT_TOOMANYHDR); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); goto bad; } @@ -722,14 +777,13 @@ ip6_input(struct mbuf *m) */ if (m->m_pkthdr.len < off) { IP6_STATINC(IP6_STAT_TOOSHORT); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated); + in6_ifstat_inc(rcvif, ifs6_in_truncated); goto bad; } if (nxt == IPPROTO_ROUTING) { if (rh_present++) { - in6_ifstat_inc(m->m_pkthdr.rcvif, - ifs6_in_hdrerr); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); IP6_STATINC(IP6_STAT_BADOPTIONS); goto bad; } @@ -744,18 +798,29 @@ ip6_input(struct mbuf *m) */ if ((inet6sw[ip_protox[nxt]].pr_flags & PR_LASTHDR) != 0) { - int error = ipsec6_input(m); + int error; + + SOFTNET_LOCK(); + error = ipsec6_input(m); + SOFTNET_UNLOCK(); if (error) goto bad; } } #endif /* IPSEC */ + SOFTNET_LOCK(); nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt); + SOFTNET_UNLOCK(); } return; + + bad_unref: + rtcache_unref(rt, ro); + percpu_putref(ip6_forward_rt_percpu); bad: m_freem(m); + return; } /* @@ -801,7 +866,7 @@ ip6_getdstifaddr(struct mbuf *m) * rtalertp - XXX: should be stored more smart way */ int -ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, +ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, struct mbuf **mp, int *offp) { struct mbuf *m = *mp; @@ -846,7 +911,7 @@ ip6_hopopts_input(u_int32_t *plenp, u_in * opthead + hbhlen is located in continuous memory region. */ static int -ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, +ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, u_int32_t *rtalertp, u_int32_t *plenp) { struct ip6_hdr *ip6; @@ -1021,7 +1086,7 @@ ip6_unknown_opt(u_int8_t *optp, struct m * you are using IP6_EXTHDR_CHECK() not m_pulldown()) */ void -ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, +ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, struct ip6_hdr *ip6, struct mbuf *m) { #ifdef RFC2292 @@ -1062,8 +1127,7 @@ ip6_savecontrol(struct in6pcb *in6p, str memcpy(&pi6.ipi6_addr, &ip6->ip6_dst, sizeof(struct in6_addr)); in6_clearscope(&pi6.ipi6_addr); /* XXX */ - pi6.ipi6_ifindex = m->m_pkthdr.rcvif ? - m->m_pkthdr.rcvif->if_index : 0; + pi6.ipi6_ifindex = m->m_pkthdr.rcvif_index; *mp = sbcreatecontrol((void *) &pi6, sizeof(struct in6_pktinfo), IS2292(IPV6_2292PKTINFO, IPV6_PKTINFO), IPPROTO_IPV6); @@ -1525,66 +1589,6 @@ ip6_delaux(struct mbuf *m) m_tag_delete(m, mtag); } -#ifdef GATEWAY -/* - * sysctl helper routine for net.inet.ip6.maxflows. Since - * we could reduce this value, call ip6flow_reap(); - */ -static int -sysctl_net_inet6_ip6_maxflows(SYSCTLFN_ARGS) -{ - int error; - - error = sysctl_lookup(SYSCTLFN_CALL(rnode)); - if (error || newp == NULL) - return (error); - - mutex_enter(softnet_lock); - KERNEL_LOCK(1, NULL); - - ip6flow_reap(0); - - KERNEL_UNLOCK_ONE(NULL); - mutex_exit(softnet_lock); - - return (0); -} - -static int -sysctl_net_inet6_ip6_hashsize(SYSCTLFN_ARGS) -{ - int error, tmp; - struct sysctlnode node; - - node = *rnode; - tmp = ip6_hashsize; - node.sysctl_data = &tmp; - error = sysctl_lookup(SYSCTLFN_CALL(&node)); - if (error || newp == NULL) - return (error); - - if ((tmp & (tmp - 1)) == 0 && tmp != 0) { - /* - * Can only fail due to malloc() - */ - mutex_enter(softnet_lock); - KERNEL_LOCK(1, NULL); - - error = ip6flow_invalidate_all(tmp); - - KERNEL_UNLOCK_ONE(NULL); - mutex_exit(softnet_lock); - } else { - /* - * EINVAL if not a power of 2 - */ - error = EINVAL; - } - - return error; -} -#endif /* GATEWAY */ - /* * System control for IP6 */ @@ -1903,22 +1907,6 @@ sysctl_net_inet6_ip6_setup(struct sysctl NULL, 0, &ip6_mcast_pmtu, 0, CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_CREATE, CTL_EOL); -#ifdef GATEWAY - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "maxflows", - SYSCTL_DESCR("Number of flows for fast forwarding (IPv6)"), - sysctl_net_inet6_ip6_maxflows, 0, &ip6_maxflows, 0, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "hashsize", - SYSCTL_DESCR("Size of hash table for fast forwarding (IPv6)"), - sysctl_net_inet6_ip6_hashsize, 0, &ip6_hashsize, 0, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); -#endif /* anonportalgo RFC6056 subtree */ const struct sysctlnode *portalgo_node; sysctl_createv(clog, 0, NULL, &portalgo_node,