From nobody Sat Jul 1 08:00:59 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 4QtPkz2jd4z4kpTc; Sat, 1 Jul 2023 08:00:59 +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 4QtPkz27fpz42Mb; Sat, 1 Jul 2023 08:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688198459; 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=aRyCmJMwjrpFRgjRjUh+Zrr34t95QurcbKg65X1MI7Y=; b=aBwutRVlan629sMsCY4P5eh5CMLGR7TjeFB8EkMpnqs1soNyWUpMfm8LJnqOELk0M3PSwD t7qiZUlB5cxdj4T0r2d89HJ4ZT6q6NjWN2oSdLwW7tJOSZCXwNI7BDpGai3ycfTuYk2mah v3YoPQ0b8qeZen2UYnSFnJ5Bz1djCMTtzWfeNHLeiPl8iio6NKmR1LzBTLX6TxCq+DSEUT uxBc1/7UemcbRhZ6D4mU17sz5FlUhnTTNWdSTEIi9inrU+LTg+8UNlXaDXLtt5QpW6pMez 0+XCC1Ak+SbUJOdXNdTiCClyh0kamioldYs47EBS0Co0sDNM2SnlEnnNI84S5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688198459; 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=aRyCmJMwjrpFRgjRjUh+Zrr34t95QurcbKg65X1MI7Y=; b=yKk19Ub4T/xBEb/KW/ldoOUNfTD8ecuPOnWE2YQXXLqz9ScdsT+HSlUVUVgNuzhQJ4Jy+u JFcP+xXwgePzuQRDbQeHqVnCYSuv67n0TLhs18OYtWkqNzRa56iXRzgYTWf6CQ06ICWE+a JKSNh/R2XfPPNyotFEC3T5RQDka01cVQ50sVOgDynF5PGpY5LQMBiRrv+yRu2iyAFxw1BG ow/YJ/p4+iVp+O2lr/0vfifL6B1ydAQzTjem/cf3RUPAPNFGQtMQb4GRH/H090YURB/GPf cSqYXeQgq0kOas/KBsthYc72Bsxo2Cdz8nQ9yOa1+axkrQ5YiJRKYU8k6o9cGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688198459; a=rsa-sha256; cv=none; b=C4Ss41ncrn7Yln6OwSYED1WoJbz7Kf80+jF5mmFqrit+xf7GBrK6Nt+JoIj/E19WIlrQlk dpuRwIJQ18sqpdD1YEp7WWdh5fI2Gp2rfte60Mul9/crU1szT1lFLtrsgMCu0BWzVCsVqD SiS0rujaXLE9WILsYTKZmoYOdVm2kv0uPtLl92Xdzy+8zRkPKN7n2pJz8xQi1l5JwHIyhs 3rCf63XJYYRoPstycx0iIsrCdgeu8IIH0Fs0v3+mLlH8ySSqON+YLO2YMAS69FfCuNppoP bBw8qLJVwEqVGEwnSz/LgoGhk5DA85QBo5KzaJclDxJ/DzQOTlKB1F30uU4nLQ== 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 4QtPkz1C33zJDs; Sat, 1 Jul 2023 08:00:59 +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 36180x8b038772; Sat, 1 Jul 2023 08:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36180xpm038756; Sat, 1 Jul 2023 08:00:59 GMT (envelope-from git) Date: Sat, 1 Jul 2023 08:00:59 GMT Message-Id: <202307010800.36180xpm038756@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: cd9da8d072e4 - main - siftr: unbreak dtrace support 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: cd9da8d072e4dff4c1eda7307547c6a5a1e5bd35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9da8d072e4dff4c1eda7307547c6a5a1e5bd35 commit cd9da8d072e4dff4c1eda7307547c6a5a1e5bd35 Author: Michael Tuexen AuthorDate: 2023-07-01 07:50:54 +0000 Commit: Michael Tuexen CommitDate: 2023-07-01 07:50:54 +0000 siftr: unbreak dtrace support This patch adds back some fields needed by the siftr probe, which were removed in https://cgit.freebsd.org/src/commit/?id=aa61cff4249c92689d7a1f15db49d65d082184cb With this fix, you can run dtrace scripts again when the siftr module is loaded. And the siftr probe works again. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40826 --- sys/netinet/siftr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 930ba6365f26..abbb72a05b06 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -160,6 +160,12 @@ struct pkt_node { DIR_IN = 0, DIR_OUT = 1, } direction; + /* IP version pkt_node relates to; either INP_IPV4 or INP_IPV6. */ + uint8_t ipver; + /* Local TCP port. */ + uint16_t tcp_localport; + /* Foreign TCP port. */ + uint16_t tcp_foreignport; /* Congestion Window (bytes). */ uint32_t snd_cwnd; /* Sending Window (bytes). */ @@ -635,6 +641,9 @@ static inline void siftr_siftdata(struct pkt_node *pn, struct inpcb *inp, struct tcpcb *tp, int ipver, int dir, int inp_locally_locked) { + pn->ipver = ipver; + pn->tcp_localport = inp->inp_lport; + pn->tcp_foreignport = inp->inp_fport; pn->snd_cwnd = tp->snd_cwnd; pn->snd_wnd = tp->snd_wnd; pn->rcv_wnd = tp->rcv_wnd;