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.103 retrieving revision 1.116 diff -u -p -r1.103 -r1.116 --- src/sys/netinet6/ip6_input.c 2007/05/02 20:40:27 1.103 +++ src/sys/netinet6/ip6_input.c 2008/04/15 03:57:04 1.116 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.103 2007/05/02 20:40:27 dyoung Exp $ */ +/* $NetBSD: ip6_input.c,v 1.116 2008/04/15 03:57:04 thorpej 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.103 2007/05/02 20:40:27 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.116 2008/04/15 03:57:04 thorpej Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -102,6 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c, #include #include #include +#include #include #include #include @@ -136,7 +137,7 @@ static int ip6qmaxlen = IFQ_MAXLEN; struct in6_ifaddr *in6_ifaddr; struct ifqueue ip6intrq; -extern struct callout in6_tmpaddrtimer_ch; +extern callout_t in6_tmpaddrtimer_ch; int ip6_forward_srcrt; /* XXX */ int ip6_sourcecheck; /* XXX */ @@ -146,20 +147,20 @@ int ip6_sourcecheck_interval; /* XXX */ struct pfil_head inet6_pfil_hook; #endif -struct ip6stat ip6stat; +percpu_t *ip6stat_percpu; -static void ip6_init2 __P((void *)); -static struct m_tag *ip6_setdstifaddr __P((struct mbuf *, struct in6_ifaddr *)); +static void ip6_init2(void *); +static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *); -static int ip6_hopopts_input __P((u_int32_t *, u_int32_t *, struct mbuf **, int *)); -static struct mbuf *ip6_pullexthdr __P((struct mbuf *, size_t, int)); +static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); +static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); /* * IP6 initialization: fill in IP6 protocol switch table. * All protocols not implemented in kernel go to raw IP6 protocol handler. */ void -ip6_init() +ip6_init(void) { const struct ip6protosw *pr; int i; @@ -195,6 +196,8 @@ ip6_init() printf("ip6_init: WARNING: unable to register pfil hook, " "error %d\n", i); #endif /* PFIL_HOOKS */ + + ip6stat_percpu = percpu_alloc(sizeof(uint64_t) * IP6_NSTATS); } static void @@ -202,11 +205,11 @@ ip6_init2(void *dummy) { /* nd6_timer_init */ - callout_init(&nd6_timer_ch); + callout_init(&nd6_timer_ch, 0); callout_reset(&nd6_timer_ch, hz, nd6_timer, NULL); /* timer for regeneranation of temporary addresses randomize ID */ - callout_init(&in6_tmpaddrtimer_ch); + callout_init(&in6_tmpaddrtimer_ch, 0); callout_reset(&in6_tmpaddrtimer_ch, (ip6_temp_preferred_lifetime - ip6_desync_factor - ip6_temp_regen_advance) * hz, @@ -217,7 +220,7 @@ ip6_init2(void *dummy) * IP6 input interrupt handling. Just pass the packet to ip6_input. */ void -ip6intr() +ip6intr(void) { int s; struct mbuf *m; @@ -243,13 +246,17 @@ void ip6_input(struct mbuf *m) { struct ip6_hdr *ip6; - int off = sizeof(struct ip6_hdr), nest; + int hit, off = sizeof(struct ip6_hdr), nest; u_int32_t plen; u_int32_t rtalert = ~0; - int nxt, ours = 0; + int nxt, ours = 0, rh_present = 0; struct ifnet *deliverifp = NULL; int srcrt = 0; - const struct sockaddr_in6 *cdst; + const struct rtentry *rt; + union { + struct sockaddr dst; + struct sockaddr_in6 dst6; + } u; #ifdef FAST_IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; @@ -276,25 +283,26 @@ ip6_input(struct mbuf *m) */ if (m->m_flags & M_EXT) { if (m->m_next) - ip6stat.ip6s_mext2m++; + IP6_STATINC(IP6_STAT_MEXT2M); else - ip6stat.ip6s_mext1++; + IP6_STATINC(IP6_STAT_MEXT1); } else { -#define M2MMAX __arraycount(ip6stat.ip6s_m2m) +#define M2MMAX 32 if (m->m_next) { if (m->m_flags & M_LOOP) { - ip6stat.ip6s_m2m[lo0ifp->if_index]++; /* XXX */ - } else if (m->m_pkthdr.rcvif->if_index < M2MMAX) - ip6stat.ip6s_m2m[m->m_pkthdr.rcvif->if_index]++; - else - ip6stat.ip6s_m2m[0]++; + /*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 + IP6_STATINC(IP6_STAT_M2M); } else - ip6stat.ip6s_m1++; + IP6_STATINC(IP6_STAT_M1); #undef M2MMAX } in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_receive); - ip6stat.ip6s_total++; + IP6_STATINC(IP6_STAT_TOTAL); /* * If the IPv6 header is not aligned, slurp it up into a new @@ -307,14 +315,14 @@ ip6_input(struct mbuf *m) if ((m = m_copyup(m, sizeof(struct ip6_hdr), (max_linkhdr + 3) & ~3)) == NULL) { /* XXXJRT new stat, please */ - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); in6_ifstat_inc(inifp, 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) { - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); in6_ifstat_inc(inifp, ifs6_in_hdrerr); return; } @@ -323,7 +331,7 @@ ip6_input(struct mbuf *m) ip6 = mtod(m, struct ip6_hdr *); if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) { - ip6stat.ip6s_badvers++; + IP6_STATINC(IP6_STAT_BADVERS); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); goto bad; } @@ -372,7 +380,7 @@ ip6_input(struct mbuf *m) } #endif /* PFIL_HOOKS */ - ip6stat.ip6s_nxthist[ip6->ip6_nxt]++; + IP6_STATINC(IP6_STAT_NXTHIST + ip6->ip6_nxt); #ifdef ALTQ if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) { @@ -389,7 +397,7 @@ ip6_input(struct mbuf *m) /* * XXX: "badscope" is not very suitable for a multicast source. */ - ip6stat.ip6s_badscope++; + IP6_STATINC(IP6_STAT_BADSCOPE); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; } @@ -407,7 +415,7 @@ ip6_input(struct mbuf *m) */ if (IN6_IS_ADDR_V4MAPPED(&ip6->ip6_src) || IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst)) { - ip6stat.ip6s_badscope++; + IP6_STATINC(IP6_STAT_BADSCOPE); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; } @@ -421,7 +429,7 @@ ip6_input(struct mbuf *m) */ if (IN6_IS_ADDR_V4COMPAT(&ip6->ip6_src) || IN6_IS_ADDR_V4COMPAT(&ip6->ip6_dst)) { - ip6stat.ip6s_badscope++; + IP6_STATINC(IP6_STAT_BADSCOPE); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; } @@ -442,12 +450,12 @@ ip6_input(struct mbuf *m) goto bad; ip6 = mtod(m, struct ip6_hdr *); if (in6_clearscope(&ip6->ip6_src) || in6_clearscope(&ip6->ip6_dst)) { - ip6stat.ip6s_badscope++; /* XXX */ + 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)) { - ip6stat.ip6s_badscope++; + IP6_STATINC(IP6_STAT_BADSCOPE); goto bad; } @@ -466,8 +474,10 @@ ip6_input(struct mbuf *m) if (in6m) ours = 1; else if (!ip6_mrouter) { - ip6stat.ip6s_notmember++; - ip6stat.ip6s_cantforward++; + uint64_t *ip6s = IP6_STAT_GETREF(); + ip6s[IP6_STAT_NOTMEMBER]++; + ip6s[IP6_STAT_CANTFORWARD]++; + IP6_STAT_PUTREF(); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); goto bad; } @@ -475,34 +485,18 @@ ip6_input(struct mbuf *m) goto hbhcheck; } - cdst = satocsin6(rtcache_getdst(&ip6_forward_rt)); + sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); + /* * Unicast check */ - if (cdst == NULL) - ; - else if (!IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &cdst->sin6_addr)) - rtcache_free(&ip6_forward_rt); + rt = rtcache_lookup2(&ip6_forward_rt, &u.dst, 1, &hit); + if (hit) + IP6_STATINC(IP6_STAT_FORWARD_CACHEHIT); else - rtcache_check(&ip6_forward_rt); - if (ip6_forward_rt.ro_rt != NULL) { - /* XXX Revalidated route is accounted wrongly. */ - ip6stat.ip6s_forward_cachehit++; - } else { - union { - struct sockaddr dst; - struct sockaddr_in6 dst6; - } u; - - ip6stat.ip6s_forward_cachemiss++; + IP6_STATINC(IP6_STAT_FORWARD_CACHEMISS); - sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); - rtcache_setdst(&ip6_forward_rt, &u.dst); - - rtcache_init(&ip6_forward_rt); - } - -#define rt6_key(r) ((struct sockaddr_in6 *)((r)->rt_nodes->rn_key)) +#define rt6_getkey(__rt) satocsin6(rt_getkey(__rt)) /* * Accept the packet if the forwarding interface to the destination @@ -513,22 +507,19 @@ ip6_input(struct mbuf *m) * But we think it's even useful in some situations, e.g. when using * a special daemon which wants to intercept the packet. */ - if (ip6_forward_rt.ro_rt != NULL && - (ip6_forward_rt.ro_rt->rt_flags & - (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && - !(ip6_forward_rt.ro_rt->rt_flags & RTF_CLONED) && + if (rt != NULL && + (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST && + !(rt->rt_flags & RTF_CLONED) && #if 0 /* * The check below is redundant since the comparison of * the destination and the key of the rtentry has * already done through looking up the routing table. */ - IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, - &rt6_key(ip6_forward_rt.ro_rt)->sin6_addr) && + IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &rt6_getkey(rt)->sin6_addr) && #endif - ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_LOOP) { - struct in6_ifaddr *ia6 = - (struct in6_ifaddr *)ip6_forward_rt.ro_rt->rt_ifa; + rt->rt_ifp->if_type == IFT_LOOP) { + struct in6_ifaddr *ia6 = (struct in6_ifaddr *)rt->rt_ifa; if (ia6->ia6_flags & IN6_IFF_ANYCAST) m->m_flags |= M_ANYCAST6; /* @@ -556,12 +547,11 @@ ip6_input(struct mbuf *m) */ #if defined(NFAITH) && 0 < NFAITH if (ip6_keepfaith) { - if (ip6_forward_rt.ro_rt != NULL && - ip6_forward_rt.ro_rt->rt_ifp != NULL && - ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) { + if (rt != NULL && rt->rt_ifp != NULL && + rt->rt_ifp->if_type == IFT_FAITH) { /* XXX do we need more sanity checks? */ ours = 1; - deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /* faith */ + deliverifp = rt->rt_ifp; /* faith */ goto hbhcheck; } } @@ -575,7 +565,7 @@ ip6_input(struct mbuf *m) * working right. */ struct ifaddr *ifa; - TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) { + IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) { if (ifa->ifa_addr == NULL) continue; /* just for safety */ if (ifa->ifa_addr->sa_family != AF_INET6) @@ -594,7 +584,7 @@ ip6_input(struct mbuf *m) * and we're not a router. */ if (!ip6_forwarding) { - ip6stat.ip6s_cantforward++; + IP6_STATINC(IP6_STAT_CANTFORWARD); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); goto bad; } @@ -606,18 +596,16 @@ ip6_input(struct mbuf *m) * as our interface address (e.g. multicast addresses, addresses * within FAITH prefixes and such). */ - if (deliverifp && !ip6_getdstifaddr(m)) { + if (deliverifp && ip6_getdstifaddr(m) == NULL) { struct in6_ifaddr *ia6; ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst); - if (ia6) { - if (!ip6_setdstifaddr(m, ia6)) { - /* - * XXX maybe we should drop the packet here, - * as we could not provide enough information - * to the upper layers. - */ - } + if (ia6 != NULL && ip6_setdstifaddr(m, ia6) == NULL) { + /* + * XXX maybe we should drop the packet here, + * as we could not provide enough information + * to the upper layers. + */ } } @@ -651,7 +639,7 @@ ip6_input(struct mbuf *m) * contained, ip6_hopopts_input() must set a valid * (non-zero) payload length to the variable plen. */ - ip6stat.ip6s_badoptions++; + 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); icmp6_error(m, ICMP6_PARAM_PROB, @@ -662,7 +650,7 @@ ip6_input(struct mbuf *m) IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, sizeof(struct ip6_hdr), sizeof(struct ip6_hbh)); if (hbh == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return; } KASSERT(IP6_HDR_ALIGNED_P(hbh)); @@ -684,7 +672,7 @@ ip6_input(struct mbuf *m) * Drop packet if shorter than we expect. */ if (m->m_pkthdr.len - sizeof(struct ip6_hdr) < plen) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated); goto bad; } @@ -709,7 +697,7 @@ ip6_input(struct mbuf *m) * must be discarded, else it may be accepted below. */ if (ip6_mrouter && ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) { - ip6stat.ip6s_cantforward++; + IP6_STATINC(IP6_STAT_CANTFORWARD); m_freem(m); return; } @@ -735,7 +723,7 @@ ip6_input(struct mbuf *m) */ if (IN6_IS_ADDR_V4MAPPED(&ip6->ip6_src) || IN6_IS_ADDR_V4MAPPED(&ip6->ip6_dst)) { - ip6stat.ip6s_badscope++; + IP6_STATINC(IP6_STAT_BADSCOPE); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_addrerr); goto bad; } @@ -751,13 +739,15 @@ ip6_input(struct mbuf *m) ia6->ia_ifa.ifa_data.ifad_inbytes += m->m_pkthdr.len; } #endif - ip6stat.ip6s_delivered++; + IP6_STATINC(IP6_STAT_DELIVERED); in6_ifstat_inc(deliverifp, ifs6_in_deliver); nest = 0; + rh_present = 0; while (nxt != IPPROTO_DONE) { if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) { - ip6stat.ip6s_toomanyhdr++; + IP6_STATINC(IP6_STAT_TOOMANYHDR); + in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); goto bad; } @@ -766,11 +756,20 @@ ip6_input(struct mbuf *m) * more sanity checks in header chain processing. */ if (m->m_pkthdr.len < off) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated); goto bad; } + if (nxt == IPPROTO_ROUTING) { + if (rh_present++) { + in6_ifstat_inc(m->m_pkthdr.rcvif, + ifs6_in_hdrerr); + IP6_STATINC(IP6_STAT_BADOPTIONS); + goto bad; + } + } + #ifdef IPSEC /* * enforce IPsec policy checking if we are seeing last header. @@ -815,7 +814,6 @@ ip6_input(struct mbuf *m) /* XXX error stat??? */ error = EINVAL; DPRINTF(("ip6_input: no SP, packet discarded\n"));/*XXX*/ - goto bad; } splx(s); if (error) @@ -835,27 +833,30 @@ ip6_input(struct mbuf *m) * set/grab in6_ifaddr correspond to IPv6 destination address. */ static struct m_tag * -ip6_setdstifaddr(m, ia6) - struct mbuf *m; - struct in6_ifaddr *ia6; +ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia) { struct m_tag *mtag; mtag = ip6_addaux(m); - if (mtag) - ((struct ip6aux *)(mtag + 1))->ip6a_dstia6 = ia6; + if (mtag != NULL) { + struct ip6aux *ip6a; + + ip6a = (struct ip6aux *)(mtag + 1); + in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id); + ip6a->ip6a_src = ia->ia_addr.sin6_addr; + ip6a->ip6a_flags = ia->ia6_flags; + } return mtag; /* NULL if failed to set */ } -struct in6_ifaddr * -ip6_getdstifaddr(m) - struct mbuf *m; +const struct ip6aux * +ip6_getdstifaddr(struct mbuf *m) { struct m_tag *mtag; mtag = ip6_findaux(m); - if (mtag) - return ((struct ip6aux *)(mtag + 1))->ip6a_dstia6; + if (mtag != NULL) + return (struct ip6aux *)(mtag + 1); else return NULL; } @@ -863,13 +864,12 @@ ip6_getdstifaddr(m) /* * Hop-by-Hop options header processing. If a valid jumbo payload option is * included, the real payload length will be stored in plenp. + * + * rtalertp - XXX: should be stored more smart way */ static int -ip6_hopopts_input(plenp, rtalertp, mp, offp) - u_int32_t *plenp; - u_int32_t *rtalertp; /* XXX: should be stored more smart way */ - struct mbuf **mp; - int *offp; +ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp, + struct mbuf **mp, int *offp) { struct mbuf *m = *mp; int off = *offp, hbhlen; @@ -879,14 +879,14 @@ ip6_hopopts_input(plenp, rtalertp, mp, o IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, sizeof(struct ip6_hdr), sizeof(struct ip6_hbh)); if (hbh == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return -1; } hbhlen = (hbh->ip6h_len + 1) << 3; IP6_EXTHDR_GET(hbh, struct ip6_hbh *, m, sizeof(struct ip6_hdr), hbhlen); if (hbh == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return -1; } KASSERT(IP6_HDR_ALIGNED_P(hbh)); @@ -913,12 +913,8 @@ ip6_hopopts_input(plenp, rtalertp, mp, o * opthead + hbhlen is located in continuous memory region. */ int -ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp) - struct mbuf *m; - u_int8_t *opthead; - int hbhlen; - u_int32_t *rtalertp; - u_int32_t *plenp; +ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen, + u_int32_t *rtalertp, u_int32_t *plenp) { struct ip6_hdr *ip6; int optlen = 0; @@ -934,7 +930,7 @@ ip6_process_hopopts(m, opthead, hbhlen, break; case IP6OPT_PADN: if (hbhlen < IP6OPT_MINLEN) { - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); goto bad; } optlen = *(opt + 1) + 2; @@ -942,7 +938,7 @@ ip6_process_hopopts(m, opthead, hbhlen, case IP6OPT_RTALERT: /* XXX may need check for alignment */ if (hbhlen < IP6OPT_RTALERT_LEN) { - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); goto bad; } if (*(opt + 1) != IP6OPT_RTALERT_LEN - 2) { @@ -959,7 +955,7 @@ ip6_process_hopopts(m, opthead, hbhlen, case IP6OPT_JUMBO: /* XXX may need check for alignment */ if (hbhlen < IP6OPT_JUMBO_LEN) { - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); goto bad; } if (*(opt + 1) != IP6OPT_JUMBO_LEN - 2) { @@ -977,7 +973,7 @@ ip6_process_hopopts(m, opthead, hbhlen, */ ip6 = mtod(m, struct ip6_hdr *); if (ip6->ip6_plen) { - ip6stat.ip6s_badoptions++; + IP6_STATINC(IP6_STAT_BADOPTIONS); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, erroff + opt - opthead); @@ -1001,7 +997,7 @@ ip6_process_hopopts(m, opthead, hbhlen, * there's no explicit mention in specification. */ if (*plenp != 0) { - ip6stat.ip6s_badoptions++; + IP6_STATINC(IP6_STAT_BADOPTIONS); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, erroff + opt + 2 - opthead); @@ -1013,7 +1009,7 @@ ip6_process_hopopts(m, opthead, hbhlen, * jumbo payload length must be larger than 65535. */ if (jumboplen <= IPV6_MAXPACKET) { - ip6stat.ip6s_badoptions++; + IP6_STATINC(IP6_STAT_BADOPTIONS); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER, erroff + opt + 2 - opthead); @@ -1024,7 +1020,7 @@ ip6_process_hopopts(m, opthead, hbhlen, break; default: /* unknown option */ if (hbhlen < IP6OPT_MINLEN) { - ip6stat.ip6s_toosmall++; + IP6_STATINC(IP6_STAT_TOOSMALL); goto bad; } optlen = ip6_unknown_opt(opt, m, @@ -1050,10 +1046,7 @@ ip6_process_hopopts(m, opthead, hbhlen, * is not continuous in order to return an ICMPv6 error. */ int -ip6_unknown_opt(optp, m, off) - u_int8_t *optp; - struct mbuf *m; - int off; +ip6_unknown_opt(u_int8_t *optp, struct mbuf *m, int off) { struct ip6_hdr *ip6; @@ -1064,11 +1057,11 @@ ip6_unknown_opt(optp, m, off) m_freem(m); return (-1); case IP6OPT_TYPE_FORCEICMP: /* send ICMP even if multicasted */ - ip6stat.ip6s_badoptions++; + IP6_STATINC(IP6_STAT_BADOPTIONS); icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_OPTION, off); return (-1); case IP6OPT_TYPE_ICMP: /* send ICMP if not multicasted */ - ip6stat.ip6s_badoptions++; + IP6_STATINC(IP6_STAT_BADOPTIONS); ip6 = mtod(m, struct ip6_hdr *); if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) || (m->m_flags & (M_BCAST|M_MCAST))) @@ -1095,11 +1088,8 @@ ip6_unknown_opt(optp, m, off) * you are using IP6_EXTHDR_CHECK() not m_pulldown()) */ void -ip6_savecontrol(in6p, mp, ip6, m) - struct in6pcb *in6p; - struct mbuf **mp; - struct ip6_hdr *ip6; - struct mbuf *m; +ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp, + struct ip6_hdr *ip6, struct mbuf *m) { #ifdef RFC2292 #define IS2292(x, y) ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y)) @@ -1186,14 +1176,14 @@ ip6_savecontrol(in6p, mp, ip6, m) ext = ip6_pullexthdr(m, sizeof(struct ip6_hdr), xip6->ip6_nxt); if (ext == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return; } hbh = mtod(ext, struct ip6_hbh *); hbhlen = (hbh->ip6h_len + 1) << 3; if (hbhlen != ext->m_len) { m_freem(ext); - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return; } @@ -1245,7 +1235,7 @@ ip6_savecontrol(in6p, mp, ip6, m) ext = ip6_pullexthdr(m, off, nxt); if (ext == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return; } ip6e = mtod(ext, struct ip6_ext *); @@ -1255,7 +1245,7 @@ ip6_savecontrol(in6p, mp, ip6, m) elen = (ip6e->ip6e_len + 1) << 3; if (elen != ext->m_len) { m_freem(ext); - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return; } KASSERT(IP6_HDR_ALIGNED_P(ip6e)); @@ -1356,10 +1346,7 @@ ip6_notify_pmtu(struct in6pcb *in6p, con * contains the result, or NULL on error. */ static struct mbuf * -ip6_pullexthdr(m, off, nxt) - struct mbuf *m; - size_t off; - int nxt; +ip6_pullexthdr(struct mbuf *m, size_t off, int nxt) { struct ip6_ext ip6e; size_t elen; @@ -1418,9 +1405,7 @@ ip6_pullexthdr(m, off, nxt) * we develop `neater' mechanism to process extension headers. */ u_int8_t * -ip6_get_prevhdr(m, off) - struct mbuf *m; - int off; +ip6_get_prevhdr(struct mbuf *m, int off) { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); @@ -1459,11 +1444,7 @@ ip6_get_prevhdr(m, off) * get next header offset. m will be retained. */ int -ip6_nexthdr(m, off, proto, nxtp) - struct mbuf *m; - int off; - int proto; - int *nxtp; +ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp) { struct ip6_hdr ip6; struct ip6_ext ip6e; @@ -1542,11 +1523,7 @@ ip6_nexthdr(m, off, proto, nxtp) * get offset for the last header in the chain. m will be kept untainted. */ int -ip6_lasthdr(m, off, proto, nxtp) - struct mbuf *m; - int off; - int proto; - int *nxtp; +ip6_lasthdr(struct mbuf *m, int off, int proto, int *nxtp) { int newoff; int nxt; @@ -1570,8 +1547,7 @@ ip6_lasthdr(m, off, proto, nxtp) } struct m_tag * -ip6_addaux(m) - struct mbuf *m; +ip6_addaux(struct mbuf *m) { struct m_tag *mtag; @@ -1588,8 +1564,7 @@ ip6_addaux(m) } struct m_tag * -ip6_findaux(m) - struct mbuf *m; +ip6_findaux(struct mbuf *m) { struct m_tag *mtag; @@ -1598,8 +1573,7 @@ ip6_findaux(m) } void -ip6_delaux(m) - struct mbuf *m; +ip6_delaux(struct mbuf *m) { struct m_tag *mtag; @@ -1659,31 +1633,6 @@ sysctl_net_inet6_ip6_hashsize(SYSCTLFN_A } #endif /* GATEWAY */ -static int -sysctl_net_inet6_ip6_rht0(SYSCTLFN_ARGS) -{ - int error, tmp; - struct sysctlnode node; - - node = *rnode; - tmp = ip6_rht0; - node.sysctl_data = &tmp; - error = sysctl_lookup(SYSCTLFN_CALL(&node)); - if (error || newp == NULL) - return error; - - switch (tmp) { - case -1: /* disable processing */ - case 0: /* disable for host, enable for router */ - case 1: /* enable for all */ - break; - default: - return EINVAL; - } - ip6_rht0 = tmp; - return 0; -} - /* * System control for IP6 */ @@ -1697,6 +1646,38 @@ u_char inet6ctlerrmap[PRC_NCMDS] = { ENOPROTOOPT }; +static void +ip6stat_convert_to_user_cb(void *v1, void *v2, struct cpu_info *ci) +{ + uint64_t *ip6sc = v1; + uint64_t *ip6s = v2; + u_int i; + + for (i = 0; i < IP6_NSTATS; i++) + ip6s[i] += ip6sc[i]; +} + +static void +ip6stat_convert_to_user(uint64_t *ip6s) +{ + + memset(ip6s, 0, sizeof(uint64_t) * IP6_NSTATS); + percpu_foreach(ip6stat_percpu, ip6stat_convert_to_user_cb, ip6s); +} + +static int +sysctl_net_inet6_ip6_stats(SYSCTLFN_ARGS) +{ + struct sysctlnode node; + uint64_t ip6s[IP6_NSTATS]; + + ip6stat_convert_to_user(ip6s); + node = *rnode; + node.sysctl_data = ip6s; + node.sysctl_size = sizeof(ip6s); + return (sysctl_lookup(SYSCTLFN_CALL(&node))); +} + SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, "sysctl net.inet6.ip6 subtree setup") { #ifdef RFC2292 @@ -1950,7 +1931,7 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, CTLFLAG_PERMANENT, CTLTYPE_STRUCT, "stats", SYSCTL_DESCR("IPv6 statistics"), - NULL, 0, &ip6stat, sizeof(ip6stat), + sysctl_net_inet6_ip6_stats, 0, NULL, 0, CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_STATS, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, @@ -1983,11 +1964,12 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, CTL_NET, PF_INET6, IPPROTO_IPV6, CTL_CREATE, CTL_EOL); #endif - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "rht0", - SYSCTL_DESCR("Processing of routing header type 0 (IPv6)"), - sysctl_net_inet6_ip6_rht0, 0, &ip6_rht0, 0, - CTL_NET, PF_INET6, IPPROTO_IPV6, - CTL_CREATE, CTL_EOL); +} + +void +ip6_statinc(u_int stat) +{ + + KASSERT(stat < IP6_NSTATS); + IP6_STATINC(stat); }