From nobody Mon Dec 4 18:59:28 2023 X-Original-To: dev-commits-src-all@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 4SkXym5JrWz52h95; Mon, 4 Dec 2023 18:59:28 +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 4SkXym3cMKz3TX7; Mon, 4 Dec 2023 18:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716368; 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=mGZX0sGL03oLdWHXDCAQqJcMc9Ap9fctWP96w/qaJks=; b=IA+VdT0zToGhDJEeV1AGTou3HMJGOHhrdSI61Fm26LWaWCNIg35VBwbvzzHM8LGLNjDR6W jbUwA3RM0rWqK3tKGnCIVN7Pp8wnPJGDV5i9EbyCn37XAGKSfVMOARjUeZE3/MBHcTG7hL sVDQbb1TpUxj0C/YWshpy3VgXx0JYLjUPFGpNKFlF6FAczSOfDP4W7XpDZJsUChyh8aJgJ 9Q1ifX/BvupMcVdi1MEUre9JGxqLukITfXDpQvs1N/B7U7WlT59mW0tyaiiYTvNVrhY1in oFx07bCW5gt5ReJ0dg7d3VL00XDkqhVfDnrUkJKoPrcl8Vo65eT/FGeTua3R8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716368; 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=mGZX0sGL03oLdWHXDCAQqJcMc9Ap9fctWP96w/qaJks=; b=BXkXm2mVeXMOiqdvSfX+x2pxttmq/5a076ZwOrToDsAAfUP0ZHkKTUSCwAZAaCAol3wyHQ idUqqdaR51FKQ09q5GtX24JmtHTo3kgAjMgDg2ILXxHYlqN2UQwh28JpVUmqs0MeZ3jgpN GHz3foNXaFgyZ4UBTptnTE7W407urxeLcaXfXRs4NTYnYC5PyUb7z1ahphdDC8WQj8CffE YtXwmdecIi7PiL8Ay7Au7TcIw2GBNBsus8aO4a+emNq64wy7Wz45j6KD9WrmDdiR4bSiYQ CY4xv4Ij/H+2FAwCsJQ6dGlEqFb/aYpvQNV5LY2oCMiW6+f1lC/s4GDBjXyY3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716368; a=rsa-sha256; cv=none; b=ALVQrzTGKEWrzrF96HydD5NolHxFj7upkA6k17YAPW3x4vsniR7UBC7GsJRv4ztkCcgxpp VuS4taQDkRTASFFXPf+T8LYCsRd8BEgOwYLMQdVg6dteunH3tfwiE7IjLln8ECR4dV8enJ eEYap8CJcq8WxWwpYnF73Gkql7Jqrw5dLkSnrZbq3Fn9jmkPfu2TsE4X+Wdkk0U2cg5BBE KE8p6WFDM8Yu8EqePTnEKAGcKfM9nsw2scxVCSpqAFSrOe7bt/OiDBqEL9hDHPlrre/x/u uqLQ5erlEFLv+7zmO/Kmu+nGydPTYLh4COcYMwU1I+/tKlicxxyepipiXt0Bmw== 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 4SkXym2hgwzdnT; Mon, 4 Dec 2023 18:59:28 +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 3B4IxS3J043593; Mon, 4 Dec 2023 18:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxS5Y043590; Mon, 4 Dec 2023 18:59:28 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:28 GMT Message-Id: <202312041859.3B4IxS5Y043590@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: 2b3a77467dd3 - main - hpts: make stacks responsible for tcp_hpts_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2b3a77467dd3d74a7170f279fb25f9736b46ef8a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3a77467dd3d74a7170f279fb25f9736b46ef8a commit 2b3a77467dd3d74a7170f279fb25f9736b46ef8a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 hpts: make stacks responsible for tcp_hpts_init() Those stacks that use HPTS should care about init, not generic code. Reviewed by: imp, tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42856 --- sys/netinet/tcp_stacks/bbr.c | 2 ++ sys/netinet/tcp_stacks/rack.c | 2 ++ sys/netinet/tcp_subr.c | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 013bd0982fd3..aa78e02e39d9 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -9926,6 +9926,8 @@ bbr_init(struct tcpcb *tp, void **ptr) struct tcp_bbr *bbr = NULL; uint32_t cts; + tcp_hpts_init(tp); + *ptr = uma_zalloc(bbr_pcb_zone, (M_NOWAIT | M_ZERO)); if (*ptr == NULL) { /* diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 5df188aae52c..e7027dd1b2dd 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14973,6 +14973,8 @@ rack_init(struct tcpcb *tp, void **ptr) uint32_t iwin, snt, us_cts; int err, no_query; + tcp_hpts_init(tp); + /* * First are we the initial or are we a switched stack? * If we are initing via tcp_newtcppcb the ptr passed diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index cfbf32a40d86..b3f5375cb8cf 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2313,9 +2313,6 @@ tcp_newtcpcb(struct inpcb *inp) * which may match an IPv4-mapped IPv6 address. */ inp->inp_ip_ttl = V_ip_defttl; -#ifdef TCPHPTS - tcp_hpts_init(tp); -#endif #ifdef TCPPCAP /* * Init the TCP PCAP queues.