svn commit: r351057 - in stable: 11/sys/netinet 12/sys/netinet

[John Baldwin]

Author: jhb
Date: Wed Aug 14 23:05:57 2019
New Revision: 351057
URL: https://svnweb.freebsd.org/changeset/base/351057

Log:
  MFC 346360: Push down INP_WLOCK slightly in tcp_ctloutput.
  
  The inp lock is not needed for testing the V6 flag as that flag is set
  once when the inp is created and never changes.  For non-TCP socket
  options the lock is immediately dropped after checking that flag.
  This just pushes the lock down to only be acquired for TCP socket
  options.
  
  This isn't a hot-path, more a cosmetic cleanup I noticed while reading
  the code.

Modified:
  stable/12/sys/netinet/tcp_usrreq.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/netinet/tcp_usrreq.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/netinet/tcp_usrreq.c
==============================================================================
--- stable/12/sys/netinet/tcp_usrreq.c	Wed Aug 14 22:35:11 2019	(r351056)
+++ stable/12/sys/netinet/tcp_usrreq.c	Wed Aug 14 23:05:57 2019	(r351057)
@@ -1578,11 +1578,9 @@ tcp_ctloutput(struct socket *so, struct sockopt *sopt)
 	error = 0;
 	inp = sotoinpcb(so);
 	KASSERT(inp != NULL, ("tcp_ctloutput: inp == NULL"));
-	INP_WLOCK(inp);
 	if (sopt->sopt_level != IPPROTO_TCP) {
 #ifdef INET6
 		if (inp->inp_vflag & INP_IPV6PROTO) {
-			INP_WUNLOCK(inp);
 			error = ip6_ctloutput(so, sopt);
 			/*
 			 * In case of the IPV6_USE_MIN_MTU socket option,
@@ -1627,12 +1625,12 @@ tcp_ctloutput(struct socket *so, struct sockopt *sopt)
 #endif
 #ifdef INET
 		{
-			INP_WUNLOCK(inp);
 			error = ip_ctloutput(so, sopt);
 		}
 #endif
 		return (error);
 	}
+	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		INP_WUNLOCK(inp);
 		return (ECONNRESET);