From nobody Fri Oct 10 11:27:52 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 4cjkxh6GJmz6BsDS; Fri, 10 Oct 2025 11:27:52 +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 4cjkxh5mCXz3xjT; Fri, 10 Oct 2025 11:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760095672; 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=OVXGwnOeMVyIinO1RK58JWs0j6FFy2WAhQcz4jbPSy8=; b=jvV7gABwtNetlzCjGShGMhjBIUdC1fR/z2BhUwkMSdS43iO2JS2WiVd3Bzz+mDwOpb3thh Ut8nqUWVhFnsedqZrAdSEoaFW/sCx8HBcv+XZr4RvdCgGKy9WrMjLKxx1IMi9lIrUuPx/T AqOlSHNOldpRH+JicKgmbFBMTyQ+l7PXNWKuWUMWSh02V8udDrDJNGdGXhgCa5CUt0DKl4 uxNdyeL5v4WvopAa9p5ZThPsuyei6XRJX8GG+8TNxiqPQOFzG9GHRLKbJo/92BdtHmhWEq D4hpnDCpduyKUsap40nP9VAGDkMwdK5jW/eaqTtqVED5Wec+UF4PLYMuJIxcOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760095672; 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=OVXGwnOeMVyIinO1RK58JWs0j6FFy2WAhQcz4jbPSy8=; b=qxII4ZG2lLN04FruQqi0I1+EThqw9FbGbAyytdYjl6sEe8ODl8Z3cM3IYkMRegA+rePEwq cnYBDn83v9tFkpcJHJaYndNnZUGlMObnuQfJnxXFa32Mla/f5wSoZGYlinWFzN3lwY0hor DK/xMVjF6aYPQ1Uud7r5TZ++0uqhe9l9grEu47utu89mysv4WoWIDD/J9NSym/cHeHwcBU KW/+wIh6uh9ZAlm/5qm3SdWfRw8HqmEkNxYCemNv0gICiENBVov9DzS7S9RxQE0T0H2e+6 uDtAmvpyFNJTdfGPP9U1IO+3tNekVIR5wYEBriRsR+tRqElb4c5F38sXp3sOlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760095672; a=rsa-sha256; cv=none; b=raqcRd5lJ+h+cPijVauyua7QCHRaprci5v2wqDqSgkflRYFrAuDmTXf3TXLLTG9cIC1WJm aRo+YD3a1zmOa3ZM/2lvUQsY7JELR8XG5Zk5UwVi1oAF7x7fBeSswQhgwd7jzxs9qHEEc+ zbJeW/6XD5I6ND2nJPebShrdpzeFH5OQQ5xpFh1lwjgdzQ2ZwkU3uMZ6+slP5ciufhCR0a xeLeMqKb6J9hn3A6n61ZjELFTOJDwcaoDw7QJJNfl+p6kOOp2R1zLd5MY2++98z2JgWxbu yP/0BgJKWVmGZ/Or97vk32md5daIBoRY4b4W85Ai0Ht228MyyyM8ltui3Zyo4A== 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 4cjkxh53kVz11LC; Fri, 10 Oct 2025 11:27:52 +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 59ABRqkr049970; Fri, 10 Oct 2025 11:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ABRqPV049967; Fri, 10 Oct 2025 11:27:52 GMT (envelope-from git) Date: Fri, 10 Oct 2025 11:27:52 GMT Message-Id: <202510101127.59ABRqPV049967@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: b339da5b23e8 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b339da5b23e8871dd2b56f510ba3db1e09223be3 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b339da5b23e8871dd2b56f510ba3db1e09223be3 commit b339da5b23e8871dd2b56f510ba3db1e09223be3 Author: Michael Tuexen AuthorDate: 2025-10-06 23:24:43 +0000 Commit: Michael Tuexen CommitDate: 2025-10-10 11:26:44 +0000 sockstat: support reporting of BBLog state Add a -b option to print the BBLog state for TCP sockets. Manually tweaked for stable/14. Reviewed by: jtl, rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52944 (cherry picked from commit d801cc2d8542854a5dee9bfb25a15af6fa1dafad) --- usr.bin/sockstat/sockstat.1 | 11 +++++++-- usr.bin/sockstat/sockstat.c | 54 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index ca486a088b13..eba4b1c4aed5 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 October 15, 2024 +.Dd October 7, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd list open sockets .Sh SYNOPSIS .Nm -.Op Fl 46CcfIiLlnqSsUuvw +.Op Fl 46bCcfIiLlnqSsUuvw .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -54,6 +54,9 @@ Show Show .Dv AF_INET6 (IPv6) sockets. +.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. @@ -195,6 +198,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 diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 11434a6efa68..4548eb8a0b11 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -81,6 +82,7 @@ static int opt_4; /* Show IPv4 sockets */ static int opt_6; /* Show IPv6 sockets */ +static bool opt_b; /* Show BBLog state */ static int opt_C; /* Show congestion control */ static int opt_c; /* Show connected sockets */ static int opt_f; /* Show FIB numbers */ @@ -143,6 +145,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]; @@ -797,6 +800,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); @@ -1105,6 +1109,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 void displaysock(struct sock *s, int pos) { @@ -1299,6 +1334,16 @@ displaysock(struct sock *s, int pos) } offset += 13; } + if (opt_b) { + if (s->proto == IPPROTO_TCP) { + do + pos += xprintf(" "); + while (pos < offset); + pos += xprintf("%s", + bblog_state(s->bblog_state)); + } + offset += 13; + } if (opt_S) { if (s->proto == IPPROTO_TCP) { do @@ -1359,6 +1404,8 @@ display(void) printf(" %-12s", "PATH STATE"); printf(" %-12s", "CONN STATE"); } + if (opt_b) + printf(" %-12s", "BBLOG STATE"); if (opt_S) printf(" %-*.*s", TCP_FUNCTION_NAME_LEN_MAX, TCP_FUNCTION_NAME_LEN_MAX, "STACK"); @@ -1477,7 +1524,7 @@ static void usage(void) { errx(1, - "usage: sockstat [-46CcfIiLlnqSsUuvw] [-j jid] [-p ports] [-P protocols]"); + "usage: sockstat [-46bCcfIiLlnqSsUuvw] [-j jid] [-p ports] [-P protocols]"); } int @@ -1491,7 +1538,7 @@ main(int argc, char *argv[]) int o, i; opt_j = -1; - while ((o = getopt(argc, argv, "46CcfIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46bCcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = 1; @@ -1499,6 +1546,9 @@ main(int argc, char *argv[]) case '6': opt_6 = 1; break; + case 'b': + opt_b = true; + break; case 'C': opt_C = 1; break;