From nobody Fri Oct 10 10:59:47 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 4cjkKH4jkxz6BqHx; Fri, 10 Oct 2025 10:59:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjkKH3z5wz3wGV; Fri, 10 Oct 2025 10:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760093987; 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=snxxPTonwVqGoxDo+SIHRWWn3JdfjlE8tfT/Lqg3vVc=; b=C5TpMjXivjaUpfTJFlR4qF+8w1yA24cH9prwbc3F4iAVeTuawBS1byx67WHijtwSTwn/V3 8Cpu3C2pXw09KKlRIvse8iMBO9GcLvH9JQWzRFdVKyKpF7wcWwwyXDKekh1mZLXHqXjVot /4DFlUkwIHZ1Tzp3eIqCUJFbNvRkUReGw+82/hmyMFJyfWkxPfjlWlhES7j96ao/zgs2Ct cHSZrJ2WznuYxSLNt7ugYYY0wdOlbfCuO0Ny2ZriOGw1+5a8KzyAcl9dKDeORU4tYQbwkU /V/rHD1dm5xXyKgAcbly8BR9R1VkteBUSjKfQrY3ZSlX2A7ImXxObrJC8QpM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760093987; 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=snxxPTonwVqGoxDo+SIHRWWn3JdfjlE8tfT/Lqg3vVc=; b=VNY5Afgk0iTXfhsZsIxTNKUP0JCuxgamoxNuz6Eu2SK6c4J//Ac+vOl7U2c5gcYquJBK5K ViSFIL8U+8wBy8HeYfyHHkBSYC/wYYPONA69HuwLVAQFbdNyOy7HvPTMSOc986BICAklP3 +0mwdSgznQdxeHBGxb58K635wDgXd57/epsI46zEUoFlfDdqXcKDeYDSY9tXbhgS7TpGdV Tg3rptsWyJTnI7PU1TmsaMU+dWyiubg3bP26tvS/hSt7Y8jVwB7TMWMO0/FeS84N3XYx48 zd5Hs/SVD3dBVxARrMEtkysYxf+91pwNXseMPGWGpvWjOXuSGcldLubY8qW0HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760093987; a=rsa-sha256; cv=none; b=Dqx4zIbdqGwnNZuczzK4TC0phUTkzQewvIpRbxMjyDH25YqMAfpQuQflMWkE27G8MhghdI YIsb33wcRmjFjMiIE2yNALxSF5TWYWsPnfLM6r0iBeAxJpERughfDfrG5GV9zPrSVwHF1C LcVeej4UHDf99LFQSUxep+lINTIyGOHiF9ijlXWoVU1PKK7SoNmvAgxH3FY1RSI2ReVo3L YO7AP2RcVMNoQ51TZbXwj4Ym/eua0SjPtnrLjNAklgnYBoPTiKK1mSt1qYNPo/fDIq08LR MsdeXPK5x4HcfOMUpcjG9SyTxcbNjwncRwpNuUsXCt8f183vhqIAa+ieBlSrIg== 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 4cjkKH313Lz1110; Fri, 10 Oct 2025 10:59:47 +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 59AAxl7L093903; Fri, 10 Oct 2025 10:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AAxlef093900; Fri, 10 Oct 2025 10:59:47 GMT (envelope-from git) Date: Fri, 10 Oct 2025 10:59:47 GMT Message-Id: <202510101059.59AAxlef093900@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: d46d4628f65d - stable/15 - sockstat: support reporting of BBLog state 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/15 X-Git-Reftype: branch X-Git-Commit: d46d4628f65df54213823c6e574a2d5421772c88 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d46d4628f65df54213823c6e574a2d5421772c88 commit d46d4628f65df54213823c6e574a2d5421772c88 Author: Michael Tuexen AuthorDate: 2025-10-06 23:24:43 +0000 Commit: Michael Tuexen CommitDate: 2025-10-09 19:52:35 +0000 sockstat: support reporting of BBLog state Add a -b option to print the BBLog state for TCP sockets. Reviewed by: jtl, rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52944 (cherry picked from commit d801cc2d8542854a5dee9bfb25a15af6fa1dafad) --- usr.bin/sockstat/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++-- usr.bin/sockstat/sockstat.1 | 11 +++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 2e75e4966d80..3b989c4283e4 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -84,6 +85,7 @@ static bool opt_4; /* Show IPv4 sockets */ static bool opt_6; /* Show IPv6 sockets */ static bool opt_A; /* Show kernel address of pcb */ +static bool opt_b; /* Show BBLog state */ static bool opt_C; /* Show congestion control */ static bool opt_c; /* Show connected sockets */ static bool opt_f; /* Show FIB numbers */ @@ -141,6 +143,7 @@ struct sock { int proto; int state; int fibnum; + int bblog_state; const char *protoname; char stack[TCP_FUNCTION_NAME_LEN_MAX]; char cc[TCP_CA_NAME_MAX]; @@ -738,6 +741,7 @@ gather_inet(int proto) sock->vflag = xip->inp_vflag; if (proto == IPPROTO_TCP) { sock->state = xtp->t_state; + sock->bblog_state = xtp->t_logstate; memcpy(sock->stack, xtp->xt_stack, TCP_FUNCTION_NAME_LEN_MAX); memcpy(sock->cc, xtp->xt_cc, TCP_CA_NAME_MAX); @@ -1056,6 +1060,37 @@ sctp_path_state(int state) } } +static const char * +bblog_state(int state) +{ + switch (state) { + case TCP_LOG_STATE_OFF: + return "OFF"; + break; + case TCP_LOG_STATE_TAIL: + return "TAIL"; + break; + case TCP_LOG_STATE_HEAD: + return "HEAD"; + break; + case TCP_LOG_STATE_HEAD_AUTO: + return "HEAD_AUTO"; + break; + case TCP_LOG_STATE_CONTINUAL: + return "CONTINUAL"; + break; + case TCP_LOG_STATE_TAIL_AUTO: + return "TAIL_AUTO"; + break; + case TCP_LOG_VIA_BBPOINTS: + return "BBPOINTS"; + break; + default: + return "UNKNOWN"; + break; + } +} + static int format_unix_faddr(struct addr *faddr, char *buf, size_t bufsize) { #define SAFEBUF (buf == NULL ? NULL : buf + pos) @@ -1143,6 +1178,7 @@ struct col_widths { int encaps; int path_state; int conn_state; + int bblog_state; int stack; int cc; }; @@ -1485,6 +1521,15 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) xo_emit(" {:conn-state/%-*s}", cw->conn_state, "??"); } + if (opt_b) { + if (s->proto == IPPROTO_TCP) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, + bblog_state(s->bblog_state)); + else if (!is_xo_style_encoding) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, "??"); + } if (opt_S) { if (s->proto == IPPROTO_TCP) xo_emit(" {:stack/%-*s}", @@ -1544,6 +1589,7 @@ display(void) .encaps = strlen("ENCAPS"), .path_state = strlen("PATH STATE"), .conn_state = strlen("CONN STATE"), + .bblog_state = strlen("BBLOG STATE"), .stack = strlen("STACK"), .cc = strlen("CC"), }; @@ -1576,6 +1622,8 @@ display(void) xo_emit(" {T:/%-*s}", cw.path_state, "PATH STATE"); xo_emit(" {T:/%-*s}", cw.conn_state, "CONN STATE"); } + if (opt_b) + xo_emit(" {T:/%-*s}", cw.bblog_state, "BBLOG STATE"); if (opt_S) xo_emit(" {T:/%-*s}", cw.stack, "STACK"); if (opt_C) @@ -1706,7 +1754,7 @@ static void usage(void) { xo_error( -"usage: sockstat [--libxo ...] [-46ACcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" +"usage: sockstat [--libxo ...] [-46AbCcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" " [-P protocols]\n"); exit(1); } @@ -1728,7 +1776,7 @@ main(int argc, char *argv[]) xo_get_style(NULL) != XO_STYLE_HTML) is_xo_style_encoding = true; opt_j = -1; - while ((o = getopt(argc, argv, "46ACcfIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46AbCcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = true; @@ -1739,6 +1787,9 @@ main(int argc, char *argv[]) case 'A': opt_A = true; break; + case 'b': + opt_b = true; + break; case 'C': opt_C = true; break; diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index 091911cd0879..dabb3042bfd4 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 17, 2025 +.Dd October 7, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl 46ACcfIiLlnqSsUuvw +.Op Fl 46AbCcfIiLlnqSsUuvw .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -65,6 +65,9 @@ Show .It Fl A Show the address of a protocol control block (PCB) associated with a socket; used for debugging. +.It Fl b +Show the BBLog state of the socket. +This is currently only implemented for TCP. .It Fl C Display the congestion control module, if applicable. This is currently only implemented for TCP. @@ -206,6 +209,10 @@ is specified (only for SCTP). The connection state if .Fl s is specified (only for SCTP or TCP). +.It Li BBLOG STATE +The BBLog state if +.Fl b +is specified (only for TCP). .It Li STACK The protocol stack if .Fl S