* [PATCH iproute2-next] ss: output dctcp diag information
@ 2014-09-29 8:47 Daniel Borkmann
2014-10-30 5:53 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Borkmann @ 2014-09-29 8:47 UTC (permalink / raw)
To: stephen; +Cc: netdev, Florian Westphal
Dump useful DCTCP state/debug information gathered from diag.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
include/linux/inet_diag.h | 13 +++++++++++--
misc/ss.c | 13 +++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index e34f247..7438dad 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -110,10 +110,10 @@ enum {
INET_DIAG_TCLASS,
INET_DIAG_SKMEMINFO,
INET_DIAG_SHUTDOWN,
+ INET_DIAG_DCTCPINFO,
};
-#define INET_DIAG_MAX INET_DIAG_SHUTDOWN
-
+#define INET_DIAG_MAX INET_DIAG_DCTCPINFO
/* INET_DIAG_MEM */
@@ -133,5 +133,14 @@ struct tcpvegas_info {
__u32 tcpv_minrtt;
};
+/* INET_DIAG_DCTCPINFO */
+
+struct tcp_dctcp_info {
+ __u16 dctcp_enabled;
+ __u16 dctcp_ce_state;
+ __u32 dctcp_alpha;
+ __u32 dctcp_ab_ecn;
+ __u32 dctcp_ab_tot;
+};
#endif /* _INET_DIAG_H_ */
diff --git a/misc/ss.c b/misc/ss.c
index c847954..f5019e1 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1576,6 +1576,19 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
rtt = vinfo->tcpv_rtt;
}
+ if (tb[INET_DIAG_DCTCPINFO]) {
+ const struct tcp_dctcp_info *dinfo
+ = RTA_DATA(tb[INET_DIAG_DCTCPINFO]);
+
+ if (dinfo->dctcp_enabled) {
+ printf(" ce_state %u alpha %u ab_ecn %u ab_tot %u",
+ dinfo->dctcp_ce_state, dinfo->dctcp_alpha,
+ dinfo->dctcp_ab_ecn, dinfo->dctcp_ab_tot);
+ } else {
+ printf(" fallback_mode");
+ }
+ }
+
if (rtt > 0 && info->tcpi_snd_mss && info->tcpi_snd_cwnd) {
printf(" send %sbps",
sprint_bw(b1, (double) info->tcpi_snd_cwnd *
--
1.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH iproute2-next] ss: output dctcp diag information
2014-09-29 8:47 [PATCH iproute2-next] ss: output dctcp diag information Daniel Borkmann
@ 2014-10-30 5:53 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2014-10-30 5:53 UTC (permalink / raw)
To: Daniel Borkmann; +Cc: netdev, Florian Westphal
On Mon, 29 Sep 2014 10:47:32 +0200
Daniel Borkmann <dborkman@redhat.com> wrote:
> Dump useful DCTCP state/debug information gathered from diag.
>
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
> Signed-off-by: Florian Westphal <fw@strlen.de>
Applied, I had already got the header files from regular kernel headers update.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-30 5:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-29 8:47 [PATCH iproute2-next] ss: output dctcp diag information Daniel Borkmann
2014-10-30 5:53 ` Stephen Hemminger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.