From nobody Mon Dec 4 18:59:29 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 4SkXyn6lbcz52h5k; Mon, 4 Dec 2023 18:59:29 +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 4SkXyn5sSzz3TPd; Mon, 4 Dec 2023 18:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716369; 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=50L2BYVyjoUpsYhKovrrrQWG0oKe1p8zfbO6viUWj2I=; b=WscfGjbWMjjWS8VLBImBFqvnXyZNVWt1Lv7imo8ul8X0IILi9D9LrzvJ+p2qhtk2rqBadK osEHLJ+JTRhGAAu7bOB7+sFjboWCjqG8DzY3rmb2AON5bdC9KybMYEXHWtkbreQKmtvhlC 6L+68eSVwfI4WzJhM8J6VLCu7q8cK395G1KYyNMDJReXdnD2v1i5nW1gYg9SQNMlMdD2XW bdOdmyP+sx+gZVNdRNOr0b/9JXKcqHfhN2wtaQpbddg08K2bUzDgJLwz4zcV+5wcYVXh8c 9pTgPRwwPRcnptJM8YMTCzmsROsHyh0VVnrlHh/jKP745kRPpb7Xe+7N/wvYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701716369; 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=50L2BYVyjoUpsYhKovrrrQWG0oKe1p8zfbO6viUWj2I=; b=oM1onOmk9VmrvJW865mwIRIWzi6V0MbsQF7kiP4/lM98biT1EPDTZ1iqF0Kx28trYhZRx8 AKVwB4/iF24r/Iub7ojM7qFHl0ezTF2JC9FbHx2G9VEknhbgEAnSacLCS/NitKFHviNEnZ lSHCpYCaCegHJeVI67MeSE2H/twx859y3t7w01obdkhGLPdm5AyEJ4Uz0Oveb8JF0GtNkj 07T8xKSEh7Z9+Hi8VmAzxWND2cUgLenqLXc+oe3I2ckbtrfVsgOkxWdIicmzK5wwTsXydV Gh41dQH7vaB/ZeiBMH3OMKs8DhHXybNV1SUBHEyLxvAZFqLUPQxNcl84GKVv4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701716369; a=rsa-sha256; cv=none; b=ffF56OiLhcsU9EiuXEyFlBptx/uvMLvTPPi4ZGamwNB7LnZOFB4sa3LOnCUnpsOyCjfgxm SDyINTc+0zgxea58aZkQmNoYyPDp1FIm2kkxmHYo0vlAoqLBEecEmUbIe5wTf2uVwQ9PcW TYo6R8/DABkNVKJ3ZVEkMTIjOXwggAuNEhjsVO6oMV7sP3WjZrW1EjvR4T49qC3tyDmEMy qH+OPbG55EiXfWY6FXU7dkwUU0ot0/OVrf5OYfarSIswgzXw8wLThqlzhTHwkv5QRbHPap kPOrIEpnihEPV85dRSWYHJTD4s6/lp68qGM+Twvm9Ssy8wuvFQLDJM6yQTcUwg== 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 4SkXyn4G4XzdWb; Mon, 4 Dec 2023 18:59:29 +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 3B4IxTgb043648; Mon, 4 Dec 2023 18:59:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4IxTRE043645; Mon, 4 Dec 2023 18:59:29 GMT (envelope-from git) Date: Mon, 4 Dec 2023 18:59:29 GMT Message-Id: <202312041859.3B4IxTRE043645@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: d2ef52ef3dee - main - tcp/hpts: make stacks responsible for clearing themselves out HPTS 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: d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d commit d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:19:46 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-04 18:19:46 +0000 tcp/hpts: make stacks responsible for clearing themselves out HPTS There already is the tfb_tcp_timer_stop_all method that is supposed to stop all time events associated with a given tcpcb by given stack. Some time ago it was doing actual callout_stop(). Today bbr/rack just mark their internal state as inactive in their tfb_tcp_timer_stop_all methods, but tcpcb stays in HPTS wheel and potentially called in from HPTS. Change the methods to also call tcp_hpts_remove(). Note: I'm not sure if internal flag is still relevant once we are out of HPTS wheel. Call the method when connection goes into TCP_CLOSED state, instead of calling it later when tcpcb is freed. Also call it when we switch between stacks. Reviewed by: tuexen, rrs Differential Revision: https://reviews.freebsd.org/D42857 --- sys/netinet/tcp_stacks/bbr.c | 3 +++ sys/netinet/tcp_stacks/rack.c | 4 ++++ sys/netinet/tcp_subr.c | 8 ++------ sys/netinet/tcp_usrreq.c | 6 ++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index aa78e02e39d9..5f7c6125c1f0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5278,6 +5278,9 @@ bbr_stopall(struct tcpcb *tp) bbr = (struct tcp_bbr *)tp->t_fb_ptr; bbr->rc_all_timers_stopped = 1; + + tcp_hpts_remove(tp); + return (0); } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index e7027dd1b2dd..229f36008a6a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -8213,8 +8213,12 @@ static int rack_stopall(struct tcpcb *tp) { struct tcp_rack *rack; + rack = (struct tcp_rack *)tp->t_fb_ptr; rack->t_timers_stopped = 1; + + tcp_hpts_remove(tp); + return (0); } diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b3f5375cb8cf..d951b5df938e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2379,9 +2379,6 @@ tcp_discardcb(struct tcpcb *tp) INP_WLOCK_ASSERT(inp); tcp_timer_stop(tp); - if (tp->t_fb->tfb_tcp_timer_stop_all) { - tp->t_fb->tfb_tcp_timer_stop_all(tp); - } /* free the reassembly queue, if any */ tcp_reass_flush(tp); @@ -2521,9 +2518,8 @@ tcp_close(struct tcpcb *tp) tcp_fastopen_decrement_counter(tp->t_tfo_pending); tp->t_tfo_pending = NULL; } -#ifdef TCPHPTS - tcp_hpts_remove(tp); -#endif + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); in_pcbdrop(inp); TCPSTAT_INC(tcps_closed); if (tp->t_state != TCPS_CLOSED) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 93fdedc03c7b..d3ba42fd9d06 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1743,10 +1743,8 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt) * Ensure the new stack takes ownership with a * clean slate on peak rate threshold. */ -#ifdef TCPHPTS - /* Assure that we are not on any hpts */ - tcp_hpts_remove(tp); -#endif + if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) + tp->t_fb->tfb_tcp_timer_stop_all(tp); if (blk->tfb_tcp_fb_init) { error = (*blk->tfb_tcp_fb_init)(tp, &ptr); if (error) {