From patchwork Wed May 2 09:45:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 156400 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 4D519B6FB7 for ; Wed, 2 May 2012 19:44:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753866Ab2EBJoM (ORCPT ); Wed, 2 May 2012 05:44:12 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:65034 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768Ab2EBJoL (ORCPT ); Wed, 2 May 2012 05:44:11 -0400 Received: by pbbrp8 with SMTP id rp8so851806pbb.19 for ; Wed, 02 May 2012 02:44:11 -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=6/yRQEgCVuF2wkpVAnhmVuVqTWHDwTaZvB/WXPKuziU=; b=dIv6dU6Z7G2UWyuoZuhjCEtIvn3xV3LPTZJifn143msbRsYT/0aGXNonX4TlWKW9kM 703ZMxvsB8Q8ZhZdP8GpXDtERxx9XfudyYKkxT3+EjKducql0gNkqm3lmUymESXwyjok kRFX+UL+lM8CfegAz7dG1kvy6C8dqgyrCHsmvpbKfP2SHNGHMDL91/rhKBz0Zdwg0l9+ N4lNWs2s++HGMHsY9J9gMXKuNCIMx0UluleT1PyAANS2qtvigGBKczIJF5jvv00rv9zg oCa4Qj4WoEqRiBZKTlEZSEmVJUUIcNCQsOb+pMECcO7ip5i4ssVrQWLy/Y9SAhMT3Gwn IttA== Received: by 10.68.130.131 with SMTP id oe3mr30422763pbb.159.1335951851001; Wed, 02 May 2012 02:44:11 -0700 (PDT) Received: from [172.30.10.112] ([113.108.76.195]) by mx.google.com with ESMTPS id gv2sm1481513pbc.73.2012.05.02.02.44.08 (version=SSLv3 cipher=OTHER); Wed, 02 May 2012 02:44:10 -0700 (PDT) Message-ID: <4FA1021E.6030905@gmail.com> Date: Wed, 02 May 2012 17:45:02 +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> In-Reply-To: <20120427102138.67bd6b3a@nehalam.linuxnetplumber.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi stephen: Stephen Hemminger said, at 2012/4/28 1:21: > Lots of options return more or different information based on kernel > version, probably the biggest example is how stats are processed. how about the following patch? ---- [PATCH] ss: use new INET_DIAG_SKMEMINFO option to get 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..3cfc9e8 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 unsigned int *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));