From nobody Fri Nov 4 09:42:35 2022 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 4N3bJX1yVbz4hZ1m; Fri, 4 Nov 2022 09:42:36 +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 4N3bJX16RYz3XvD; Fri, 4 Nov 2022 09:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667554956; 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=XyQuRrAf6JylujyxQNTkNT7zzpXnxY+rxCHH1lf732I=; b=Qcf+vHtovddhV3RkOc5E2Iorn66Tj83g8uFnGSBYokq11eL8DzNmxIInOGmWGqWOPjw3pN n935WDvuSb7ogF32X2P+57YihGuT1LVh7Toj5ZQGhw/O/hlmgyTWaG5duDYHpoE8hQ0POm FL8iMgtP58jKWJWBLy2UGBRd4vMkAkl2MVEaI8I2YK4VgXKG9XSHb3yoGwXly8m1k+qNzt I4xQ11YDd+EMf60hRSSRqh7bwOYWpa9AGiH1oRiYqD72IDuEc3NhIgDPClMP9S0dewdZPm XmFdojq3wvChynqK0tJnUrZaiZSl73mOUQ3Sjfxb6L7ag05NYDxsVWQpSYCmMw== 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 4N3bJX07gPz1B5n; Fri, 4 Nov 2022 09:42:36 +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 2A49gZfD014083; Fri, 4 Nov 2022 09:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A49gZ5L014082; Fri, 4 Nov 2022 09:42:35 GMT (envelope-from git) Date: Fri, 4 Nov 2022 09:42:35 GMT Message-Id: <202211040942.2A49gZ5L014082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 3708c3d370f2 - main - 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3708c3d370f26af0841cd3e97bf569d39c42953b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667554956; 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=XyQuRrAf6JylujyxQNTkNT7zzpXnxY+rxCHH1lf732I=; b=f3UUS7DvzGXN+x97AQeOcNNZdtNOufa5ZrI3c2wZZ5CaGPse1rSTYArx9Xc8ug0kfiAmb3 BBsymcQ+ykpLtd+L9/8u7XtdMCE4S6V+7ugjFwTjU6p0HXPv+PP0NqJEvqV7H3Sv3+3ua9 gUAB5iNv39Gy2FNUzCi+tBPlpdQCiB1NcL4wymgRUafZ23rQrxqhghhcHeyGv1EyNef/GB 2dEGhawPgRR2mTA62W5xRjBQnTVaH8rolmzk2WWerRJIZq0U06yvc8QirLS+D4iJYdreL/ Isu1LbklQ3LuzJrOqDpn24eBNCsEBCblwBw4jHBurEQxVgCwh1eKfgGXZvF3xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667554956; a=rsa-sha256; cv=none; b=VgtUGKgVvnBdzoTFj32YLKmA1pSYa4l/xcSOVyabb3IFtNNt/diDMDAInJ7b9JoNpdzWWE aF+Cw5uu5kD3nFQcwH1UdLR1sFQkL8le3jElNgJphBjxo3b8ShZGlPZdEdVViZ8BBKvb4U zhhmK18fIU88vFNdwFhZracV3Zh7mFDvfw4mY9kbKqhDBegoqg358kLe/TOwxri6vYDGMq hr261/4JymNz6iJheu659Ob9l+bLXQEgT1n5OZcSURjOkb0PltOdv/WcqNi85es0C5OTHc mQEVTTuhUcaf4pNn9iuHY6qeOe5YcWxsDc77DuByENc6XIUXcPgYvpu4wvWqTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=3708c3d370f26af0841cd3e97bf569d39c42953b commit 3708c3d370f26af0841cd3e97bf569d39c42953b Author: Richard Scheffenegger AuthorDate: 2022-11-04 09:18:41 +0000 Commit: Richard Scheffenegger CommitDate: 2022-11-04 09:18:53 +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 --- sys/netinet/tcp.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 6a3603287f5d..7bb2efe5fae0 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -389,8 +389,17 @@ 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_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[19]; /* Padding. */ }; /*