From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965285AbcHaREF (ORCPT ); Wed, 31 Aug 2016 13:04:05 -0400 Received: from smtprelay0241.hostedemail.com ([216.40.44.241]:48205 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965120AbcHaRD6 (ORCPT ); Wed, 31 Aug 2016 13:03:58 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2901:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3870:3871:3872:3874:4250:4321:5007:6119:6261:7514:7875:7903:8784:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12214:12295:12296:12438:12555:12663:12740:13180:13229:13439:14096:14097:14181:14659:14721:21080:21451:30012:30054:30070:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: beef02_40562e94164f X-Filterd-Recvd-Size: 3316 Date: Wed, 31 Aug 2016 13:03:46 -0400 From: Steven Rostedt To: Eric Dumazet Cc: Sebastian Andrzej Siewior , linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, netdev@vger.kernel.org Subject: Re: [RT PATCH 2/2] net: add a lock around icmp_sk() Message-ID: <20160831130346.7c60c24b@gandalf.local.home> In-Reply-To: <1472661463.14381.327.camel@edumazet-glaptop3.roam.corp.google.com> References: <20160831160049.14303-1-bigeasy@linutronix.de> <20160831160049.14303-2-bigeasy@linutronix.de> <1472661463.14381.327.camel@edumazet-glaptop3.roam.corp.google.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 31 Aug 2016 09:37:43 -0700 Eric Dumazet wrote: > On Wed, 2016-08-31 at 18:00 +0200, Sebastian Andrzej Siewior wrote: > > It looks like the this_cpu_ptr() access in icmp_sk() is protected with > > local_bh_disable(). To avoid missing serialization in -RT I am adding > > here a local lock. No crash has been observed, this is just precaution. > > > > > Hmm... > > > Signed-off-by: Sebastian Andrzej Siewior > > --- > > net/ipv4/icmp.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c > > index c1f1d5030d37..63731fd6af3e 100644 > > --- a/net/ipv4/icmp.c > > +++ b/net/ipv4/icmp.c > > @@ -78,6 +78,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -205,6 +206,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; > > * > > * On SMP we have one ICMP socket per-cpu. > > */ > > +static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock); > > + > > static struct sock *icmp_sk(struct net *net) > > { > > return *this_cpu_ptr(net->ipv4.icmp_sk); > > @@ -216,12 +219,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net) > > > > local_bh_disable(); > > > > + local_lock(icmp_sk_lock); > > Deadlock alert ? > Please read the comment few lines after, explaining why we have to use > spin_trylock(). > Or maybe I should double check what is local_lock() in RT And I don't know exactly what the deadlock scenario of the comment below is. Is it racing with a softirq somehow? Note, in RT softirqs can schedule out, and are preemptable. But I don't know enough about this code to know if that is enough to not have a deadlock here. -- Steve > > > sk = icmp_sk(net); > > > > if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { > > ... > > /* This can happen if the output path signals a > > * dst_link_failure() for an outgoing ICMP packet. > > */ > > > > + local_unlock(icmp_sk_lock); > > local_bh_enable(); > > return NULL; >