From nobody Thu Sep 4 20:02:38 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 4cHr4G570Sz66gRy; Thu, 04 Sep 2025 20:02:38 +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 4cHr4G4Q5Cz3ZHG; Thu, 04 Sep 2025 20:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016158; 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=OnmELtPV+9s6itFk0I5cKQ3hVzWhico6mxQAp98+f0s=; b=O2bgNxNXTlJyubvHO74jitcLfClVPmJOZyVn6Oqzu22tavwtmr67noMYKCSMAHSwX4wfxN uzbyJcMit6GjPJArmQ8HAQJ2Hn8wXSGJ7gRHYCh7SnV3oDpsVtVVkMF7augNmIHWlFUx5j hj5vIiOqs+3Ec2gekzGzfToeHOGhdY9oOvkycPk/sKsDco9ZndkrnggK48WZ2lmbUiw3r7 IltvOP8cj86UXtsaA/QcQPkdtVwXQ1MM/smrpJJXWEqb78tgStdSVq3v5UBE9XuvSsumgZ vKZX7HSbIy624V3eBOtno5zng60tZauwXK1skBWv+gdKIsWrKrUd8x7b0+Rt4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016158; 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=OnmELtPV+9s6itFk0I5cKQ3hVzWhico6mxQAp98+f0s=; b=ECoLJW1KggBQsHCmyfjC9R6324oGkS4OYykc21X8scCRBjoMP2e1UMLeD/5yZlAT9EKSjA Rif2b+h4E5UCJQo6FkeQmBA24NfH+v4R7zpv8ExgfZnelsUVRQHfMTtS7RLbE1mpXEPqKa PluDUSuCETbP733MlmumBCAZDD+4AEABYA775dKPebLmPeKn532PSGa8iJuCoZfXMPwRua 88sKj7rfBlkNuW0p5MAiaHI5pTwICNP9hsWlcIrdOhOMv+HBAcK1dFSZwTzccgMLkvW26G HSyto0W3oOx8BWDlTSoeX9AZgK89jVKy4qL8U9aQOmKfQVWvtE4DIwJHK5jp+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016158; a=rsa-sha256; cv=none; b=xkTJQIgtLu906iM8zaufzU647EU8N9CR46geQbAJQl3R8nhzI4BERZiGrkg45fxqBQ4Spe uaaE5KvQ7WIq7nWio+pdGAG37Zj5CQc07Gp468++lMQK9pbcQcBgkGnUTNELkNFfeKK/zv C9yU5BD6stOkY0QULRbiqApmqwRO5c/kvyu6iVtVUBJY35yyIFK3LYbwIhaALCHdbgNg0B ZT9Nt+n1wpOuvdL4n+g0gndbFdySLGEgBLJ2EALzpLl0FPoaABl/aOVP/daJKlutPzEPEn Zvma2SBrtq4J1H9TnbWN2O4fuciktdyBTRCeP7xrkmTcsnbOxKdBRIXtKmCFjA== 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 4cHr4G3wF1z2pj; Thu, 04 Sep 2025 20:02:38 +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 584K2cc2046047; Thu, 4 Sep 2025 20:02:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K2c7w046044; Thu, 4 Sep 2025 20:02:38 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:02:38 GMT Message-Id: <202509042002.584K2c7w046044@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: 9506da19ca73 - stable/14 - ddb: fix handling of BBLog entries when BBLog is disabled 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: 9506da19ca73f54c277ffa9fd89a774a6117d2d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9506da19ca73f54c277ffa9fd89a774a6117d2d0 commit 9506da19ca73f54c277ffa9fd89a774a6117d2d0 Author: Michael Tuexen AuthorDate: 2025-06-10 16:32:39 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:02:16 +0000 ddb: fix handling of BBLog entries when BBLog is disabled Fixes: a62c6b0de48a ("ddb: add optional printing of BBLog entries") Sponsored by: Netflix, Inc. (cherry picked from commit 0dc78204a7dcbc51bfab4c701e1335084548bc05) --- sys/netinet/tcp_log_buf.h | 7 +++---- sys/netinet/tcp_usrreq.c | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 7755fbccdb45..363ea13b1743 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -567,6 +567,9 @@ void tcp_log_flowend(struct tcpcb *tp); void tcp_log_sendfile(struct socket *so, off_t offset, size_t nbytes, int flags); int tcp_log_apply_ratio(struct tcpcb *tp, int ratio); +#ifdef DDB +void db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent); +#endif #else /* !TCP_BLACKBOX */ #define tcp_log_verbose (false) @@ -582,9 +585,5 @@ tcp_log_event(struct tcpcb *tp, struct tcphdr *th, struct sockbuf *rxbuf, } #endif /* TCP_BLACKBOX */ -#ifdef DDB -void db_print_bblog_entries(struct tcp_log_stailq *log_entries, int indent); -#endif - #endif /* _KERNEL */ #endif /* __tcp_log_buf_h__ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 89bc019e8884..daa04845ab79 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3243,7 +3243,12 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) tp->t_lognum, tp->t_loglimit, tp->t_logsn); if (show_bblog) { +#ifdef TCP_BLACKBOX db_print_bblog_entries(&tp->t_logs, indent); +#else + db_print_indent(indent); + db_printf("BBLog not supported\n"); +#endif } }