ss: report SK_MEMINFO_BACKLOG

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>

diff --git a/misc/ss.c b/misc/ss.c
index 8ad830bf5b5652648ef72882e07cdc5ccf76ddc5..d00d3e7bc562a1fc9915d416bae26874c2b9baa7 100644 (file)
--- 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)",