From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shan Wei Subject: Re: [PATCH 2/2] ss: implement -M option to get all memory information Date: Thu, 03 May 2012 16:39:52 +0800 Message-ID: <4FA24458.6020105@gmail.com> References: <4F97A48F.4010109@gmail.com> <20120425104128.4d6e13e1@nehalam.linuxnetplumber.net> <4F99FEA1.2000700@gmail.com> <20120427102138.67bd6b3a@nehalam.linuxnetplumber.net> <4FA1021E.6030905@gmail.com> <20120502120042.5420644a@s6510.linuxnetplumber.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: xemul@parallels.com, NetDev To: Stephen Hemminger Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:63304 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524Ab2ECIjB (ORCPT ); Thu, 3 May 2012 04:39:01 -0400 Received: by pbbrp8 with SMTP id rp8so2199322pbb.19 for ; Thu, 03 May 2012 01:39:00 -0700 (PDT) In-Reply-To: <20120502120042.5420644a@s6510.linuxnetplumber.net> Sender: netdev-owner@vger.kernel.org List-ID: Stephen Hemminger said, at 2012/5/3 3:00: > > This looks good, is the skmeminfo a superset of the old meminfo? Yes, skmeminfo is a superset of old meminfo. Using this can get more socket memory information. > But your code is broken on 64 bit. skmeminfo in kernel is an array of __u32! OK. here is a new version. ---- [PATCH] ss: use new INET_DIAG_SKMEMINFO option to get more memory information for tcp socket Signed-off-by: Shan Wei --- misc/ss.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 5f70a26..bd60548 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1336,7 +1336,17 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r) parse_rtattr(tb, INET_DIAG_MAX, (struct rtattr*)(r+1), nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); - if (tb[INET_DIAG_MEMINFO]) { + 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)", + skmeminfo[SK_MEMINFO_RMEM_ALLOC], + skmeminfo[SK_MEMINFO_RCVBUF], + skmeminfo[SK_MEMINFO_WMEM_ALLOC], + skmeminfo[SK_MEMINFO_SNDBUF], + skmeminfo[SK_MEMINFO_FWD_ALLOC], + skmeminfo[SK_MEMINFO_WMEM_QUEUED], + skmeminfo[SK_MEMINFO_OPTMEM]); + }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)", @@ -1505,8 +1515,10 @@ static int tcp_show_netlink(struct filter *f, FILE *dump_fp, int socktype) memset(&req.r, 0, sizeof(req.r)); req.r.idiag_family = AF_INET; req.r.idiag_states = f->states; - if (show_mem) + if (show_mem) { req.r.idiag_ext |= (1<<(INET_DIAG_MEMINFO-1)); + req.r.idiag_ext |= (1<<(INET_DIAG_SKMEMINFO-1)); + } if (show_tcpinfo) { req.r.idiag_ext |= (1<<(INET_DIAG_INFO-1)); -- 1.7.1