Date: Tue, 7 Feb 2023 20:23:38 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e6aba98fddf8 - main - tcp: Remove a couple of always-false checks from syncache_socket() Message-ID: <202302072023.317KNcxG051571@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e6aba98fddf8f087de02e2a88a79f1f2a1b89f5e commit e6aba98fddf8f087de02e2a88a79f1f2a1b89f5e Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-02-07 20:12:10 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-02-07 20:22:54 +0000 tcp: Remove a couple of always-false checks from syncache_socket() syncache_socket() does some unnecessary work: before connecting the PCB, it saves the local address on the stack and restores it before freeing the PCB in case of an error. However: - There's no need to restore the old address in the error case. - The PCB's local address will always be equal to that of the syncache entry anyway. So just remove this unnecessary code, which appears to date from the introduction of the syncache 20+ years ago. No functional change intended. Reviewed by: tuexen, glebius Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D38391 --- sys/netinet/tcp_syncache.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index a1f07ed1aadf..e45fc457f4d6 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -870,7 +870,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) } if (sc->sc_inc.inc_flags & INC_ISIPV6) { - struct in6_addr laddr6; struct sockaddr_in6 sin6; sin6.sin6_family = AF_INET6; @@ -878,16 +877,11 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) sin6.sin6_addr = sc->sc_inc.inc6_faddr; sin6.sin6_port = sc->sc_inc.inc_fport; sin6.sin6_flowinfo = sin6.sin6_scope_id = 0; - laddr6 = inp->in6p_laddr; - if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) - inp->in6p_laddr = sc->sc_inc.inc6_laddr; INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, &sin6, thread0.td_ucred, false); INP_HASH_WUNLOCK(&V_tcbinfo); - if (error != 0) { - inp->in6p_laddr = laddr6; + if (error != 0) goto abort; - } /* Override flowlabel from in6_pcbconnect. */ inp->inp_flow &= ~IPV6_FLOWLABEL_MASK; inp->inp_flow |= sc->sc_flowlabel; @@ -898,7 +892,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) #endif #ifdef INET { - struct in_addr laddr; struct sockaddr_in sin; inp->inp_options = (m) ? ip_srcroute(m) : NULL; @@ -913,16 +906,11 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) sin.sin_addr = sc->sc_inc.inc_faddr; sin.sin_port = sc->sc_inc.inc_fport; bzero((caddr_t)sin.sin_zero, sizeof(sin.sin_zero)); - laddr = inp->inp_laddr; - if (inp->inp_laddr.s_addr == INADDR_ANY) - inp->inp_laddr = sc->sc_inc.inc_laddr; INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbconnect(inp, &sin, thread0.td_ucred, false); INP_HASH_WUNLOCK(&V_tcbinfo); - if (error != 0) { - inp->inp_laddr = laddr; + if (error != 0) goto abort; - } } #endif /* INET */ #if defined(IPSEC) || defined(IPSEC_SUPPORT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302072023.317KNcxG051571>