From patchwork Sat Feb 27 06:40:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shan Wei X-Patchwork-Id: 46424 X-Patchwork-Delegate: davem@davemloft.net 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 72717B7D26 for ; Sat, 27 Feb 2010 17:40:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753815Ab0B0GkQ (ORCPT ); Sat, 27 Feb 2010 01:40:16 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:58581 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753527Ab0B0GkF (ORCPT ); Sat, 27 Feb 2010 01:40:05 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id D2B9D170028; Sat, 27 Feb 2010 14:40:04 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o1R6d55r007449; Sat, 27 Feb 2010 14:39:05 +0800 Received: from [10.167.141.214] (unknown [10.167.141.214]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id AB55AD4867; Sat, 27 Feb 2010 14:41:57 +0800 (CST) Message-ID: <4B88BE44.7030600@cn.fujitsu.com> Date: Sat, 27 Feb 2010 14:40:04 +0800 From: Shan Wei User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Patrick McHardy , David Miller , Alexey Dobriyan , Yasuyuki KOZAKAI , "netdev@vger.kernel.org" , netfilter-devel@vger.kernel.org Subject: [RFC PATCH net-next 5/7 v2]IPv6:netfilter: Record MIB counter when reassembling all fragments Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org According to RFC4293, this patch records MIB counter of IPSTATS_MIB_REASMFAILS, IPSTATS_MIB_REASMOKS, when reassembling fragments after all fragments reached. Signed-off-by: Shan Wei --- net/ipv6/netfilter/nf_conntrack_reasm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 27d8ac1..4640795 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -485,6 +485,7 @@ static struct sk_buff * nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev) { struct sk_buff *fp, *op, *head = fq->q.fragments; + struct net *net = container_of(fq->q.net, struct net, ipv6.frags); int payload_len; fq_kill(fq); @@ -586,6 +587,9 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev) NFCT_FRAG6_CB(fp)->orig = NULL; } + rcu_read_lock(); + IP6_INC_STATS(net, __in6_dev_get(dev), IPSTATS_MIB_REASMOKS); + rcu_read_unlock(); return head; out_oversize: @@ -596,6 +600,9 @@ out_oom: if (net_ratelimit()) printk(KERN_DEBUG "nf_ct_frag6_reasm: no memory for reassembly\n"); out_fail: + rcu_read_lock(); + IP6_INC_STATS(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS); + rcu_read_unlock(); return NULL; }