From nobody Mon Nov 10 19:33:23 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 4d50Fb5LShz63K1X; Mon, 10 Nov 2025 19:33:23 +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 4d50Fb4WXtz3T3K; Mon, 10 Nov 2025 19:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803203; 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=jrM7rr26KkYbUVaBSZEx8jynJ5dQdpp53QgAOHi3kGU=; b=LZn1oxRzHKEXxWPNd46rp5/TMjf44kAE7nmHKVPQjGTC+xWlcawSmM4eeGckqFcDFi9+CR E96fa2+u4eLCMw/T9dXelJ6H/sn0cGf1JFGxHn+xucinGRL07a8fUtmRd6coLE9fQvUFgZ +yTwd/+Smszgvf49PvR6CRWMtTiiGZwdn4KA0hpT7h284Stbq2CRz1seWeokXtPH3FzTvQ NOYPkpNJHKGOb0xR2L6vvmL7GVBRSp5f+ocPil7tBauyCG8wP6WBkVMtHDf07zw/rBbDN8 ADIzrfb72uPbob8/DHUbWvupeE/nNo1ELRuoK/lWGofl1HA/lXjp6ZXUD3J0Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762803203; 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=jrM7rr26KkYbUVaBSZEx8jynJ5dQdpp53QgAOHi3kGU=; b=VGrriJgGZXfwo/5VPIg+AH0rwPziO1jSxO+c6zZ5Wnd9GYXer4JfDyvYa8kS3bnWF56ziy Zv8h3R6MOuSogZj6kntZNH5wgyTocCfU/9XUADrAics45KhFCBg0N+teRpn9CSiZYWQNuN ZfBb/2Ie4n1tzefU+M9DcVtiGPBW/DxYfSTEeDHHFyUyMsab/PAbDEADUDPr9O/YwCTBkT MicmVA+9pI3FjSeH8oFO8s/W8ATP3s6WiZUuxdbMfSZfxpG66rfkv48Fwi57j3S/CCJkEX 4CpnIpD6dwgWnVHhCPcn21Oh+qtpvyQJ27PTr9jw7+imwtTvZFDD7TV7XUq8MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762803203; a=rsa-sha256; cv=none; b=hR9vCmsNECSYdQyTSy4G5+Znr17aCGY456tCMAE0mTaMB/9fieEWuP7omUht8RbfTJyOyU gddEKCrdWuq5S1nqYfJ+OYhglk0MuimJmzZ+YJijfEHk4bQnf/ojMmP6b6o2IIgqvcruWP EYBDDaggZrCrvaaoygxaLTcWynrmD+IJhO1+1Pf76Kp2j/FemUEC48ryCfdSif+XaEtTLl obST9JwS1WJMxu2CbAvKXQiWnUnl2DEG2uJS+KIcooqf7eUXsUz1bMmbhCDcHRKwSWGoEr CH+6INnEciE0Oh9cSCPoq1TYIftWlv7HCZw2hSak90LMO3l9D/GTJY1s0O+5xA== 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 4d50Fb463zzXKF; Mon, 10 Nov 2025 19:33:23 +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 5AAJXNbN069027; Mon, 10 Nov 2025 19:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAJXNa0069024; Mon, 10 Nov 2025 19:33:23 GMT (envelope-from git) Date: Mon, 10 Nov 2025 19:33:23 GMT Message-Id: <202511101933.5AAJXNa0069024@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: 117e70a21f7a - stable/14 - ddb: optionally print inp when printing tcpcb 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: 117e70a21f7a950395e97f6b352867b6767f5dbc Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=117e70a21f7a950395e97f6b352867b6767f5dbc commit 117e70a21f7a950395e97f6b352867b6767f5dbc Author: Michael Tuexen AuthorDate: 2025-10-31 18:05:02 +0000 Commit: Michael Tuexen CommitDate: 2025-11-10 19:32:05 +0000 ddb: optionally print inp when printing tcpcb Add /i option to the ddb commands show tcpcb and show all tcpcbs, which enables the printing of the t_inpcb. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53497 (cherry picked from commit 9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433) --- share/man/man4/ddb.4 | 12 +++++++++--- sys/netinet/in_pcb.c | 2 +- sys/netinet/in_pcb.h | 3 +++ sys/netinet/tcp_usrreq.c | 21 ++++++++++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 08e804c64ff8..031df9c27bf2 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd June 10, 2025 +.Dd October 31, 2025 .Dt DDB 4 .Os .Sh NAME @@ -580,12 +580,15 @@ The modifier will print command line arguments for each process. .\" .Pp -.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm l +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm i Ns Cm l Show the same output as "show tcpcb" does, but for all TCP control blocks within the system. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. Using the .Cm l modifier will limit the output to TCP control blocks, which are locked. @@ -1082,7 +1085,7 @@ on i386.) Not present on some platforms. .\" .Pp -.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Oc Ar addr +.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Ns Cm i Oc Ar addr Print TCP control block .Vt struct tcpcb lying at address @@ -1093,6 +1096,9 @@ header file. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. .\" .Pp .It Ic show Cm thread Op Ar addr | tid diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 69b68c77ba84..2761c6979f7d 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3154,7 +3154,7 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -static void +void db_print_inpflags(int inp_flags) { int comma; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 17f24ba0bee7..9095e6bb71bf 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -723,6 +723,9 @@ int in_pcbquery_txrlevel(struct inpcb *, uint32_t *); void in_pcboutput_txrtlmt(struct inpcb *, struct ifnet *, struct mbuf *); void in_pcboutput_eagain(struct inpcb *); #endif +#ifdef DDB +void db_print_inpcb(struct inpcb *, const char *, int); +#endif #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index daa04845ab79..38c640569f5b 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3116,7 +3116,8 @@ db_print_bblog_state(int state) } static void -db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) +db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, + bool show_inpcb) { db_print_indent(indent); @@ -3124,6 +3125,9 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) indent += 2; + if (show_inpcb) + db_print_inpcb(tptoinpcb(tp), "t_inpcb", indent); + db_print_indent(indent); db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", TAILQ_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks); @@ -3255,33 +3259,36 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) { struct tcpcb *tp; - bool show_bblog; + bool show_bblog, show_inpcb; if (!have_addr) { - db_printf("usage: show tcpcb \n"); + db_printf("usage: show tcpcb[/bi] \n"); return; } show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; tp = (struct tcpcb *)addr; - - db_print_tcpcb(tp, "tcpcb", 0, show_bblog); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); } DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) { VNET_ITERATOR_DECL(vnet_iter); struct inpcb *inp; - bool only_locked, show_bblog; + struct tcpcb *tp; + bool only_locked, show_bblog, show_inpcb; only_locked = strchr(modif, 'l') != NULL; show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); CK_LIST_FOREACH(inp, &V_tcbinfo.ipi_listhead, inp_list) { if (only_locked && inp->inp_lock.rw_lock == RW_UNLOCKED) continue; - db_print_tcpcb(intotcpcb(inp), "tcpcb", 0, show_bblog); + tp = intotcpcb(inp); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); if (db_pager_quit) break; }