From nobody Mon Feb 20 22:33:47 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 4PLHJW38N8z3sJ5S; Mon, 20 Feb 2023 22:33:47 +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 4PLHJW1k3Wz3tJ2; Mon, 20 Feb 2023 22:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676932427; 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=Zn5ok30TLfsaPPB/Oo5JHpTZGUhutBkWkzWiFXccP4k=; b=whQM+UI2ZRcdjMETZd7o1NY/OFg0LYP4H5DDpw6h48idR3K0gEXLafpiA9C0BdlZoQFaX4 OME/W+eN9I9W64OmcciPjcWCdhYt1M/NgvVBFiVybxotN3jPwvZyzNbF8R/dc75U0e704Q pcviHSZYHO6vaouq4E3Gi1kDJvDZmzXOWWmICVRJ71d9IT92M/j1KVYAdATnKa1NdwKQON T7YQB0Z2cw1GlZM3/N/S7O0cXcr28DRQXM9NmU5YAy6q9FkPNMKbwjygPUJPE0cMMbFTAG QIiELoEK7hZbP8vleN5Kq1S/zMgXmMfi8jEqbAsCGYCRiajG50ktJGqJjcCAFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676932427; 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=Zn5ok30TLfsaPPB/Oo5JHpTZGUhutBkWkzWiFXccP4k=; b=gJomJ74FJKYdOfD0QAR52RSKDqdyJgVrkp0UP1NqyH1meRKuYkWIkIX6fG8wNifCU7KFQX 6Sh5O8ABp54I9Lpg+7P0r+hGTOorxE3X+I5kkqaOzki667WH1L7K1be8D4C4VLkXWXY4A2 dKLTDGxsDXnrnl/YyWEV63OOqB52yTQfdlcObTd+evOnYv1VmrtszGtO/W240P4KtO1lan gOVV3e4o3FjBW44yhvigB3L9UGmOTtVRnypDPFsst9MyPIm8j+mI2dwyHuREWGdrE2WWJd 21l8AjDy4sBnhkSw4veYCH6ZM0BJzND0MGiHxQvTH4La/825Iexo02D3GxnM6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676932427; a=rsa-sha256; cv=none; b=HEj33gMs2zYki5lQ7BQ3+WenvkuhUeOhV502JDtEayCmTaYWDS+GfOTM/3Isk708BM5uts SzW61TG+5JqDPFmxLb/VwQjaIV1XORt5SJBgqIs+IHzpWbJZWJL5ZUz1lOgTBBThV9HMBs Z2MQryevX5wmf5k7SWuUmCpLNHnEjLtUQ8AiS8LgdC8dOUqIVHdSWRGOnV4QCJ6vo1ol2M 7Fnx/BXj+IfFQebxIjgarGGgFtTcI2PyUXxqChsXeW8hfdRqSlzlL7vA/lhwAU7MuuauyK 898Qxp1DPmlZtSTDoVl2ZdW8pa6AEtuar3iRThXG9Igc3ZdFmXs7//hISNliRw== 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 4PLHJW0pTGzy14; Mon, 20 Feb 2023 22:33:47 +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 31KMXlvc096189; Mon, 20 Feb 2023 22:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KMXl8q096188; Mon, 20 Feb 2023 22:33:47 GMT (envelope-from git) Date: Mon, 20 Feb 2023 22:33:47 GMT Message-Id: <202302202233.31KMXl8q096188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b16a37eda8b1 - main - bblog: sync tcp_log_events with Netflix tree 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b16a37eda8b1074767d8bc6c2508a28cf1d99270 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b16a37eda8b1074767d8bc6c2508a28cf1d99270 commit b16a37eda8b1074767d8bc6c2508a28cf1d99270 Author: Michael Tuexen AuthorDate: 2023-02-20 20:42:57 +0000 Commit: Michael Tuexen CommitDate: 2023-02-20 20:42:57 +0000 bblog: sync tcp_log_events with Netflix tree This allows the addition of entries to tcp_log_events without causing conflicts in the Netflix tree. rrs@ will upstream the related functional changes eventually. Reviewed by: guest-ccui@, rrs@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D38646 --- sys/netinet/tcp_log_buf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 48bc584aa0dc..3c6569cffafd 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -238,7 +238,9 @@ enum tcp_log_events { TCP_HYSTART, /* TCP Hystart logging 65 */ TCP_CHG_QUERY, /* Change query during fnc_init() 66 */ TCP_RACK_LOG_COLLAPSE, /* Window collapse by peer 67 */ - TCP_LOG_END /* End (keep at end) 68 */ + TCP_RACK_TP_TRIGGERED, /* A rack tracepoint is triggered 68 */ + TCP_HYBRID_PACING_LOG, /* Hybrid pacing log 69 */ + TCP_LOG_END /* End (keep at end) 70 */ }; enum tcp_log_states {