From nobody Wed Feb 5 18:23:04 2025 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 4Yp7rm5ygRz5n8PQ; Wed, 05 Feb 2025 18:23:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp7rm5KLrz3T0n; Wed, 05 Feb 2025 18:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738779784; 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=Ot4exR5w2Rz1SjSJ6P4bcagd6GpaUyj+mka3neNyCkc=; b=U0fQXgrAhlpfipsQbxuRMNGahmkpzEInIc8Ze4uf1toZWSOgX6IkGDDF/w8B7553iwTWm1 g2yLTZeZZj8RWn4IrH7gRmOG1Kwsr0MAZAfL9L41tCrLvBmS3XhGKUbrw0EfAO1XB5kE7t UPdch4I6yc+D2P1UMRYYUbf9gxwZNdn//2Gzon72IwDx363vKDOYawBgOksyk+R6c3hosa iBz8VxnQmkpdqIkyQP7Ckt4XomK8QRc5FdowkCjLe6zlcZ9so4dYqBzEv3wubrDBxGEWiH UETare6lL36zAGxANKefHRmorzl2qt3BAoQEpkxg6KPHXeDo8vP/GNf4ckAPcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738779784; 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=Ot4exR5w2Rz1SjSJ6P4bcagd6GpaUyj+mka3neNyCkc=; b=gKsXUkMRP1inBDok1koVVoTxM3xjyOdiT1RJSbyWUEtNK6o+hD7W+DEEMqS3267uu3KUI5 VcFR0K6YFrFfSnoPSQ4bVIFTl4NvFj207FsSD+NVJMCg6bC4nKppa1FXfmKhN4F9CDb+fS KDgAByskDGFk/eKXiSHKrKHkgCMwDFTnbwl6OV0dm23Rp4bDxgUbhKz5hbAVUUeKvagdEY k44i1tYAL90LvPzKxKDgY8Cg07mA563UTNnedGga3Be0k20RQq6FcKncyIyr1ens+VUDDo X//T4n1yBJLfrrlxFsB6olZmMZKGKRfxNBEyfPqrS73cDERUmKbGLhPhTdCPiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738779784; a=rsa-sha256; cv=none; b=lg8+ymxEDbwxkFdUTEoPAsI57+q/ksawwYk6n6c3xZwj6+OEftDsSw6CQZ/SmxuNX5Y5K3 O7HkWpEAyBu0Vp4cX5/9tEgs5nLEkNC2r/D2G9siPYyhx45gpPmvNwNavqGTIX/QGtenHK XUwzPB25yAhgZBUCc1tLrLSi2jNyqK6FTl5/gUTzdXc4i60mmTuc1A3eaY19UssqW5Ljx/ 5nWcrzLaQgFTupOgMCHfFzhrTIpP8NOwrSdN9Wk9Lc5kmJ0tYF6/qwki4vnvhVjBdxGHZc t14dzaJicnsqHh3cdaMJTgjIcJe4uEz3KhZ9RZkyKsA1Crmezs4oe1oQr4farg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp7rm4t3lz13Bk; Wed, 05 Feb 2025 18:23:04 +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 515IN4Ms017748; Wed, 5 Feb 2025 18:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515IN4Dm017745; Wed, 5 Feb 2025 18:23:04 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:23:04 GMT Message-Id: <202502051823.515IN4Dm017745@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: 08398b84ef15 - stable/14 - tcp: define tcp_lro_log() only when TCP_BLACKBOX is defined 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 08398b84ef15c9cfeb667d08968bfd54b991f643 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=08398b84ef15c9cfeb667d08968bfd54b991f643 commit 08398b84ef15c9cfeb667d08968bfd54b991f643 Author: Michael Tuexen AuthorDate: 2024-11-17 18:16:27 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 07:17:23 +0000 tcp: define tcp_lro_log() only when TCP_BLACKBOX is defined Reviewed by: rrs, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D47401 (cherry picked from commit 8caa2f5351ded559c68ba0cd4713e00136801bd9) --- sys/netinet/tcp_lro_hpts.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index cd757d5a6164..f563956ff7a7 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -61,7 +61,9 @@ #include #include #include +#ifdef TCP_BLACKBOX #include +#endif static void build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, @@ -147,6 +149,7 @@ tcp_lro_check_wake_status(struct tcpcb *tp) return (false); } +#ifdef TCP_BLACKBOX static void tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, const struct lro_entry *le, const struct mbuf *m, @@ -196,6 +199,7 @@ tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, TCP_LOG_LRO, 0, 0, &log, false, &tv); } } +#endif static struct mbuf * tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, @@ -208,7 +212,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt); if (m != NULL && (m->m_flags & M_ACKCMP) != 0) { if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) { +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0); +#endif *new_m = 0; counter_u64_add(tcp_extra_mbuf, 1); return (m); @@ -219,7 +225,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, } } /* Decide mbuf size. */ +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0); +#endif if (tp->t_flags2 & TF2_MBUF_L_ACKS) m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR); else @@ -611,13 +619,19 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) * ack will be required. */ cmp = NULL; +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 25, 0, 0, 0, 0); +#endif } else if (mv_to != NULL) { /* We are asked to move pp up */ pp = &mv_to->m_nextpkt; +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 24, 0, 0, 0, 0); } else tcp_lro_log(tp, lc, le, NULL, 26, 0, 0, 0, 0); +#else + } +#endif } /* Update "m_last_mbuf", if any. */ if (pp == &le->m_head) @@ -628,7 +642,9 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) /* Check if any data mbufs left. */ if (le->m_head != NULL) { counter_u64_add(tcp_inp_lro_direct_queue, 1); +#ifdef TCP_BLACKBOX tcp_lro_log(tp, lc, le, NULL, 22, 1, tp->t_flags2, 0, 1); +#endif tcp_queue_pkts(tp, le); } if (should_wake) {