From patchwork Fri Dec 28 08:06:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li RongQing X-Patchwork-Id: 208420 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 118DA2C00D2 for ; Fri, 28 Dec 2012 19:07:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751526Ab2L1IGi (ORCPT ); Fri, 28 Dec 2012 03:06:38 -0500 Received: from mail-ia0-f172.google.com ([209.85.210.172]:49727 "EHLO mail-ia0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435Ab2L1IGg (ORCPT ); Fri, 28 Dec 2012 03:06:36 -0500 Received: by mail-ia0-f172.google.com with SMTP id z13so8704889iaz.3 for ; Fri, 28 Dec 2012 00:06:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=Yr90g/fUIytTj4QUbIPLHD6e6A3wjr8N0Kcrt8kK9yI=; b=W9UDJ3Wg8H3y4CqG59MAhMvXJcqEwpHkyquuJ69JKj89zb1yRqamDMhHEUs7uCTGHt roI3Lt67AEv7J/9Mw9FhnYhXLdTHyVbI/GCokrrJPLfxT74t0qWA8oZ+JmFMHEnwguDM 3dSn3YBaXNkaX6/QSOVzqmoNudMN6Sa3yvtVy9gOHkzsTT3n2PchkX235zWjVAZTnw7U AUrZRQY6h0Hpx2b1C7oauAazbxnC2GuqnP8+hD//uDsPGQawXK+tPPpfdnYx+wWE/06s FHKJ1sOhCJBcR1+Xb9lTXXYbFmwOYU6f0ulKZncyCEPKNWyFQt4FTwRdJX+nmiuWw8Bc vHIw== X-Received: by 10.50.152.137 with SMTP id uy9mr28273177igb.62.1356681994035; Fri, 28 Dec 2012 00:06:34 -0800 (PST) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id yf6sm26136359igb.0.2012.12.28.00.06.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Dec 2012 00:06:33 -0800 (PST) From: roy.qing.li@gmail.com To: netdev@vger.kernel.org Subject: [PATCH net-next] xfrm: removes a superfluous check and add a statistic Date: Fri, 28 Dec 2012 16:06:28 +0800 Message-Id: <1356681988-7985-1-git-send-email-roy.qing.li@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing Remove the check if x->km.state equal to XFRM_STATE_VALID in xfrm_state_check_expire(), which will be done before call xfrm_state_check_expire(). add a LINUX_MIB_XFRMOUTSTATEINVALID statistic to record the outbound error due to invalid xfrm state. Signed-off-by: Li RongQing --- include/uapi/linux/snmp.h | 1 + net/xfrm/xfrm_output.c | 6 ++++++ net/xfrm/xfrm_proc.c | 1 + net/xfrm/xfrm_state.c | 3 --- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h index fdfba23..b49eab8 100644 --- a/include/uapi/linux/snmp.h +++ b/include/uapi/linux/snmp.h @@ -278,6 +278,7 @@ enum LINUX_MIB_XFRMOUTPOLDEAD, /* XfrmOutPolDead */ LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */ LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/ + LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */ __LINUX_MIB_XFRMMAX }; diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 95a338c..3670526 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -61,6 +61,12 @@ static int xfrm_output_one(struct sk_buff *skb, int err) } spin_lock_bh(&x->lock); + + if (unlikely(x->km.state != XFRM_STATE_VALID)) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID); + goto error_nolock; + } + err = xfrm_state_check_expire(x); if (err) { XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEEXPIRED); diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c index d0a1af8..6039038 100644 --- a/net/xfrm/xfrm_proc.c +++ b/net/xfrm/xfrm_proc.c @@ -43,6 +43,7 @@ static const struct snmp_mib xfrm_mib_list[] = { SNMP_MIB_ITEM("XfrmOutPolDead", LINUX_MIB_XFRMOUTPOLDEAD), SNMP_MIB_ITEM("XfrmOutPolError", LINUX_MIB_XFRMOUTPOLERROR), SNMP_MIB_ITEM("XfrmFwdHdrError", LINUX_MIB_XFRMFWDHDRERROR), + SNMP_MIB_ITEM("XfrmOutStateInvalid", LINUX_MIB_XFRMOUTSTATEINVALID), SNMP_MIB_SENTINEL }; diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 3459692..05db236 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1370,9 +1370,6 @@ int xfrm_state_check_expire(struct xfrm_state *x) if (!x->curlft.use_time) x->curlft.use_time = get_seconds(); - if (x->km.state != XFRM_STATE_VALID) - return -EINVAL; - if (x->curlft.bytes >= x->lft.hard_byte_limit || x->curlft.packets >= x->lft.hard_packet_limit) { x->km.state = XFRM_STATE_EXPIRED;