From patchwork Fri Aug 24 11:07:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: xeb@mail.ru X-Patchwork-Id: 179826 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 796232C00FD for ; Fri, 24 Aug 2012 21:08:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759311Ab2HXLI0 (ORCPT ); Fri, 24 Aug 2012 07:08:26 -0400 Received: from smtp12.mail.ru ([94.100.176.89]:45799 "EHLO smtp12.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759298Ab2HXLHp (ORCPT ); Fri, 24 Aug 2012 07:07:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To:From; bh=lzANPHHLa1XV0Y+DW/wdeO8SdJZkIaKZMOGA2rn3pM4=; b=arTGgdMQRqCSPtTBRV0Dr2dysB+ib8d+0ZOwuZITh/BsqeDd145+d9D900+2p8FIKT2d+kogxUhxs84Hjg8d7vwoNvNcKB5c7grHFKnoGvZB38LjguzFdjFA7sSEE+7m; Received: from [195.24.254.26] (port=9629 helo=dima.localnet) by smtp12.mail.ru with esmtpa (envelope-from ) id 1T4rjs-0005pu-5q; Fri, 24 Aug 2012 15:07:44 +0400 From: Kozlov Dmitry To: netdev@vger.kernel.org Cc: kleptog@svana.org, jchapman@katalix.com Subject: [PATCH 1/1] l2tp: avoid to use synchronize_rcu in tunnel free function Date: Fri, 24 Aug 2012 15:07:38 +0400 Message-ID: <1430615.YYms4uRCh4@dima> User-Agent: KMail/4.8.3 (Linux/3.3.3-gentoo; KDE/4.8.3; x86_64; ; ) MIME-Version: 1.0 X-Spam: Not detected X-Mras: Ok Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid to use synchronize_rcu in l2tp_tunnel_free because context may be atomic. Signed-off-by: Dmitry Kozlov --- net/l2tp/l2tp_core.c | 3 +-- net/l2tp/l2tp_core.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 393355d..513cab0 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1347,11 +1347,10 @@ static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel) /* Remove from tunnel list */ spin_lock_bh(&pn->l2tp_tunnel_list_lock); list_del_rcu(&tunnel->list); + kfree_rcu(tunnel, rcu); spin_unlock_bh(&pn->l2tp_tunnel_list_lock); - synchronize_rcu(); atomic_dec(&l2tp_tunnel_count); - kfree(tunnel); } /* Create a socket for the tunnel, if one isn't set up by diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index a38ec6c..56d583e 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -163,6 +163,7 @@ struct l2tp_tunnel_cfg { struct l2tp_tunnel { int magic; /* Should be L2TP_TUNNEL_MAGIC */ + struct rcu_head rcu; rwlock_t hlist_lock; /* protect session_hlist */ struct hlist_head session_hlist[L2TP_HASH_SIZE]; /* hashed list of sessions,