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/netinet/udp_usrreq.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.98 retrieving revision 1.103.2.5 diff -u -p -r1.98 -r1.103.2.5 --- src/sys/netinet/udp_usrreq.c 2003/02/26 06:31:17 1.98 +++ src/sys/netinet/udp_usrreq.c 2004/12/18 09:33:06 1.103.2.5 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.98 2003/02/26 06:31:17 matt Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.103.2.5 2004/12/18 09:33:06 skrll Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -41,11 +41,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -65,12 +61,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.98 2003/02/26 06:31:17 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.103.2.5 2004/12/18 09:33:06 skrll Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" #include "opt_inet_csum.h" #include "opt_ipkdb.h" +#include "opt_mbuftrace.h" #include #include @@ -106,12 +103,10 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #endif -#ifdef PULLDOWN_TEST #ifndef INET6 /* always need ip6.h for IP6_EXTHDR_GET */ #include #endif -#endif #include "faith.h" #if defined(NFAITH) && NFAITH > 0 @@ -120,6 +115,14 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include +#ifdef FAST_IPSEC +#include +#include /* XXX ipsecstat namespace */ +#ifdef INET6 +#include +#endif +#endif /* FAST_IPSEC*/ + #ifdef IPSEC #include #include @@ -138,24 +141,25 @@ int udpcksum = 1; #else int udpcksum = 0; /* XXX */ #endif +int udp_do_loopback_cksum = 1; struct inpcbtable udbtable; struct udpstat udpstat; #ifdef INET -static void udp4_sendup __P((struct mbuf *, int, struct sockaddr *, - struct socket *)); -static int udp4_realinput __P((struct sockaddr_in *, struct sockaddr_in *, - struct mbuf *, int)); +static void udp4_sendup (struct mbuf *, int, struct sockaddr *, + struct socket *); +static int udp4_realinput (struct sockaddr_in *, struct sockaddr_in *, + struct mbuf *, int); #endif #ifdef INET6 -static void udp6_sendup __P((struct mbuf *, int, struct sockaddr *, - struct socket *)); -static int udp6_realinput __P((int, struct sockaddr_in6 *, - struct sockaddr_in6 *, struct mbuf *, int)); +static void udp6_sendup (struct mbuf *, int, struct sockaddr *, + struct socket *); +static int udp6_realinput (int, struct sockaddr_in6 *, + struct sockaddr_in6 *, struct mbuf *, int); #endif #ifdef INET -static void udp_notify __P((struct inpcb *, int)); +static void udp_notify (struct inpcb *, int); #endif #ifndef UDBHASHSIZE @@ -183,6 +187,11 @@ struct evcnt udp_swcsum = EVCNT_INITIALI #define UDP_CSUM_COUNTER_INCR(ev) (ev)->ev_count++ +EVCNT_ATTACH_STATIC(udp_hwcsum_bad); +EVCNT_ATTACH_STATIC(udp_hwcsum_ok); +EVCNT_ATTACH_STATIC(udp_hwcsum_data); +EVCNT_ATTACH_STATIC(udp_swcsum); + #else #define UDP_CSUM_COUNTER_INCR(ev) /* nothing */ @@ -190,19 +199,10 @@ struct evcnt udp_swcsum = EVCNT_INITIALI #endif /* UDP_CSUM_COUNTERS */ void -udp_init() +udp_init(void) { -#ifdef INET in_pcbinit(&udbtable, udbhashsize, udbhashsize); -#endif - -#ifdef UDP_CSUM_COUNTERS - evcnt_attach_static(&udp_hwcsum_bad); - evcnt_attach_static(&udp_hwcsum_ok); - evcnt_attach_static(&udp_hwcsum_data); - evcnt_attach_static(&udp_swcsum); -#endif /* UDP_CSUM_COUNTERS */ MOWNER_ATTACH(&udp_tx_mowner); MOWNER_ATTACH(&udp_rx_mowner); @@ -211,13 +211,7 @@ udp_init() #ifdef INET void -#if __STDC__ udp_input(struct mbuf *m, ...) -#else -udp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif { va_list ap; struct sockaddr_in src, dst; @@ -236,44 +230,15 @@ udp_input(m, va_alist) MCLAIM(m, &udp_rx_mowner); udpstat.udps_ipackets++; -#ifndef PULLDOWN_TEST - /* - * Strip IP options, if any; should skip this, - * make available to user, and use on returned packets, - * but we don't yet have a way to check the checksum - * with options still present. - */ - if (iphlen > sizeof (struct ip)) { - ip_stripoptions(m, (struct mbuf *)0); - iphlen = sizeof(struct ip); - } -#else - /* - * we may enable the above code if we save and pass IPv4 options - * to the userland. - */ -#endif - /* * Get IP and UDP header together in first mbuf. */ ip = mtod(m, struct ip *); -#ifndef PULLDOWN_TEST - if (m->m_len < iphlen + sizeof(struct udphdr)) { - if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) { - udpstat.udps_hdrops++; - return; - } - ip = mtod(m, struct ip *); - } - uh = (struct udphdr *)((caddr_t)ip + iphlen); -#else IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr)); if (uh == NULL) { udpstat.udps_hdrops++; return; } -#endif KASSERT(UDP_HDR_ALIGNED_P(uh)); /* destination port of 0 is illegal, based on RFC768. */ @@ -299,17 +264,23 @@ udp_input(m, va_alist) */ if (uh->uh_sum) { switch (m->m_pkthdr.csum_flags & - ((m->m_pkthdr.rcvif->if_csum_flags_rx & M_CSUM_UDPv4) | - M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { + ((m->m_pkthdr.rcvif->if_csum_flags_rx & M_CSUM_UDPv4) | + M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { case M_CSUM_UDPv4|M_CSUM_TCP_UDP_BAD: UDP_CSUM_COUNTER_INCR(&udp_hwcsum_bad); goto badcsum; - case M_CSUM_UDPv4|M_CSUM_DATA: + case M_CSUM_UDPv4|M_CSUM_DATA: { + u_int32_t hw_csum = m->m_pkthdr.csum_data; UDP_CSUM_COUNTER_INCR(&udp_hwcsum_data); - if ((m->m_pkthdr.csum_data ^ 0xffff) != 0) + if (m->m_pkthdr.csum_flags & M_CSUM_NO_PSEUDOHDR) + hw_csum = in_cksum_phdr(ip->ip_src.s_addr, + ip->ip_dst.s_addr, + htons(hw_csum + len + IPPROTO_UDP)); + if ((hw_csum ^ 0xffff) != 0) goto badcsum; break; + } case M_CSUM_UDPv4: /* Checksum was okay. */ @@ -317,10 +288,17 @@ udp_input(m, va_alist) break; default: - /* Need to compute it ourselves. */ - UDP_CSUM_COUNTER_INCR(&udp_swcsum); - if (in4_cksum(m, IPPROTO_UDP, iphlen, len) != 0) - goto badcsum; + /* + * Need to compute it ourselves. Maybe skip checksum + * on loopback interfaces. + */ + if (__predict_true(!(m->m_pkthdr.rcvif->if_flags & + IFF_LOOPBACK) || + udp_do_loopback_cksum)) { + UDP_CSUM_COUNTER_INCR(&udp_swcsum); + if (in4_cksum(m, IPPROTO_UDP, iphlen, len) != 0) + goto badcsum; + } break; } } @@ -395,9 +373,7 @@ badcsum: #ifdef INET6 int -udp6_input(mp, offp, proto) - struct mbuf **mp; - int *offp, proto; +udp6_input(struct mbuf **mp, int *offp, int proto) { struct mbuf *m = *mp; int off = *offp; @@ -406,9 +382,6 @@ udp6_input(mp, offp, proto) struct udphdr *uh; u_int32_t plen, ulen; -#ifndef PULLDOWN_TEST - IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE); -#endif ip6 = mtod(m, struct ip6_hdr *); #if defined(NFAITH) && 0 < NFAITH @@ -423,15 +396,11 @@ udp6_input(mp, offp, proto) /* check for jumbogram is done in ip6_input. we can trust pkthdr.len */ plen = m->m_pkthdr.len - off; -#ifndef PULLDOWN_TEST - uh = (struct udphdr *)((caddr_t)ip6 + off); -#else IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr)); if (uh == NULL) { ip6stat.ip6s_tooshort++; return IPPROTO_DONE; } -#endif KASSERT(UDP_HDR_ALIGNED_P(uh)); ulen = ntohs((u_short)uh->uh_ulen); /* @@ -458,13 +427,20 @@ udp6_input(mp, offp, proto) } /* - * Checksum extended UDP header and data. + * Checksum extended UDP header and data. Maybe skip checksum + * on loopback interfaces. */ - if (uh->uh_sum == 0) - udp6stat.udp6s_nosum++; - else if (in6_cksum(m, IPPROTO_UDP, off, ulen) != 0) { - udp6stat.udp6s_badsum++; - goto bad; + if (__predict_true(!(m->m_pkthdr.rcvif->if_flags & + IFF_LOOPBACK) || + udp_do_loopback_cksum)) { + if (uh->uh_sum == 0) { + udp6stat.udp6s_nosum++; + goto bad; + } + if (in6_cksum(m, IPPROTO_UDP, off, ulen) != 0) { + udp6stat.udp6s_badsum++; + goto bad; + } } /* @@ -503,11 +479,8 @@ bad: #ifdef INET static void -udp4_sendup(m, off, src, so) - struct mbuf *m; - int off; /* offset of data portion */ - struct sockaddr *src; - struct socket *so; +udp4_sendup(struct mbuf *m, int off /* offset of data portion */, + struct sockaddr *src, struct socket *so) { struct mbuf *opts = NULL; struct mbuf *n; @@ -527,10 +500,13 @@ udp4_sendup(m, off, src, so) return; } -#ifdef IPSEC +#if defined(IPSEC) || defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec4_in_reject_so(m, so)) { ipsecstat.in_polvio++; + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) + icmp_error(n, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT, + 0, 0); return; } #endif /*IPSEC*/ @@ -548,6 +524,7 @@ udp4_sendup(m, off, src, so) m_freem(n); if (opts) m_freem(opts); + so->so_rcv.sb_overflowed++; udpstat.udps_fullsock++; } else sorwakeup(so); @@ -557,11 +534,8 @@ udp4_sendup(m, off, src, so) #ifdef INET6 static void -udp6_sendup(m, off, src, so) - struct mbuf *m; - int off; /* offset of data portion */ - struct sockaddr *src; - struct socket *so; +udp6_sendup(struct mbuf *m, int off /* offset of data portion */, + struct sockaddr *src, struct socket *so) { struct mbuf *opts = NULL; struct mbuf *n; @@ -573,10 +547,13 @@ udp6_sendup(m, off, src, so) return; in6p = sotoin6pcb(so); -#ifdef IPSEC +#if defined(IPSEC) || defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec6_in_reject_so(m, so)) { ipsec6stat.in_polvio++; + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) + icmp6_error(n, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_ADMIN, 0); return; } #endif /*IPSEC*/ @@ -593,6 +570,7 @@ udp6_sendup(m, off, src, so) m_freem(n); if (opts) m_freem(opts); + so->so_rcv.sb_overflowed++; udp6stat.udp6s_fullsock++; } else sorwakeup(so); @@ -602,15 +580,13 @@ udp6_sendup(m, off, src, so) #ifdef INET static int -udp4_realinput(src, dst, m, off) - struct sockaddr_in *src; - struct sockaddr_in *dst; - struct mbuf *m; - int off; /* offset of udphdr */ +udp4_realinput(struct sockaddr_in *src, struct sockaddr_in *dst, + struct mbuf *m, int off /* offset of udphdr */) { u_int16_t *sport, *dport; int rcvcnt; struct in_addr *src4, *dst4; + struct inpcb_hdr *inph; struct inpcb *inp; rcvcnt = 0; @@ -649,7 +625,11 @@ udp4_realinput(src, dst, m, off) /* * Locate pcb(s) for datagram. */ - CIRCLEQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue) { + CIRCLEQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { + inp = (struct inpcb *)inph; + if (inp->inp_af != AF_INET) + continue; + if (inp->inp_lport != *dport) continue; if (!in_nullhost(inp->inp_laddr)) { @@ -701,17 +681,14 @@ bad: #ifdef INET6 static int -udp6_realinput(af, src, dst, m, off) - int af; /* af on packet */ - struct sockaddr_in6 *src; - struct sockaddr_in6 *dst; - struct mbuf *m; - int off; /* offset of udphdr */ +udp6_realinput(int af, struct sockaddr_in6 *src, struct sockaddr_in6 *dst, + struct mbuf *m, int off) { u_int16_t sport, dport; int rcvcnt; struct in6_addr src6, dst6; const struct in_addr *dst4; + struct inpcb_hdr *inph; struct in6pcb *in6p; rcvcnt = 0; @@ -753,8 +730,11 @@ udp6_realinput(af, src, dst, m, off) /* * Locate pcb(s) for datagram. */ - for (in6p = udb6.in6p_next; in6p != &udb6; - in6p = in6p->in6p_next) { + CIRCLEQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { + in6p = (struct in6pcb *)inph; + if (in6p->in6p_af != AF_INET6) + continue; + if (in6p->in6p_lport != dport) continue; if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { @@ -795,11 +775,11 @@ udp6_realinput(af, src, dst, m, off) /* * Locate pcb for datagram. */ - in6p = in6_pcblookup_connect(&udb6, &src6, sport, + in6p = in6_pcblookup_connect(&udbtable, &src6, sport, &dst6, dport, 0); if (in6p == 0) { ++udpstat.udps_pcbhashmiss; - in6p = in6_pcblookup_bind(&udb6, &dst6, dport, 0); + in6p = in6_pcblookup_bind(&udbtable, &dst6, dport, 0); if (in6p == 0) return rcvcnt; } @@ -819,25 +799,19 @@ bad: * just wake up so that he can collect error status. */ static void -udp_notify(inp, errno) - struct inpcb *inp; - int errno; +udp_notify(struct inpcb *inp, int errno) { - inp->inp_socket->so_error = errno; sorwakeup(inp->inp_socket); sowwakeup(inp->inp_socket); } void * -udp_ctlinput(cmd, sa, v) - int cmd; - struct sockaddr *sa; - void *v; +udp_ctlinput(int cmd, struct sockaddr *sa, void *v) { struct ip *ip = v; struct udphdr *uh; - void (*notify) __P((struct inpcb *, int)) = udp_notify; + void (*notify)(struct inpcb *, int) = udp_notify; int errno; if (sa->sa_family != AF_INET @@ -865,16 +839,11 @@ udp_ctlinput(cmd, sa, v) } int -#if __STDC__ udp_output(struct mbuf *m, ...) -#else -udp_output(m, va_alist) - struct mbuf *m; - va_dcl -#endif { struct inpcb *inp; struct udpiphdr *ui; + struct route *ro; int len = m->m_pkthdr.len; int error = 0; va_list ap; @@ -915,6 +884,8 @@ udp_output(m, va_alist) ui->ui_dport = inp->inp_fport; ui->ui_ulen = htons((u_int16_t)len + sizeof(struct udphdr)); + ro = &inp->inp_route; + /* * Set up checksum and output datagram. */ @@ -922,11 +893,18 @@ udp_output(m, va_alist) /* * XXX Cache pseudo-header checksum part for * XXX "connected" UDP sockets. + * Maybe skip checksums on loopback interfaces. */ ui->ui_sum = in_cksum_phdr(ui->ui_src.s_addr, ui->ui_dst.s_addr, htons((u_int16_t)len + sizeof(struct udphdr) + IPPROTO_UDP)); - m->m_pkthdr.csum_flags = M_CSUM_UDPv4; + if (__predict_true(ro->ro_rt == NULL || + !(ro->ro_rt->rt_ifp->if_flags & + IFF_LOOPBACK) || + udp_do_loopback_cksum)) + m->m_pkthdr.csum_flags = M_CSUM_UDPv4; + else + m->m_pkthdr.csum_flags = 0; m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); } else ui->ui_sum = 0; @@ -935,16 +913,9 @@ udp_output(m, va_alist) ((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos; /* XXX */ udpstat.udps_opackets++; -#ifdef IPSEC - if (ipsec_setsocket(m, inp->inp_socket) != 0) { - error = ENOBUFS; - goto release; - } -#endif /*IPSEC*/ - - return (ip_output(m, inp->inp_options, &inp->inp_route, + return (ip_output(m, inp->inp_options, ro, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST), - inp->inp_moptions)); + inp->inp_moptions, inp->inp_socket)); release: m_freem(m); @@ -957,16 +928,15 @@ int udp_recvspace = 40 * (1024 + sizeof( /*ARGSUSED*/ int -udp_usrreq(so, req, m, nam, control, p) - struct socket *so; - int req; - struct mbuf *m, *nam, *control; - struct proc *p; +udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, + struct mbuf *control, struct lwp *l) { struct inpcb *inp; + struct proc *p; int s; int error = 0; + p = l ? l->l_proc : NULL; if (req == PRU_CONTROL) return (in_control(so, (long)m, (caddr_t)nam, (struct ifnet *)control, p)); @@ -1073,11 +1043,8 @@ udp_usrreq(so, req, m, nam, control, p) goto die; } error = in_pcbconnect(inp, nam); - if (error) { - die: - m_freem(m); - break; - } + if (error) + goto die; } else { if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; @@ -1085,11 +1052,15 @@ udp_usrreq(so, req, m, nam, control, p) } } error = udp_output(m, inp); + m = NULL; if (nam) { in_pcbdisconnect(inp); inp->inp_laddr = laddr; /* XXX */ in_pcbstate(inp, INP_BOUND); /* XXX */ } + die: + if (m) + m_freem(m); } break; @@ -1130,31 +1101,53 @@ release: /* * Sysctl for udp variables. */ -int -udp_sysctl(name, namelen, oldp, oldlenp, newp, newlen) - int *name; - u_int namelen; - void *oldp; - size_t *oldlenp; - void *newp; - size_t newlen; +SYSCTL_SETUP(sysctl_net_inet_udp_setup, "sysctl net.inet.udp subtree setup") { - /* All sysctl names at this level are terminal. */ - if (namelen != 1) - return (ENOTDIR); - - switch (name[0]) { - case UDPCTL_CHECKSUM: - return (sysctl_int(oldp, oldlenp, newp, newlen, &udpcksum)); - case UDPCTL_SENDSPACE: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &udp_sendspace)); - case UDPCTL_RECVSPACE: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &udp_recvspace)); - default: - return (ENOPROTOOPT); - } - /* NOTREACHED */ + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "net", NULL, + NULL, 0, NULL, 0, + CTL_NET, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "inet", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "udp", + SYSCTL_DESCR("UDPv4 related settings"), + NULL, 0, NULL, 0, + CTL_NET, PF_INET, IPPROTO_UDP, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "checksum", + SYSCTL_DESCR("Compute UDP checksums"), + NULL, 0, &udpcksum, 0, + CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_CHECKSUM, + CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "sendspace", + SYSCTL_DESCR("Default UDP send buffer size"), + NULL, 0, &udp_sendspace, 0, + CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_SENDSPACE, + CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "recvspace", + SYSCTL_DESCR("Default UDP receive buffer size"), + NULL, 0, &udp_recvspace, 0, + CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_RECVSPACE, + CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "do_loopback_cksum", + SYSCTL_DESCR("Perform UDP checksum on loopback"), + NULL, 0, &udp_do_loopback_cksum, 0, + CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_LOOPBACKCKSUM, + CTL_EOL); } #endif