From nobody Sat Jul 9 05:04:58 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 443EA3E7A6A; Sat, 9 Jul 2022 05:04:59 +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 4Lfykf6ptSz3Qb8; Sat, 9 Jul 2022 05:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343099; 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=HdHoB8iAkQ+nZN+z0piD/uwB9zVg/o2SrqNzjURIJHU=; b=Cx5PG7CKLfnY9w62S2WkTc0CjRR+axT301aUp1JDhnOD/NTiThUANqLrWMM9ROrnnbiz2R QyMjUtxmmSbEbrokB2HzE3/z4UoZu03GQ0E9pL80ibyRbPF3OOlYv8lwoaV4/7MtW7ul5C IOYsNQkqYObScSxIJI7zszt6Ilt/aY+k/bwuSb6JoCowdK6PFQHlApX2mqO01wnB0KQUSD Cp7w9KjqswuUaEQ17OLmHznpC3b685NNh+c58OJ8g+LmviD3/B2azdssz0wUDxyhVZypea aOnKIB75MloHOv+8X62HnRwC1EOL8dkdjMg2KXebbgcBQ5orl/cmNPaB3FkzeA== 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 4Lfykf5tc8zZHP; Sat, 9 Jul 2022 05:04:58 +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 26954whE000414; Sat, 9 Jul 2022 05:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26954wEo000413; Sat, 9 Jul 2022 05:04:58 GMT (envelope-from git) Date: Sat, 9 Jul 2022 05:04:58 GMT Message-Id: <202207090504.26954wEo000413@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: aeb6948d4319 - main - bbr: check proper flag for connection had been closed 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: aeb6948d4319fdaef8a7a6ea72717968cf5ef79b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343099; 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=HdHoB8iAkQ+nZN+z0piD/uwB9zVg/o2SrqNzjURIJHU=; b=qCEaGy7zmynVa9MVyiii8tfyo01TLyO+0nosH8Z2BZLue/WC/k/wlv775nU4Fg/IOzyWBK W0muOvL4EMSf2bGQtuY95WFgzMT7mzSwjCRZZmdeM8XVRTQ5+2f/8Xjtyo7l0pADTEpOu1 MvihjOWYeIaVoen9Li8QEYEc1Lh1QHSUSormYayBUNFDiVACNj7FmDjANr7AW1dvRzvWwb vooIvwQmqJaJBKHUSuk8fzj0Eyw7aR9fQ5vhsFoeMHWXueXFd39uex7bCEQDwA0YXbDAu/ 2bGY+CM+2t8Nc0QHwL8xb03hUPS4w7WcFG+mBsgmhsT9/vmVKPXKmTnUAlOQ+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657343099; a=rsa-sha256; cv=none; b=gDnCp6s5OT/ZJoJTehxT5a0bq1SZfoKELZfcz62FZ9NU/wuo6QGVip7OVe2ThKerM7Alg1 +51hXxhIkB2K/DVBv/6abFpyqiSRXIMNPa4PqqOE1YweqAmsX+2veKpM0eBDx3+JU0YSjV 7xdVBoGMlF7xJCFH0j59oUho2F4oC1gmOm2zvyyLdaTU/OAC59W8j9Yt82RP4M87mvhH5I FjtudGtEwxKKBr9Cf6YchthVRkO1xpo1FZo6SrjSsdq1SyE1sZ/HRzn8msrYK0NXwvfo0f 2SkW+ffqlTTTDLmQFDJj4VhWpS4Vdrj8t33LahVZkCqTHHs4V4XhGjWyBC7+Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb6948d4319fdaef8a7a6ea72717968cf5ef79b commit aeb6948d4319fdaef8a7a6ea72717968cf5ef79b Author: Gleb Smirnoff AuthorDate: 2022-07-09 05:04:44 +0000 Commit: Gleb Smirnoff CommitDate: 2022-07-09 05:04:44 +0000 bbr: check proper flag for connection had been closed An older version of D35663 slipped through final reviews. Submitted by: Peter Lei Fixes: 74703901d8bbc3bc7a29df648bc3c131c87393c2 --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 6278bb228c4f..9d5a3d52776e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -9844,7 +9844,7 @@ bbr_do_fin_wait_2(struct mbuf *m, struct tcphdr *th, struct socket *so, * We call a new function now so we might continue and setup * to reset at all data being ack'd. */ - if (tp->t_state > TCPS_CLOSE_WAIT && tlen && + if ((tp->t_flags & TF_CLOSED) && tlen && bbr_check_data_after_close(m, bbr, tp, &tlen, th, so)) return (1); /*