From nobody Fri Sep 5 07:02:15 2025 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 4cJ6jN1ZqWz67CVK; Fri, 05 Sep 2025 07:02:16 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ6jM6S1nz3xgh; Fri, 05 Sep 2025 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055735; 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=yCB1F4m/Ax6c4POq1OWLUvqKTvjtzmEgZ1MGUuWLivk=; b=OuTg3sAKypg6CvSOYbOfW5VeezoKzFhGEH9LyThasPifzW97P6Fa368Gj8+e6AUNBfjYUv 6YOgOOQb2gMzq7B7Dj+Bt/1IxbU2yj615Moh7bnaWq0J6ohlGWY9QahPfzftACh4b3J4qQ 9F3RQNzfD+lYm3qWBUd30/FADr7TtoJsPpK7Uni6PrbC9M3CcZxsSlpkEVe9EDe2THgrKk y5YKUqNHj3zi3RNiHmMI+DdizxllXN2gs2xfsRbCXF9W/9TVSlpvoYVf3E3oGtmMlNrqfF 0YQ3nWiOk8bXaj1Z4osYuuFkUMZV6FuRtUWfl5rW8uToiOkle37AhCdY3DtsNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757055735; 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=yCB1F4m/Ax6c4POq1OWLUvqKTvjtzmEgZ1MGUuWLivk=; b=BbCPG50B+RlkuD7hPPWf+Ksg3JFDjQUq8tWOa/DlzuXjrT75QMrx1lxbzXmEYul97Nue+S mgZI9yxtES7FfJzt9DRr/vO9ykrrI+YZ8VDJsqtqFFp65WftcXDBwA6BbXdb5MYx4dvAjy N1LxEdH3vDCkH87ElSn7upoGYfiAb95CvuI+nKzVnAnBIhZg6descym0+5Mibj5I8tytZd Tfbr2xTEMyhRyIhM+/bKTdJj1iJuXw5noQpQy6PljFGelDe3Xmpkz95A3IoxYq8FbzDAsO 34ktDlhLm5xKVB3QFqnC2V+vFjaweaUCuzrmaNuPJvIakuE9ujHukTrX5VhBlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757055735; a=rsa-sha256; cv=none; b=K0oucKVflOewt1L9zyNSGZgMdTYYXyICkL7uoTb0PCqwOHzwh6o166Vcuzbj2scN1bpOlD DHKHShK0FAOw2klsHTzjm1QseQWM9Qe5qYDFeoWRq6Xv9z6uOuIDekFiZcC3oE5VXFMvwF s9kmS40oSgo3uDEl/uHvokNLfNuzfIjiL1wR4fWeW0Zh8RaUVuA4WEZSSNozWDXGNXTf6c DrZBQxFI48VC3eXgByN4Z1ekDawhSVEThquhPxX0XiFR4ATLQJzHDT4n35eRatwq6eNVZj 6Ib+xIVhUSGs049WgRf9WgZOK4V/XNbykFkWWifKsc29bmQnZEOuxV07kGbxKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJ6jM6241zdwZ; Fri, 05 Sep 2025 07:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58572FFf082836; Fri, 5 Sep 2025 07:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58572FSv082833; Fri, 5 Sep 2025 07:02:15 GMT (envelope-from git) Date: Fri, 5 Sep 2025 07:02:15 GMT Message-Id: <202509050702.58572FSv082833@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: ff3299366f21 - stable/14 - tcp: remove duplicate tcp_bblogging_on checks 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ff3299366f214c589dcb82f02c4f0db2495dd38e Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3299366f214c589dcb82f02c4f0db2495dd38e commit ff3299366f214c589dcb82f02c4f0db2495dd38e Author: Nick Banks AuthorDate: 2025-07-20 11:28:35 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:57:54 +0000 tcp: remove duplicate tcp_bblogging_on checks Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit a1fa30cea6e3bc66ba7243c69f2e5248ea3f79d5) --- sys/netinet/tcp_hpts.c | 70 +++++++++++++++++++++++------------------------ sys/netinet/tcp_log_buf.c | 2 +- sys/netinet/tcp_log_buf.h | 8 +++--- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 068728f254cb..da5fde91a132 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -432,38 +432,40 @@ static void tcp_hpts_log(struct tcp_hpts_entry *hpts, struct tcpcb *tp, struct timeval *tv, int slots_to_run, int idx, int from_callout) { - union tcp_log_stackspecific log; - /* - * Unused logs are - * 64 bit - delRate, rttProp, bw_inuse - * 16 bit - cwnd_gain - * 8 bit - bbr_state, bbr_substate, inhpts; - */ - memset(&log, 0, sizeof(log)); - log.u_bbr.flex1 = hpts->p_nxt_slot; - log.u_bbr.flex2 = hpts->p_cur_slot; - log.u_bbr.flex3 = hpts->p_prev_slot; - log.u_bbr.flex4 = idx; - log.u_bbr.flex5 = hpts->p_curtick; - log.u_bbr.flex6 = hpts->p_on_queue_cnt; - log.u_bbr.flex7 = hpts->p_cpu; - log.u_bbr.flex8 = (uint8_t)from_callout; - log.u_bbr.inflight = slots_to_run; - log.u_bbr.applimited = hpts->overidden_sleep; - log.u_bbr.delivered = hpts->saved_curtick; - log.u_bbr.timeStamp = tcp_tv_to_usectick(tv); - log.u_bbr.epoch = hpts->saved_curslot; - log.u_bbr.lt_epoch = hpts->saved_prev_slot; - log.u_bbr.pkts_out = hpts->p_delayed_by; - log.u_bbr.lost = hpts->p_hpts_sleep_time; - log.u_bbr.pacing_gain = hpts->p_cpu; - log.u_bbr.pkt_epoch = hpts->p_runningslot; - log.u_bbr.use_lt_bw = 1; - TCP_LOG_EVENTP(tp, NULL, - &tptosocket(tp)->so_rcv, - &tptosocket(tp)->so_snd, - BBR_LOG_HPTSDIAG, 0, - 0, &log, false, tv); + if (hpts_does_tp_logging && tcp_bblogging_on(tp)) { + union tcp_log_stackspecific log; + /* + * Unused logs are + * 64 bit - delRate, rttProp, bw_inuse + * 16 bit - cwnd_gain + * 8 bit - bbr_state, bbr_substate, inhpts; + */ + memset(&log, 0, sizeof(log)); + log.u_bbr.flex1 = hpts->p_nxt_slot; + log.u_bbr.flex2 = hpts->p_cur_slot; + log.u_bbr.flex3 = hpts->p_prev_slot; + log.u_bbr.flex4 = idx; + log.u_bbr.flex5 = hpts->p_curtick; + log.u_bbr.flex6 = hpts->p_on_queue_cnt; + log.u_bbr.flex7 = hpts->p_cpu; + log.u_bbr.flex8 = (uint8_t)from_callout; + log.u_bbr.inflight = slots_to_run; + log.u_bbr.applimited = hpts->overidden_sleep; + log.u_bbr.delivered = hpts->saved_curtick; + log.u_bbr.timeStamp = tcp_tv_to_usectick(tv); + log.u_bbr.epoch = hpts->saved_curslot; + log.u_bbr.lt_epoch = hpts->saved_prev_slot; + log.u_bbr.pkts_out = hpts->p_delayed_by; + log.u_bbr.lost = hpts->p_hpts_sleep_time; + log.u_bbr.pacing_gain = hpts->p_cpu; + log.u_bbr.pkt_epoch = hpts->p_runningslot; + log.u_bbr.use_lt_bw = 1; + TCP_LOG_EVENTP(tp, NULL, + &tptosocket(tp)->so_rcv, + &tptosocket(tp)->so_snd, + BBR_LOG_HPTSDIAG, 0, + 0, &log, false, tv); + } } static void @@ -1349,9 +1351,7 @@ again: } CURVNET_SET(inp->inp_vnet); /* Lets do any logging that we might want to */ - if (hpts_does_tp_logging && tcp_bblogging_on(tp)) { - tcp_hpts_log(hpts, tp, &tv, slots_to_run, i, from_callout); - } + tcp_hpts_log(hpts, tp, &tv, slots_to_run, i, from_callout); if (tp->t_fb_ptr != NULL) { kern_prefetch(tp->t_fb_ptr, &did_prefetch); diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index fa6394065da6..473c534ef83d 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -2881,7 +2881,7 @@ tcp_log_sendfile(struct socket *so, off_t offset, size_t nbytes, int flags) /* double check log state now that we have the lock */ if (inp->inp_flags & INP_DROPPED) goto done; - if (tp->_t_logstate != TCP_LOG_STATE_OFF) { + if (tcp_bblogging_on(tp)) { struct timeval tv; tcp_log_eventspecific_t log; diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 363ea13b1743..20b128a6ac70 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -536,12 +536,12 @@ struct tcpcb; NULL, NULL, 0, NULL); \ } while (0) #endif /* TCP_LOG_FORCEVERBOSE */ +/* Assumes/requires the caller has already checked tcp_bblogging_on(tp). */ #define TCP_LOG_EVENTP(tp, th, rxbuf, txbuf, eventid, errornum, len, stackinfo, th_hostorder, tv) \ do { \ - if (tcp_bblogging_on(tp)) \ - tcp_log_event(tp, th, rxbuf, txbuf, eventid, \ - errornum, len, stackinfo, th_hostorder, \ - NULL, NULL, 0, tv); \ + KASSERT(tcp_bblogging_on(tp), ("bblogging is off")); \ + tcp_log_event(tp, th, rxbuf, txbuf, eventid, errornum, len, \ + stackinfo, th_hostorder, NULL, NULL, 0, tv); \ } while (0) #ifdef TCP_BLACKBOX