From nobody Mon Feb 13 21:35:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFyLy12Jhz3qNbf; Mon, 13 Feb 2023 21:35:54 +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 4PFyLy0CHbz4Ztj; Mon, 13 Feb 2023 21:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676324154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UgKTdeRSRA2/MUBPp6QadsTpTSkk2qQvxY7Uj5bEP88=; b=d8KCNI09zcfu4AWwoQe0hnAVYDGYhm67Xy28Nio+u2MO6G2r7FvEnHpkwaHJns/j4JQU9D Rk40cvH/AfpnRZw0fiwlRk/7xZ0oQEQ2hBqPvcBNdte3E/VevsVo1QylcELbDnxNatTPBP q2P4m+sEkeHoNRu0G8wH+2cQ942B1+xzctp4k0AObiACMT7blmmnbICrgm3PFgD0O0B+UM DXNc+GyeVMGdBSJS5yk2CCULhL/5rzGXlAMkpbd7qak150dwrGLeDALJ+99x/TqtGwnCZu yCtbhlT++td/C24026lIYU25qwzC6I3RsWrdn9I+2Hp9eHp7Au4Zc+aqoMh17A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676324154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UgKTdeRSRA2/MUBPp6QadsTpTSkk2qQvxY7Uj5bEP88=; b=M27Hd5Ui5OcuocNv6iOr4EtiwH5qMNBRJdI6kJYMwX7Bj1zRFMCasrLI9E5jBw0imwfRfr RxrYTpDlmURThXlOLbHxHzcGLcZglyooOA5O+mkx43CLlTgGqs2oUjcMGuZeJ8Z1s9tnMa 5aPJwrcoTaQ+VsHd6ekR0pGwEQvBwIiZEnXms1y1sG+DFB/w5cnR4frM0sTohorvayhHUa /exHjpbUmRhkvlxn6W+WTGbbwj78wiUIfIKPYeSUr6RJaDd5Rjj9UzgzsGdCYlSrj57la1 /7qjWsPGhjq7v2k7EDUNRP5VFIKy7HBy1ZUmZ9d8KDQpShToJ44Ipi8NA4e9AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676324154; a=rsa-sha256; cv=none; b=ZJmyNOYQZkpcIrWVFH37T/iqx3hrnpRRR3zJ6WeDogmW3F61dbT3VE75oHMeiJlL4K+EE1 StT4uJKeXccCZfAzCN1u+HoriD3+VakHZS2ykKkvO/xCC98n6XBQJkMciV/OW7GZxhI83A VVrSh1FrhJCu1cW8c2fZhQqc8TeBUDks//qdELXSos7oRhOKh2c29lFEq9CZlr+fiaU+HN zKvI1r+yTmYd+l1PC5LmDn+hu6YbLmBxL+u+HDOyeL98Ija+nMhj6BCJo9/zd8NEegr0J7 9HomxcMYx3jGWcW5+upvEHmsjPGgask1cWOYrGA5+hwhAoP8bi45F8HdE1UP6w== 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 4PFyLx6MwczZ2Y; Mon, 13 Feb 2023 21:35:53 +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 31DLZrCb099034; Mon, 13 Feb 2023 21:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DLZruQ099033; Mon, 13 Feb 2023 21:35:53 GMT (envelope-from git) Date: Mon, 13 Feb 2023 21:35:53 GMT Message-Id: <202302132135.31DLZruQ099033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 775da7f8a924 - main - tcp: Remove a redundant net_epoch entry in tcp6_connect() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 775da7f8a9248d148ffd50635cf043c015146225 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=775da7f8a9248d148ffd50635cf043c015146225 commit 775da7f8a9248d148ffd50635cf043c015146225 Author: Mark Johnston AuthorDate: 2023-02-13 21:21:10 +0000 Commit: Mark Johnston CommitDate: 2023-02-13 21:35:47 +0000 tcp: Remove a redundant net_epoch entry in tcp6_connect() tcp6_connect() is always called in a net_epoch read section. Fixes: 3d76be28ec60 ("netinet6: require network epoch for in6_pcbconnect()") Reviewed by: tuexen, glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38506 --- sys/netinet/tcp_usrreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index c204fc356ed7..43f2fcfb097a 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1433,16 +1433,14 @@ static int tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) { struct inpcb *inp = tptoinpcb(tp); - struct epoch_tracker et; int error; + NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); - NET_EPOCH_ENTER(et); INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, sin6, td->td_ucred, true); INP_HASH_WUNLOCK(&V_tcbinfo); - NET_EPOCH_EXIT(et); if (error != 0) return (error);