The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8a20a7642a4ffa694fa103ec4aa8da806f36a6
commit 4e8a20a7642a4ffa694fa103ec4aa8da806f36a6 Author: Randall Stewart <[email protected]> AuthorDate: 2023-04-19 18:02:12 +0000 Commit: Randall Stewart <[email protected]> CommitDate: 2023-04-19 18:02:12 +0000 tcp: rack the request level logging is a bit too noisy when doing point logging. When doing request level BB logging the hybrid_bw_log() does not have proper screening to minimize logging when point level logging is in use. Lets fix it properly so you have to have the proper knobs set to get the more noisy logging. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39699 --- sys/netinet/tcp_stacks/rack.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a6d5362fafb4..e0130e7fea2a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -1978,12 +1978,23 @@ rack_log_hybrid_bw(struct tcp_rack *rack, uint32_t seq, uint64_t cbw, uint64_t t * once per chunk and make up the BBpoint that can be turned on by the client. */ if ((mod == HYBRID_LOG_RATE_CAP) || (mod == HYBRID_LOG_CAP_CALC)) { + /* + * The very noisy two need to only come out when + * we have verbose logging on. + */ if (rack_verbose_logging != 0) do_log = tcp_bblogging_on(rack->rc_tp); else do_log = 0; - } else + } else if (mod != HYBRID_LOG_BW_MEASURE) { + /* + * All other less noisy logs here except the measure which + * also needs to come out on the point and the log. + */ + do_log = tcp_bblogging_on(rack->rc_tp); + } else { do_log = tcp_bblogging_point_on(rack->rc_tp, TCP_BBPOINT_REQ_LEVEL_LOGGING); + } if (do_log) { union tcp_log_stackspecific log;
