From nobody Mon Oct 24 19:49:35 2022 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 4Mx5J01xBJz4gbRs; Mon, 24 Oct 2022 19:49:36 +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 4Mx5J01HWcz42HC; Mon, 24 Oct 2022 19:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666640976; 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=jYNraJxodtkEUayMRWA3fe9rNVVoaCymWI7d2fRy0b0=; b=xKwqi1g+94ganeF8l1Xr+L5Kjr+sC/F3gH0+ZxT1jSlfNLgQCzN5aOtSF0irDJhqvU9xS2 xTdBp8SirsGGvVHXMXrrQvb/9tjHUUtTwqY57zxW30H8Tlqcc46r+gHVsDRnt8Sf7H5yXh 4ELXHP6+wNnIT1bCEXwXESHLgO0JBF9H1ypWG0GWwUSNP/2oaR03uzOc4yb5QUMCKJHHDQ HAU0oKtwHWC+JCJihGBYej19tFpgsvx7Arerle+j+E8WGsTRdJFm71IjOINGWLPnyvINhO 7NKG5b7QdG0bVFUzWNdsUsbe0ROGukSrPv0yiUuIFSu+YH9lMu4+VcW1VZyMUA== 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 4Mx5J004vLzLDG; Mon, 24 Oct 2022 19:49:36 +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 29OJnZgp002522; Mon, 24 Oct 2022 19:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OJnZqh002521; Mon, 24 Oct 2022 19:49:35 GMT (envelope-from git) Date: Mon, 24 Oct 2022 19:49:35 GMT Message-Id: <202210241949.29OJnZqh002521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 31bc602ff811 - main - Rack and BBR broken with the new timewait state purge. 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31bc602ff811a20c8794f48061cccde9277c6a53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666640976; 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=jYNraJxodtkEUayMRWA3fe9rNVVoaCymWI7d2fRy0b0=; b=HUgX8TkzLucqPNWX/caxfVyRZLCEuihL/p6kL4UPWkCp3dfW25nfb9izsi59+UXw2LppHq AS+PYNNyCPyj8L1B5/AjQuUf2XhL98d/aE1jeHdixL6xfa3CK/pxN3NuiSq9nxBoDmIsLM djGmfMEl6MSYOsMST7LAr0dK58jUblKhv3uHcpCGePJM5o7MyYaQmvBXnKnK6OY8k+i4PJ Q7RsR7wwn7y+QoyqMBPDlklajryDFFd6G1hQQ2esxksVznZS5xfZac7BcfA4otm7B24cps HRwlbrv1/Xr58qBd1RGv2j8Aw0GghK3IPtiaNJoAeLDbSXc5icHUSOKl7svGSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666640976; a=rsa-sha256; cv=none; b=qNQBOlp9hgiHi6pxpMHa0viH6X8E2LcHs54uSRbWJTFhB5Ct67JqbjKsGzKRcTgglje4bK HJqPZHCo/n1FRRU5vaV9G+U2sp/zh6rkV6NIvwWhU2FBmMWrFJKiwqgoMvAaJQlOxmr9Ch FZH0vDbD3tzyKkK84qU99os4sTrQRaiYa0BhymMB2ntm9PizyjSnI/68z/lPKKyFprYKLi KjuUhvUACI7JC8dNeGnExPfWyG6bbcufv3zyi2TJw331bsMHPQp1q88TPta096N5qP60Ik iI91JQP18gq46/lLGhOusU88ll6tCekss2kiZP1l0v4B4aP9iv3/A500Q3P9mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=31bc602ff811a20c8794f48061cccde9277c6a53 commit 31bc602ff811a20c8794f48061cccde9277c6a53 Author: Randall Stewart AuthorDate: 2022-10-24 19:47:29 +0000 Commit: Randall Stewart CommitDate: 2022-10-24 19:47:29 +0000 Rack and BBR broken with the new timewait state purge. We recently got rid of the explicit INP_TIMEWAIT state, this has caused some minor breakage to both rack and bbr. Basically the timewait check that was in tcp_lro.c is now gone. This means that compressed_ack and mbuf_queued packets will arrive at TCP without going through tcp_input_with_port(). We need to expand the check that was stripped to look at the tcp_state (t_state) and not "LRO" packets that are in the TCPS_TIMEWAIT state. Reviewed by: tuexen, gliebus Sponsored by: Netflix Inc Differential Revision: https://reviews.freebsd.org/D37080 --- sys/netinet/tcp_lro.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 9ec7736aef2f..4f7457d875e7 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -1359,7 +1360,9 @@ tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) tp = intotcpcb(inp); /* Check if the inp is dead, Jim. */ - if (tp == NULL || (inp->inp_flags & INP_DROPPED)) { + if (tp == NULL || + (inp->inp_flags & INP_DROPPED) || + (tp->t_state == TCPS_TIME_WAIT)) { INP_WUNLOCK(inp); return (TCP_LRO_CANNOT); }