From nobody Fri Jan 12 16:39:22 2024 X-Original-To: dev-commits-src-branches@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 4TBS17146Cz577n7; Fri, 12 Jan 2024 16:39:23 +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 4TBS170bjvz4VSN; Fri, 12 Jan 2024 16:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705077563; 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=1CBTjKpABJUcbEh04a65l/b0bVWtFQPSL0h3vXfFl5U=; b=k5S58Y8CzGWlzc46I3GNI8IWRVAnJUAZvz/9+sc9/ui+yui5gWdwiMHr3c8GLFx00L/DQp OB4xnz2TBrNrBtqm/SGsFnpa8ugFJjAA9dQWK5kvwFKNteKcrU3/E2ef14ZrJz4VWX/6B9 GTemC9BIr140QwCl2IGLxUAMVcrX50ycKHFa+jFi4n0+NydBAs8xTXI7Oukj469ybDQ5ps lQDrwM14W5yEi47hMmoIO6Qr2WdScLoUiRAaBj/L9dbaF58Lk+GInv4qk0854vMtpfe55K xqIeJGLbCbQvcA/ayJmWXkV320JvvrP1VVaBLw5oVkfB9uWgBKhCIn8ybS5LnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705077563; 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=1CBTjKpABJUcbEh04a65l/b0bVWtFQPSL0h3vXfFl5U=; b=ysxXM/DMVYU6V6fgOQOS/hcqTchchnNyxTSVIMMpOoeRMyvDCr+mpltSua2+J0kfgJGAUI RBYivl2bexJzYLfNf90UJGv6ibg1yoBwQJa5E0n8pheuD0e2e1rqMAC9GX+C07w7nGwKr8 g0Z1jhvnGhnYbGMckXPz5fwv7WMhbAvBw95O/MXr5T96USiYGOAVlD1qt9TILpJrKmNcFW JiVCxBTFDVJ8fHF92vU0UHB057YJJpGFg79pHZ6Cw2/QDLu0A66ZjvToKH9tBZ1adV5diR xdwbiYSdRiBIxA9Apzk6SpchUyzRBrbRp7a9aAcJAcmpyyedqAWOjtMeSrw0ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705077563; a=rsa-sha256; cv=none; b=GwxEp6zohm4N0TLPzV7l1lQgGeTAHRFLrGbwBORMUR7ripAURynr8n6TwJGyzba8ZCEqPw u82ZubH08BGlIGQDhn62oMQYXrIbjmbb+BLcD9J2Kf/a7EaoTqOwnDbSgSrg8yylw5ca87 3ZdxlY0gnHSMwaZFSfe3zn1kOF6qdWHsBe1m97XI5xvxw90EEtJXVwalkTE6BSG3ehLPXu +vJI0aZlyeBtUw2Gu1JAGJuGMv7l+uzbUirZEiRDMFtL58C7fCod8bsN3jYHHXCfS1VFOL UMfs6yJWrOf6L6hc/JZmMvYTZNcoYEktl9LH5RMc/IuQgDa6wwdERy0OYJFtSw== 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 4TBS166Sndz18h7; Fri, 12 Jan 2024 16:39:22 +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 40CGdMgn062088; Fri, 12 Jan 2024 16:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CGdMWk062085; Fri, 12 Jan 2024 16:39:22 GMT (envelope-from git) Date: Fri, 12 Jan 2024 16:39:22 GMT Message-Id: <202401121639.40CGdMWk062085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9a75f1475fb6 - stable/14 - tcp rack: remove references to rb trees List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a75f1475fb6ddd8d34d50a7b071ffa0c6a60a2c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9a75f1475fb6ddd8d34d50a7b071ffa0c6a60a2c commit 9a75f1475fb6ddd8d34d50a7b071ffa0c6a60a2c Author: Michael Tuexen AuthorDate: 2023-11-05 14:21:06 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 16:37:31 +0000 tcp rack: remove references to rb trees The references should have been removed in https://cgit.freebsd.org/src/commit/?id=030434acaf4631c4e205f8bccedcc7f845cbfcbf Reviewed by: rscheff, zlei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42386 (cherry picked from commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3) --- sys/netinet/tcp_stacks/rack.c | 24 ++++++++++++------------ sys/netinet/tcp_stacks/tcp_rack.h | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0dd724399ebd..760bd4ee9689 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -7472,7 +7472,7 @@ need_retran: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -7692,8 +7692,8 @@ rack_remxt_tmr(struct tcpcb *tp) * order. This way we send in the proper order and any * sacks that come floating in will "re-ack" the data. * To do this we zap the tmap with an INIT and then - * walk through and place every rsm in the RB tree - * back in its seq ordered place. + * walk through and place every rsm in the tail queue + * hash table back in its seq ordered place. */ TAILQ_INIT(&rack->r_ctl.rc_tmap); @@ -8355,7 +8355,7 @@ rack_update_entry(struct tcpcb *tp, struct tcp_rack *rack, (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -8545,7 +8545,7 @@ again: (void)tqhash_insert(rack->r_ctl.tqh, rsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -8619,7 +8619,7 @@ refind: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -9776,7 +9776,7 @@ do_rest_ofb: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -9897,7 +9897,7 @@ do_rest_ofb: } /* * There is more not coverend by this rsm move on - * to the next block in the RB tree. + * to the next block in the tail queue hash table. */ nrsm = tqhash_next(rack->r_ctl.tqh, rsm); start = rsm->r_end; @@ -10138,7 +10138,7 @@ do_rest_ofb: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:% rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:% rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -12478,7 +12478,7 @@ rack_un_collapse_window(struct tcp_rack *rack, int line) (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -14808,7 +14808,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts, } #ifdef INVARIANTS if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p", insret, rack, rsm); } #else @@ -14868,7 +14868,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts, } #ifdef INVARIANTS if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p", insret, rack, rsm); } #else diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index 38239ef97b4d..4152a1a5d7ba 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -120,7 +120,6 @@ rack_ts_to_msec(uint64_t ts) } -RB_HEAD(rack_rb_tree_head, rack_sendmap); TAILQ_HEAD(rack_head, rack_sendmap); TAILQ_HEAD(def_opt_head, deferred_opt_list);