From patchwork Tue Aug 29 13:05:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Jian X-Patchwork-Id: 807086 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xhTS73xZWz9s3T for ; Tue, 29 Aug 2017 23:07:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752507AbdH2NHA (ORCPT ); Tue, 29 Aug 2017 09:07:00 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5038 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbdH2NG7 (ORCPT ); Tue, 29 Aug 2017 09:06:59 -0400 Received: from 172.30.72.60 (EHLO DGGEMS402-HUB.china.huawei.com) ([172.30.72.60]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DGF07654; Tue, 29 Aug 2017 21:06:52 +0800 (CST) Received: from localhost (10.177.97.126) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.301.0; Tue, 29 Aug 2017 21:06:43 +0800 From: To: CC: , , , , , Subject: [PATCH ] net: frag: print frag_mem_limit value in sockstat proc file Date: Tue, 29 Aug 2017 21:05:34 +0800 Message-ID: <1504011934-17308-1-git-send-email-liujian56@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.177.97.126] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0201.59A566EE.0039, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c4f3662630e86135de139c0e1d23504d Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: liujian From 6d7b857d5( net: use lib/percpu_counter API for fragmentation mem accounting), frag_mem_limit and sum_frag_mem_limit have different value if there are multiple NIC RX CPU. Print frag_mem_limit value, then we can get more debug info. Signed-off-by: liujian --- net/ipv4/proc.c | 3 ++- net/ipv6/proc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 43eb6567..370cda1 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -73,7 +73,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "RAW: inuse %d\n", sock_prot_inuse_get(net, &raw_prot)); frag_mem = ip_frag_mem(net); - seq_printf(seq, "FRAG: inuse %u memory %u\n", !!frag_mem, frag_mem); + seq_printf(seq, "FRAG: inuse %u memory %u current mem_limit %d\n", + !!frag_mem, frag_mem, frag_mem_limit(&net->ipv4.frags)); return 0; } diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index e88bcb8..00680bc 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -48,7 +48,8 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v) sock_prot_inuse_get(net, &udplitev6_prot)); seq_printf(seq, "RAW6: inuse %d\n", sock_prot_inuse_get(net, &rawv6_prot)); - seq_printf(seq, "FRAG6: inuse %u memory %u\n", !!frag_mem, frag_mem); + seq_printf(seq, "FRAG6: inuse %u memory %u current mem_limit %d\n", + !!frag_mem, frag_mem, frag_mem_limit(&net->ipv6.frags)); return 0; }