From nobody Fri Nov 17 02:31:15 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 4SWgrM3JWYz51NZD; Fri, 17 Nov 2023 02:31:15 +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 4SWgrM2Nnfz3XQj; Fri, 17 Nov 2023 02:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700188275; 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=6IGU1WkM3e/n2LSi1kL2QWPN9wsl9ArJ0IU5MVr+nBs=; b=a8Tj7VofvpIl3R9uxXKq0S78cpcc7DHdXMsZ6JBePq+Nja8eVYwFJZvVaBpQB2GGWQ9VFv pHshpgvQWmI+V+fbzIqxxF9xxRZ+OyZXaoalLmRwzvB/nW9SPEQUihMUWnNx+ynytgRugA +JAS+hHlrC6gj5w9XsTfGt8NtWXPx93om2qdHvQL7OvOAEHW3tbeaEkaWGR3Mg1jlwFYNs H14gjmR78BYzidxUvDRtszBPTfe4Z9tgMZvYWtjycMyYYY3T/vcpfc8MPF9C6HG2WF13md t9fCMteqVvairC3PaZ5iVjDuJMl2n5vXGQz8ZbbadxkeCLNFLBqhOt/lYqBU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700188275; 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=6IGU1WkM3e/n2LSi1kL2QWPN9wsl9ArJ0IU5MVr+nBs=; b=Nj6HXxzJElhU7PiGHcwKp8xNaOsIqxQBbem9cD4Q+PUxlaRpKVyFwRRn8v4u74HP7JEahH ergDE4IpLtAc/Yctj+X4PMDKI6szWsRyvUmjSSg3wt5/N4JDIcn8Zf9BQi1+WuDL8gxLiV mwy0K78+I/MzYBxg7MIGQB4Bvmgp1dfDA/3tCyU062qLYAFZRAgQqFzrTf78qsOirC8GUQ 1zhvyJGLs5wsnz5xdkCM1eTuMuiFniDFIovszMs2KTJWLIA4Mvkm/0HzTQ58b8niC4z+5L BOEAJ65xTFyFfqEc/NLJrABafpfJxrJreDHJKcfaP5QcBApyW58qnrbvAZaFAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700188275; a=rsa-sha256; cv=none; b=qwheAC13viS7utNk0094Gi8yhJbvKLym1BTCDATbDE2U+1BbhZL2mb6OdK03y/pIcgEy5D Q1i6Mc21HCt0YMcmxBnaHxZqm0u5CwC81uwqsWFrmVp1UvHfi09z/3zMcNmm/6/mEdi/+7 Hg6tqdZn3wHCT2rPUwZ4jljzaT8sSCCXnk1+UUOxAKWj/MwPu3FsD0mFgiI0vMbFFaCUHL mJYmQuO5YsYkSRBdIyIWV3v9po1SBgi2Ht0avo3EDZBODGP1f0KFFRZRtlB2NMton59DyA krMgqhRbtwo5QNiq9VuNmrr5NA/8ldscHfYFFfcy+6bSZ8MY41eajiGOEwufOA== 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 4SWgrM1RqLz9g6; Fri, 17 Nov 2023 02:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AH2VFTk017115; Fri, 17 Nov 2023 02:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AH2VFWq017112; Fri, 17 Nov 2023 02:31:15 GMT (envelope-from git) Date: Fri, 17 Nov 2023 02:31:15 GMT Message-Id: <202311170231.3AH2VFWq017112@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: 70e30addafe4 - main - tcp: remove extraneous network epoch entry 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70e30addafe406e01db4a6643932b73082886241 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=70e30addafe406e01db4a6643932b73082886241 commit 70e30addafe406e01db4a6643932b73082886241 Author: Gleb Smirnoff AuthorDate: 2023-11-17 02:30:35 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-17 02:30:35 +0000 tcp: remove extraneous network epoch entry accept(2) on IPv6 TCP doesn't need epoch. Some leaf functions may need it, but they will enter accordingly, see sa6_recoverscope(). Reviewed by: rscheff, tuexen (implicitly, see deleted XXXMT) Differential Revision: https://reviews.freebsd.org/D42634 --- sys/netinet/tcp_usrreq.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 8b0b3c296c62..8e5ef0fd4bf7 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -767,17 +767,14 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam) struct tcpcb *tp; struct in_addr addr; struct in6_addr addr6; - struct epoch_tracker et; in_port_t port = 0; int v4 = 0; inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp6_usr_accept: inp == NULL")); - NET_EPOCH_ENTER(et); /* XXXMT Why is this needed? */ INP_WLOCK(inp); if (inp->inp_flags & INP_DROPPED) { INP_WUNLOCK(inp); - NET_EPOCH_EXIT(et); return (ECONNABORTED); } tp = intotcpcb(inp); @@ -804,7 +801,6 @@ out: tcp_bblog_pru(tp, PRU_ACCEPT, error); TCP_PROBE2(debug__user, tp, PRU_ACCEPT); INP_WUNLOCK(inp); - NET_EPOCH_EXIT(et); if (error == 0) { if (v4) *nam = in6_v4mapsin6_sockaddr(port, &addr);