From nobody Wed Apr 19 18:02:02 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 4Q1pXB6JDDz46GhN; Wed, 19 Apr 2023 18:02:02 +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 4Q1pXB5lx4z4PjG; Wed, 19 Apr 2023 18:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681927322; 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=qp9SmXSm0Dayt7m90T+edzFTWRjLB7AxtaAgBGZM7PA=; b=wiAiqRU2iNsyjAY/F2orjmMeLCXa4u81Cbb7ICMhCBTlges1BgmMcQakWIDCSdvhlebII8 07uCxexfD02y7u9TCGq0T8b8aE4vZCzOqgplpZHtbUi7xpb6PrXBsxRJpxDbkhhW6HT8Lh QPinH3rM10PoPGlWwLqNDRn00CErcAMnEheHmjIodzFwNDli3IMDlqMR8mjowBHxv4h6Em NlOnL2FNFQ2f95KBN37dRzvnUJgYKc1JDgymuejdugY8NzQB49XX29khKBkrD7mmhteAXt vtJtKGclDAKTpRpaPdXTk7XjB2GxN9mvFC8xwSxJRYLS0IJE/i9Kh1b7PUOpIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681927322; 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=qp9SmXSm0Dayt7m90T+edzFTWRjLB7AxtaAgBGZM7PA=; b=fw3vBQTafGC9ne6qrSboIeDKDMs3wp6rgCnbyMmWmhjzN1ZOuW5D1jvDFrhhkfEgNEcYkO 2PpEAiQm0t/SNKIUO06W0zvDArleIiZn3KVdK2bTN8+4DRkwrqSSTLwYXb91OIT6uRB7UV k2NKURc31Eclcqo6iUoXXDtEDWp7sxsuhOUUa7mml2/590Ow3itw3oMPCuqeIKb1Tomlaj xrL40T0XhOyeqQcO9MZP/eJPyEURxCAidKnXol0xiLINFnaEKAkNW40btfoIgSaqRTUQSn 9/VmbXAKND/9UvrKgdQS9PxriXu95XXhyGIjuHnT5hVORk0BCouAwVeljAbOAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681927322; a=rsa-sha256; cv=none; b=sDR1iPk6fmRZeJSAkbvEOd/WPgSyEaFBHn9oXA3xtZAY3D/xVF9lcrLNiG6qAIVpHxiSCx tTeVq/IQBrvCdj/jFYQROmVduCG9Q6SHywUH3jGT5ANVgxMujVr6ldMtT8wffTxwXFTHXj JHQkNjBJJJ5BcQ8SKSGFKn2oxKxqpsE+dBdY+dpKXv+D/h5YcZ52ofNnzdrUaLjvwWNFXX StFykDs7yPUfMXMFS0y84KwFujI3dCeVFmE3bs1ODhIKLAYA234GLi0MMnnDdHoz/h+Tzm SEjHRt4okxyt9LmFc88Fm5Upn38MFj0W6NTc5oDSL96LSVluTi7b2fKl+8QdBw== 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 4Q1pXB4rCdz14WG; Wed, 19 Apr 2023 18:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JI22br053945; Wed, 19 Apr 2023 18:02:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JI22EE053944; Wed, 19 Apr 2023 18:02:02 GMT (envelope-from git) Date: Wed, 19 Apr 2023 18:02:02 GMT Message-Id: <202304191802.33JI22EE053944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 4e8a20a7642a - main - tcp: rack the request level logging is a bit too noisy when doing point logging. 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e8a20a7642a4ffa694fa103ec4aa8da806f36a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8a20a7642a4ffa694fa103ec4aa8da806f36a6 commit 4e8a20a7642a4ffa694fa103ec4aa8da806f36a6 Author: Randall Stewart AuthorDate: 2023-04-19 18:02:12 +0000 Commit: Randall Stewart 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;