From patchwork Fri Dec 6 09:53:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "fan.du" X-Patchwork-Id: 297658 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 4A1DD2C00A1 for ; Fri, 6 Dec 2013 20:53:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757365Ab3LFJxv (ORCPT ); Fri, 6 Dec 2013 04:53:51 -0500 Received: from mail.windriver.com ([147.11.1.11]:50719 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757292Ab3LFJxn (ORCPT ); Fri, 6 Dec 2013 04:53:43 -0500 Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id rB69rftp002859 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 6 Dec 2013 01:53:41 -0800 (PST) Received: from iamroot-OptiPlex-780.corp.ad.wrs.com (128.224.162.238) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.2.347.0; Fri, 6 Dec 2013 01:53:41 -0800 From: Fan Du To: , CC: Subject: [PATCHv2 net-next 5/5] {pktgen, xfrm} Correct xfrm state lock usage when transforming Date: Fri, 6 Dec 2013 17:53:34 +0800 Message-ID: <1386323614-5077-6-git-send-email-fan.du@windriver.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386323614-5077-1-git-send-email-fan.du@windriver.com> References: <1386323614-5077-1-git-send-email-fan.du@windriver.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xfrm_state lock protects its state, i.e., VALID/DEAD and statistics, not the transforming procedure, as both mode/type output functions are reentrant. Signed-off-by: Fan Du --- net/core/pktgen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index f2a2a98..10237a3 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2499,8 +2499,6 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev) if (x->props.mode == XFRM_MODE_TUNNEL) __skb_dst_set_noref(skb, &pkt_dev->dst, true); - spin_lock(&x->lock); - err = x->outer_mode->output(x, skb); if (err) goto error; @@ -2508,10 +2506,11 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev) if (err) goto error; + spin_lock(&x->lock); x->curlft.bytes += skb->len; x->curlft.packets++; -error: spin_unlock(&x->lock); +error: return err; }