From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935212AbbI2PnE (ORCPT ); Tue, 29 Sep 2015 11:43:04 -0400 Received: from smtprelay0251.hostedemail.com ([216.40.44.251]:34877 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935060AbbI2Pma (ORCPT ); Tue, 29 Sep 2015 11:42:30 -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:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3871:3872:5007:6261:7875:7903:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12438:12517:12519:12740:13069:13311:13357:21080,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 X-HE-Tag: heart97_32b1f82bda149 X-Filterd-Recvd-Size: 2341 Date: Tue, 29 Sep 2015 11:42:27 -0400 From: Steven Rostedt To: Peter Zijlstra Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, fweisbec@gmail.com, oleg@redhat.com, umgwanakikbuti@gmail.com, tglx@linutronix.de Subject: Re: [RFC][PATCH 08/11] sched: Simplify preempt_count tests Message-ID: <20150929114227.653226aa@gandalf.local.home> In-Reply-To: <20150929093520.415441370@infradead.org> References: <20150929092825.540553633@infradead.org> <20150929093520.415441370@infradead.org> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; 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 Tue, 29 Sep 2015 11:28:33 +0200 Peter Zijlstra wrote: > Since we stopped setting PREEMPT_ACTIVE, there is no need to mask it > out of preempt_count() tests. > > Signed-off-by: Peter Zijlstra (Intel) > --- Reviewed-by: Steven Rostedt -- Steve > include/linux/preempt.h | 3 +-- > kernel/sched/core.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > --- a/include/linux/preempt.h > +++ b/include/linux/preempt.h > @@ -126,8 +126,7 @@ > * Check whether we were atomic before we did preempt_disable(): > * (used by the scheduler) > */ > -#define in_atomic_preempt_off() \ > - ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_DISABLE_OFFSET) > +#define in_atomic_preempt_off() (preempt_count() != PREEMPT_DISABLE_OFFSET) > > #if defined(CONFIG_DEBUG_PREEMPT) || defined(CONFIG_PREEMPT_TRACER) > extern void preempt_count_add(int val); > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -7472,7 +7472,7 @@ void __init sched_init(void) > #ifdef CONFIG_DEBUG_ATOMIC_SLEEP > static inline int preempt_count_equals(int preempt_offset) > { > - int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth(); > + int nested = preempt_count() + rcu_preempt_depth(); > > return (nested == preempt_offset); > } >