From patchwork Thu May 3 08:39:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 156627 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B1FA5B6FC8 for ; Thu, 3 May 2012 18:39:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754622Ab2ECIjC (ORCPT ); Thu, 3 May 2012 04:39:02 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=jFWMMTaqoi2jZbAjMJXIhsxZyGthUQrjnh05CTFruHE=; b=h6hf+4X+pFcGllun0R9l9Cfz/LDK5IQ5Q9qa1ysg7O1uKrbiq0GrnzY51pGMEKDPgC Rh7S9SCy0L5rjjd5eALjY6CA3nQ6ddGMfpMMsU4rnlHQC1t5s8xaEe0dXR/GBWpOKTSP OprqIr42U0qcEDIbjBj608lq1W+usTfBO3SnNkLTWeHOwjtF6udCdjjUIsmzoBCUIGMA JH1nfbfMMHLMF4f9WeZH5i2veJE90mnXQ7C5UHFM4VNda+Zrjf1JF1dwnKhoN4Lc1eI8 boFgS4N297VpUuom7+NCzRL/uAiZ7jaGqho8DMe6kiKC3Z7diWEg6g1QI++RLJJ4enwy vpmQ== Received: by 10.68.213.9 with SMTP id no9mr5346042pbc.91.1336034340688; Thu, 03 May 2012 01:39:00 -0700 (PDT) Received: from [172.30.10.112] ([113.108.76.195]) by mx.google.com with ESMTPS id vc1sm4236492pbc.56.2012.05.03.01.38.57 (version=SSLv3 cipher=OTHER); Thu, 03 May 2012 01:39:00 -0700 (PDT) Message-ID: <4FA24458.6020105@gmail.com> Date: Thu, 03 May 2012 16:39:52 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Stephen Hemminger CC: xemul@parallels.com, NetDev Subject: Re: [PATCH 2/2] ss: implement -M option to get all memory information 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> In-Reply-To: <20120502120042.5420644a@s6510.linuxnetplumber.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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));