From nobody Sun Nov 05 14:23:54 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 4SNcDB4c1Tz50JTy; Sun, 5 Nov 2023 14:23:54 +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 4SNcDB3gYZz4Ps0; Sun, 5 Nov 2023 14:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194234; 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=Uouq+tUKFFfBUkVIwf8d2OLuJRIj+ySjwy6C61/yV4Q=; b=BdNENV8YKZwm6Gr4PnwR7em9YEDMtXwrqPeE3SYZkiRXnRX1+roWYbdEMqYeQnJddqbbKR moz4Ab7g1bHYAhMAGhOSQ0XEOb9+yu8ANRYta/JnUkCBTi4tnmYc7Ci0hg9VAn+hESlnXZ tB8S22S01d9ogF90Ck0FY55+ZafP+6LjeuVqWcb/KIV0d5c978WUtP40I5NtOvVCSv5d+Z k2FXnRR4zVBp1Wfzz2dGgsqcgTm7OseEbV7/ofzIaqVagzxl3a0WAO6bZh471BbqViocfD gPVlstJAyX50KqYcc96kZiju9sUqxMCX4r+pFuyY9PupZnYBc5tsP1zvaLjQsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194234; 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=Uouq+tUKFFfBUkVIwf8d2OLuJRIj+ySjwy6C61/yV4Q=; b=XR69vP3hJwuY4yOJsMGc1Ftci88rhfrjdiaDDeaA/H5mzuw3rA0rxHiZfxdv7rO34srohD wGBmiCkOjYZPPHXhjJXXuwFhlBSHx/u/7hOXVJD0eKZflDMQPCjoVX11jORaw2Jv6JiN+V gIou4WRtJfJP+jBfEvTJ0UMTSkYKjxvzOX6CO7VJDPD7dEcwySa0IUR3mYkkI8oMYKtYiM yFMoEkK+Pv4YfEYgteL0vEjIjxZnDA8VT4f/HE7qJGljrNRg9LQFxSZBllfL/Fjk1AcmSD LFm9p6KCI6pyBK5FqrkSRapdumHSrTSq4LToKPuzjcGVxNErljU1y/Gim4taDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699194234; a=rsa-sha256; cv=none; b=hYfEFuwWX2BPxRNuNvfwVKjV77INMwIuriOm3feaaHhJX5e/zlQsOvOr4d3Bp9O84azHEt bZHRwqLzAVJNwEYKZMc0jRL/k7WXmGCdvsdK4nIxw4+bgNpjkzq3dTXVOWen5GLZL6XfWJ 2L00Ao/SGOCtgy7+uTh1ZJJxy2QDkWVdjIbzrlCMWsc+1sglZuuWokKoaoongi6HWpGqHx fxkECJJW5cwd4XJ3iP0mCGp8aN4nIMqPCif1IT9ZiF6sowMajgBQHGpEToDRzCLBx0geJO zIC2RslwflyQkFeQXxHdcRxpsbmMOcGqRaBF6VjQPsvJ4EXYJVjJ/WGL7kk+Yg== 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 4SNcDB2PwQzCLh; Sun, 5 Nov 2023 14:23:54 +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 3A5ENs8w020138; Sun, 5 Nov 2023 14:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5ENsLB020135; Sun, 5 Nov 2023 14:23:54 GMT (envelope-from git) Date: Sun, 5 Nov 2023 14:23:54 GMT Message-Id: <202311051423.3A5ENsLB020135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b10ae5a9b21a - main - tcp rack: remove references to rb trees 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 Author: Michael Tuexen AuthorDate: 2023-11-05 14:21:06 +0000 Commit: Michael Tuexen CommitDate: 2023-11-05 14:21:06 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42386 --- 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 5c16cb9ed23b..5df188aae52c 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);