From nobody Sat Jan 06 19:25:31 2024 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 4T6qzb3lN6z571Q0; Sat, 6 Jan 2024 19:25:31 +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 4T6qzb2tx8z3ww7; Sat, 6 Jan 2024 19:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569131; 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=Wj3hWvkuR6LsauI0hZE3IjNFCTt8MuUk4o2DEvaSfDE=; b=uyYCzQqyGrmPTta9cBQtIx0gL0SSEe+3HKUAsusSGhv5UfanCvSMusCUmkfgysfiGzvw9m o+Dcr6IIy7o7j6zcBd3nfKj+aLj2BEjuoH6SehyRwcRRTZkGl2sZ8+H27eTxIIniDpUlGU 61sdZDABzPZ4cQyPHlCPyeL5gtGRjZatYEQdgK68s64eOScTDWXxbaPgbyF7gXxh6YHrGW 84gNtzoZel9hUWJH6ZdGv/fWiNTvQ2wBNBVMbTfg/g1Was3kqP+G1wN3QPiwYsjLmix3jl CzlvswrjwnJ8+SmoieUoYBrchJ0e14D2D5kCIu8QAC9o6qtHo/zNBz4nM2FIsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569131; 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=Wj3hWvkuR6LsauI0hZE3IjNFCTt8MuUk4o2DEvaSfDE=; b=m229JPHLaJ8opvwONW1wUnpXECNLTebKKMRpvrmaMCzQTeR6+AgwW5MAImHQdAXBiqOKpr ZVfaG9m6a0CGl255li03BXN+9nOx/Bbss6ZGC+OBg63Jt/ZMAqdQFFVRoMPwZYkTzZetx0 ZPPDDQwFJQC8gIy3XHoB179sC/yK+Q/b2nTdExTy+H7Kij5eBlcXnvha34aNBrtNtxwNz/ 5BkZKevPUV0+7wLzDbLT9IJCorLa+d8NTFlFJl6MsDqcJf0GfobqzR1FphF1EypDbYgyyn cRnXEEqrI5Y2tNWAiQoozBKIZTJj507bMamrGDWECNslRDn98xY6VgGq2llxcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704569131; a=rsa-sha256; cv=none; b=JIZZ8kMTIe7m98hfo4hSAdASx35RAOuuhHRJj9kWHjaVapU/VY0Vie/FoSUiVm5UMAeuxu QRB2naMKrz4xA06FrRjK/xvCphtT3QPWq1h9+peGKxjm8uRGcOsQ7nV9vRkl8vE0cNycJB Cb1soj9iVb4lWUxyhFrpdUA68qNdc19bgl2QYmIPES72PSpKWvpvBbyIHCKCd+PcfKaUi+ pQEbjOnDkHtflaGaYz3Nfp7aOICXgOqVhA5ysSJurekKFkg3sKo2emdu3faOFMaajhhY7U DhhvxE35qmowc85Dt6VhG7xlGYA7oSmP7OQLe7L+utBuu4NYoioxX/9Z61LAPw== 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 4T6qzb1v78ztrJ; Sat, 6 Jan 2024 19:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 406JPV3O065148; Sat, 6 Jan 2024 19:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406JPVed065145; Sat, 6 Jan 2024 19:25:31 GMT (envelope-from git) Date: Sat, 6 Jan 2024 19:25:31 GMT Message-Id: <202401061925.406JPVed065145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 03d636e4bf57 - stable/13 - tcp: reserve tcp_info counters for AccECN 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: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 03d636e4bf574775290934ef31e7a00b0eb52603 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=03d636e4bf574775290934ef31e7a00b0eb52603 commit 03d636e4bf574775290934ef31e7a00b0eb52603 Author: Richard Scheffenegger AuthorDate: 2022-11-04 09:18:41 +0000 Commit: Marius Strobl CommitDate: 2024-01-05 22:48:34 +0000 tcp: reserve tcp_info counters for AccECN Marking all new fields unused (__xxx). No functional change. Reviewed By: tuexen, rrs, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D37016 (cherry picked from commit 3708c3d370f26af0841cd3e97bf569d39c42953b) --- sys/netinet/tcp.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index febd96d47efe..16307161e6ac 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -388,8 +388,18 @@ struct tcp_info { u_int32_t tcpi_rcv_ooopack; /* Out-of-order packets */ u_int32_t tcpi_snd_zerowin; /* Zero-sized windows sent */ + /* Accurate ECN counters. */ + u_int32_t __tcpi_delivered_ce; + u_int32_t __tcpi_received_ce; /* # of CE marks received */ + u_int32_t __tcpi_delivered_e1_bytes; + u_int32_t __tcpi_delivered_e0_bytes; + u_int32_t __tcpi_delivered_ce_bytes; + u_int32_t __tcpi_received_e1_bytes; + u_int32_t __tcpi_received_e0_bytes; + u_int32_t __tcpi_received_ce_bytes; + /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[26]; /* Padding. */ + u_int32_t __tcpi_pad[18]; /* Padding. */ }; /*