From nobody Tue Jan 16 19:05:12 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 4TDz3Y2JwDz57qph; Tue, 16 Jan 2024 19:05:13 +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 4TDz3Y07dxz54gZ; Tue, 16 Jan 2024 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431913; 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=rKFdSkl2Ax82oY5c3NSTu3aWl/+UEI+m+bVZDeCiQZ0=; b=wellomsDC5EtXVb2Dmou5x8/Mckwc0FdY48E7Q6Ms5FRu3IOjDsOCxz3Lc8rvX0eFS7rcM FeeGfqpNfonQP0UsS+Ghstvmjfub++pz/p2B9bStZy1FMJMIOGZPKLm4pww9Vr87l4R67e Maap+do84aFEAQtBq1DtBegtFae4vA8J/AiM5yXI9krQ5b0AvpGLOxKk16z6if2YHtVWyV zzw0GI9X66t4lZWo/SxgNIUteWVgL8uzovi8QP7y1INMhBrVWOoVAqEXg77fYhP52mzyGr zTmBVz56UI2e8ywLRZ49vL9M1XeOzKKiiKD/AnRo0KYma5tSuIwRfNF06dO8dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431913; 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=rKFdSkl2Ax82oY5c3NSTu3aWl/+UEI+m+bVZDeCiQZ0=; b=EPL3mwO+MZqUWMO9SSQo84iGCBc4bjMnxaeTZESaXNqMXE4yck6DULi8bzSP7szN8i7BQL Up5JXYnMNW93axrePWHccRa3tV7X/KBDJ4BEqQxSh7XqgyhzalksW1ee6/mxjbXyS7/KGs 7qk59P0UCAtDyRVo4J8g/MF6ti725//xJUSlHRCP6DYKUqMljVSvsKW7j0j/fnVUmFS1cP WtYUssnMb0hy/6L1h0VNLkoAj/qZe5wxnjV9sYf/qIl5tBrMuZcmV+PD35D4MvfpyoyXEB TUSx4vAcmXZdMAuHCPsQL2i4X4FCdzlFP2tJjpROpakbvFrD+NzW6m2DDeXUNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705431913; a=rsa-sha256; cv=none; b=MEP5sWKWMMalb9V0LIGYEMD+J5Ok61gWFhjRHtOs2tERY/3qAdkDJSsHPkNoqqFlqzrD4p /g3BaOICyVaGphBYHhpgz4D6P2S8s/q0/j4Ivr5MeZkW0SyVxz5ffW+joSIlzmLKMuT3XH lhDlX+47sjN8Jv2HrLwiAs9Hg5flOFOUw+OIJiGRln/PFYQdyv5KzU/vJ87itfg9Pho/8q oW7f6ochIsZUpqzSi8ajqURqgfYOytIXlBtTNoCKJo/7RUfhBCsd6s8/YZs4Dyynq/5kNw FreC9MyFWyChpFx9NrkIFO6sWta0AaEidCpGVC3IahUwvErBBGwzKZkdB2maPw== 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 4TDz3X68BPzsbd; Tue, 16 Jan 2024 19:05:12 +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 40GJ5CDm010058; Tue, 16 Jan 2024 19:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GJ5CxN010055; Tue, 16 Jan 2024 19:05:12 GMT (envelope-from git) Date: Tue, 16 Jan 2024 19:05:12 GMT Message-Id: <202401161905.40GJ5CxN010055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 76deefc548e5 - stable/14 - hpts: make stacks responsible for tcp_hpts_init() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 76deefc548e59e6dcaa720c8071b4d399b95af63 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=76deefc548e59e6dcaa720c8071b4d399b95af63 commit 76deefc548e59e6dcaa720c8071b4d399b95af63 Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-16 18:39:10 +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 (cherry picked from commit 2b3a77467dd3d74a7170f279fb25f9736b46ef8a) --- 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 4a472c5cea66..3805a911df41 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 760bd4ee9689..af03f2e1640c 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 c1a29f3d01d7..19d71a9e9058 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2315,9 +2315,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.