From owner-dev-commits-src-all@freebsd.org Tue Apr 20 17:06:35 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DD8715E0514; Tue, 20 Apr 2021 17:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPqpg5pk8z3Fb6; Tue, 20 Apr 2021 17:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA76D16A8F; Tue, 20 Apr 2021 17:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KH6Z4m039565; Tue, 20 Apr 2021 17:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KH6ZNk039564; Tue, 20 Apr 2021 17:06:35 GMT (envelope-from git) Date: Tue, 20 Apr 2021 17:06:35 GMT Message-Id: <202104201706.13KH6ZNk039564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7b5053ce2296 - main - tcp_input: remove comments and assertions about tcpbinfo locking MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b5053ce2296e0fd96f162e308beb344b4ee654c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 17:06:35 -0000 The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5053ce2296e0fd96f162e308beb344b4ee654c commit 7b5053ce2296e0fd96f162e308beb344b4ee654c Author: Gleb Smirnoff AuthorDate: 2021-04-16 21:39:19 +0000 Commit: Gleb Smirnoff CommitDate: 2021-04-20 17:02:20 +0000 tcp_input: remove comments and assertions about tcpbinfo locking They aren't valid since d40c0d47cd2. --- sys/netinet/tcp_input.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8592f3313725..cac67024705e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -984,16 +984,6 @@ findpcb: * or duplicate segments arriving late. If this segment was a * legitimate new connection attempt, the old INPCB gets removed and * we can try again to find a listening socket. - * - * At this point, due to earlier optimism, we may hold only an inpcb - * lock, and not the inpcbinfo write lock. If so, we need to try to - * acquire it, or if that fails, acquire a reference on the inpcb, - * drop all locks, acquire a global write lock, and then re-acquire - * the inpcb lock. We may at that point discover that another thread - * has tried to free the inpcb, in which case we need to loop back - * and try to find a new inpcb to deliver to. - * - * XXXRW: It may be time to rethink timewait locking. */ if (inp->inp_flags & INP_TIMEWAIT) { tcp_dooptions(&to, optp, optlen, @@ -1361,7 +1351,6 @@ tfo_socket_result: * Entry added to syncache and mbuf consumed. * Only the listen socket is unlocked by syncache_add(). */ - INP_INFO_WUNLOCK_ASSERT(&V_tcbinfo); return (IPPROTO_DONE); } else if (tp->t_state == TCPS_LISTEN) { /* @@ -1414,7 +1403,6 @@ dropunlock: INP_UNLOCK(inp); drop: - INP_INFO_WUNLOCK_ASSERT(&V_tcbinfo); if (s != NULL) free(s, M_TCPLOG); if (m != NULL)