From nobody Mon Apr 7 12:53:38 2025 X-Original-To: dev-commits-src-branches@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 4ZWTfV2BVVz5tDlb; Mon, 07 Apr 2025 12:53:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWTfV1MWdz47W8; Mon, 07 Apr 2025 12:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744030418; 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=aoT1EmDSfFmrfhd1npOyluMYKom8GiOuTggcSYLQ9jE=; b=UpyTP94RmHn6ja/T9RHpViLevZdniUhD5VGoEGgknW1QUZd8eRO7XgiMjzopsp1yYZT6dA faZLv+e1Y3e7Yu9HBiXUqYPawt5+7zgRiA72WB/ZapxdRREnH78aDl53Bg1HFknXtZKuvZ LBgeq9xT0DmBLPFP1bluW9v0kOckokpAuSpGwAp2YlVRgk462KaHTqUmw4c9EZ03f/+CnK 4JthqgHRJ0LEyL2ELu8TyxqkPt3FBTbN3aSw1S4Tt0fRYh+Sm+rH4/n1e1QyTg14LUcDOt coTfhBUqM/P4SsaomyNMSL09vOleaj83cjJXKtr2zN7aQMcImIg7amyuv3qpJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744030418; a=rsa-sha256; cv=none; b=CjdI9pa6A6Ix6Y/ffDHp7+gKD1jHwiU0+pi9b3WY+Yfqh117ND+lceTDkngSeDHdYv3tq6 Vq5fkJgJkrtjfNJHNGlDIkz73ac5J9Lt5gs/8ctK7gOJox097ZAoqrPTW0bQcvEoM6Z/yf RemLzMc68+tQrAWAKNVJmnyff+m+5UAov3ur491WzzsaxDTETzT5ulEOC9mTB2RCs9ZBLs yTj0dtjAkvfKsOPcnY4hrgP6cdsPcp/VNKb8bB3E1u7Ml7xGgz/3nR4fmJ2K5NBNmL3SVq QmQ21mhRUdx1F9ZJ3f0pJUdNGU6fd1fidrSLgNOa8m9OsXKsJLPCGwovpeHUBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744030418; 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=aoT1EmDSfFmrfhd1npOyluMYKom8GiOuTggcSYLQ9jE=; b=ynJIIGnGql/K8ScBCgaWK5ZAlminawIM0s1CAjyeybD4c/Tp3CU9O+Q1Zn8s/WlKTatICp QnKdsWgAFiOV8OMjmcVLOjWmURTEfuaUgCPkpuHNVWyJCs3kYEyaoDH6vlQycasbWLs3S3 Vzp7HmIkhk14gkjPllib1fHIJtCWEm9agHrA12nuLdOqOzVSWBcLGPs7awMnJNgwF6+dBs /W/uB0vOAKKHM8RsSHnm9EVVSdjuB+EWmGvTtOOxSQHokZevpGGtCihnh9h6y6W1lK7ylZ Kooii8DUsDYnfEmXZw4JOA/CTvu+b/GUPuuGq22kMOEhp5Fd2trVUp501IazMQ== 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 4ZWTfV0pmQznmD; Mon, 07 Apr 2025 12:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 537Crcss049103; Mon, 7 Apr 2025 12:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537CrcIq049100; Mon, 7 Apr 2025 12:53:38 GMT (envelope-from git) Date: Mon, 7 Apr 2025 12:53:38 GMT Message-Id: <202504071253.537CrcIq049100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: b95d16f39d68 - stable/14 - tcp: improve initializing the fields in tcp_log_buffer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b95d16f39d68b6cb85fbfd7786e801f841bd24cb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b95d16f39d68b6cb85fbfd7786e801f841bd24cb commit b95d16f39d68b6cb85fbfd7786e801f841bd24cb Author: Michael Tuexen AuthorDate: 2025-04-03 06:59:46 +0000 Commit: Michael Tuexen CommitDate: 2025-04-07 12:53:07 +0000 tcp: improve initializing the fields in tcp_log_buffer Initialize the fields in the tcp_log_buffer in the sequence they appear in the structure and add the initialization of tlb_flex1, tlb_flex2, and _pad[]. Reviewed by: rrs, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49652 (cherry picked from commit 94acddd2ad0142221124c3fb7fe3778a5a1f8036) --- sys/netinet/tcp_log_buf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 7b937958a4fb..e9ad05382b81 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -1857,16 +1857,21 @@ retry: COPY_STAT_T(rttvar); COPY_STAT(rcv_up); COPY_STAT(rcv_adv); + COPY_STAT_T(flags2); COPY_STAT(rcv_nxt); COPY_STAT(rcv_wnd); COPY_STAT_T(dupacks); COPY_STAT_T(segqlen); COPY_STAT(snd_numholes); - COPY_STAT(snd_scale); - COPY_STAT(rcv_scale); - COPY_STAT_T(flags2); + log_buf->tlb_flex1 = 0; + log_buf->tlb_flex2 = 0; COPY_STAT_T(fbyte_in); COPY_STAT_T(fbyte_out); + COPY_STAT(snd_scale); + COPY_STAT(rcv_scale); + log_buf->_pad[0] = 0; + log_buf->_pad[1] = 0; + log_buf->_pad[2] = 0; #undef COPY_STAT #undef COPY_STAT_T /* Copy stack-specific info. */