Message ID | 1343294420.2626.11264.camel@edumazet-glaptop |
---|---|
State | Accepted, archived |
Delegated to: | stephen hemminger |
Headers | show |
On 26 July 2012 02:20, Eric Dumazet <eric.dumazet@gmail.com> wrote: > From: Eric Dumazet <edumazet@google.com> > > linux-3.6-rc1 supports SK_MEMINFO_BACKLOG with commit d594e987c6f54 > (sock_diag: add SK_MEMINFO_BACKLOG) > > ss command can display it if provided by the kernel. > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Vijay Subramanian <subramanian.vijay@gmail.com> Thanks Eric. I see now how you fixed this. Tested-by: Vijay Subramanian <subramanian.vijay@gmail.com> Vijay -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
I am holding this until after 3.5 iproute2 is released. Still want to get a couple more features in 3.5 iproute2, the work Pavel is doing on save/restore cleanup, and the bridge fdb stuff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2012-07-27 at 10:08 -0700, Stephen Hemminger wrote: > I am holding this until after 3.5 iproute2 is released. > > Still want to get a couple more features in 3.5 iproute2, the work Pavel is > doing on save/restore cleanup, and the bridge fdb stuff. > By the way, it seems "ss -u" still uses /proc/net/udp , and not inet_diag ? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 26 Jul 2012 17:29:26 -0700 Vijay Subramanian <subramanian.vijay@gmail.com> wrote: > On 26 July 2012 02:20, Eric Dumazet <eric.dumazet@gmail.com> wrote: > > From: Eric Dumazet <edumazet@google.com> > > > > linux-3.6-rc1 supports SK_MEMINFO_BACKLOG with commit d594e987c6f54 > > (sock_diag: add SK_MEMINFO_BACKLOG) > > > > ss command can display it if provided by the kernel. > > > > Signed-off-by: Eric Dumazet <edumazet@google.com> > > Cc: Vijay Subramanian <subramanian.vijay@gmail.com> > > > Thanks Eric. I see now how you fixed this. > > Tested-by: Vijay Subramanian <subramanian.vijay@gmail.com> > > Vijay Applied (after 3.5.0 release). -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Eric Dumazet said, at 2012/7/28 1:11: > > By the way, it seems "ss -u" still uses /proc/net/udp , and not > inet_diag ? Yes, UDP doesn't use inet_diag. Can you provide a patch, we are willing to see it? > > > > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index 39e4b1c..ac9db19 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -18,6 +18,7 @@ enum { SK_MEMINFO_FWD_ALLOC, SK_MEMINFO_WMEM_QUEUED, SK_MEMINFO_OPTMEM, + SK_MEMINFO_BACKLOG, SK_MEMINFO_VARS, }; diff --git a/misc/ss.c b/misc/ss.c index cf529ef..d8429cc 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1337,8 +1337,9 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r) nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); if (tb[INET_DIAG_SKMEMINFO]) { - const __u32 *skmeminfo = RTA_DATA(tb[INET_DIAG_SKMEMINFO]); - printf(" skmem:(r%u,rb%u,t%u,tb%u,f%u,w%u,o%u)", + const __u32 *skmeminfo = RTA_DATA(tb[INET_DIAG_SKMEMINFO]); + + printf(" skmem:(r%u,rb%u,t%u,tb%u,f%u,w%u,o%u", skmeminfo[SK_MEMINFO_RMEM_ALLOC], skmeminfo[SK_MEMINFO_RCVBUF], skmeminfo[SK_MEMINFO_WMEM_ALLOC], @@ -1346,7 +1347,13 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r) skmeminfo[SK_MEMINFO_FWD_ALLOC], skmeminfo[SK_MEMINFO_WMEM_QUEUED], skmeminfo[SK_MEMINFO_OPTMEM]); - }else if (tb[INET_DIAG_MEMINFO]) { + + if (RTA_PAYLOAD(tb[INET_DIAG_SKMEMINFO]) >= + (SK_MEMINFO_BACKLOG + 1) * sizeof(__u32)) + printf(",bl%u", skmeminfo[SK_MEMINFO_BACKLOG]); + + printf(")"); + } else if (tb[INET_DIAG_MEMINFO]) { const struct inet_diag_meminfo *minfo = RTA_DATA(tb[INET_DIAG_MEMINFO]); printf(" mem:(r%u,w%u,f%u,t%u)",