d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r331379 as the "simple" lock changes have revealed a deeper problem

Browse Source 
and need for a rethink.

Submitted by:	Jason Eggleston <jason@eggnet.com>
Sponsored by:	Limelight Networks
This commit is contained in:
Sean Bruno 2018-03-23 18:34:38 +00:00
parent 94790180f3
commit 72bfa0bf63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=331454
3 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netinet/ip_output.c
View File

@ -1314,14 +1314,12 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
break;
case IP_PORTRANGE:
INP_RLOCK(inp);
if (inp->inp_flags & INP_HIGHPORT)
optval = IP_PORTRANGE_HIGH;
else if (inp->inp_flags & INP_LOWPORT)
optval = IP_PORTRANGE_LOW;
else
optval = 0;
INP_RUNLOCK(inp);
break;
case IP_ONESBCAST:
@ -1347,11 +1345,9 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
break;
#ifdef RSS
case IP_RSSBUCKETID:
INP_RLOCK(inp);
retval = rss_hash2bucket(inp->inp_flowid,
inp->inp_flowtype,
&rss_bucket);
INP_RUNLOCK(inp);
if (retval == 0)
optval = rss_bucket;
else

2
sys/netinet/raw_ip.c
View File

@ -639,12 +639,10 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt)
sizeof optval);
if (error)
break;
INP_WLOCK(inp);
if (optval)
inp->inp_flags |= INP_HDRINCL;
else
inp->inp_flags &= ~INP_HDRINCL;
INP_WUNLOCK(inp);
break;
case IP_FW3: /* generic ipfw v.3 functions */

30
sys/netinet6/ip6_output.c
View File

@ -1498,10 +1498,8 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt)
error = soopt_mcopyin(sopt, m); /* XXX */
if (error != 0)
break;
INP_WLOCK(in6p);
error = ip6_pcbopts(&in6p->in6p_outputopts,
m, so, sopt);
INP_WUNLOCK(in6p);
m_freem(m); /* XXX */
break;
}
@ -1637,13 +1635,11 @@ do { \
error = EINVAL;
break;
}
INP_WLOCK(in6p);
optp = &in6p->in6p_outputopts;
error = ip6_pcbopt(IPV6_HOPLIMIT,
(u_char *)&optval, sizeof(optval),
optp, (td != NULL) ? td->td_ucred :
NULL, uproto);
INP_WUNLOCK(in6p);
break;
}
@ -1694,10 +1690,8 @@ do { \
* available only prior to bind(2).
* see ipng mailing list, Jun 22 2001.
*/
INP_WLOCK(in6p);
if (in6p->inp_lport ||
!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) {
INP_WUNLOCK(in6p);
error = EINVAL;
break;
}
@ -1706,7 +1700,6 @@ do { \
in6p->inp_vflag &= ~INP_IPV4;
else
in6p->inp_vflag |= INP_IPV4;
INP_WUNLOCK(in6p);
break;
case IPV6_RECVTCLASS:
/* cannot mix with RFC2292 XXX */
@ -1756,13 +1749,11 @@ do { \
break;
{
struct ip6_pktopts **optp;
INP_WLOCK(in6p);
optp = &in6p->in6p_outputopts;
error = ip6_pcbopt(optname,
(u_char *)&optval, sizeof(optval),
optp, (td != NULL) ? td->td_ucred :
NULL, uproto);
INP_WUNLOCK(in6p);
break;
}
@ -1827,6 +1818,12 @@ do { \
int optlen;
struct ip6_pktopts **optp;
/* cannot mix with RFC2292 */
if (OPTBIT(IN6P_RFC2292)) {
error = EINVAL;
break;
}
/*
* We only ensure valsize is not too large
* here. Further validation will be done
@ -1836,21 +1833,12 @@ do { \
sizeof(optbuf_storage), 0);
if (error)
break;
INP_WLOCK(in6p);
/* cannot mix with RFC2292 */
if (OPTBIT(IN6P_RFC2292)) {
INP_WUNLOCK(in6p);
error = EINVAL;
break;
}
optlen = sopt->sopt_valsize;
optbuf = optbuf_storage;
optp = &in6p->in6p_outputopts;
error = ip6_pcbopt(optname, optbuf, optlen,
optp, (td != NULL) ? td->td_ucred : NULL,
uproto);
INP_WUNLOCK(in6p);
break;
}
#undef OPTSET
@ -2035,12 +2023,10 @@ do { \
break;
#ifdef RSS
case IPV6_RSSBUCKETID:
INP_RLOCK(in6p);
retval =
rss_hash2bucket(in6p->inp_flowid,
in6p->inp_flowtype,
&rss_bucket);
INP_RUNLOCK(in6p);
if (retval == 0)
optval = rss_bucket;
else
@ -2243,8 +2229,6 @@ ip6_pcbopts(struct ip6_pktopts **pktopt, struct mbuf *m,
int error = 0;
struct thread *td = sopt->sopt_td;
INP_WLOCK_ASSERT(sotoinpcb(so));
/* turn off any old options. */
if (opt) {
#ifdef DIAGNOSTIC
@ -3104,8 +3088,6 @@ ip6_optlen(struct inpcb *in6p)
{
int len;
INP_WLOCK_ASSERT(in6p);
if (!in6p->in6p_outputopts)
return 0;