From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752200AbdANMmP (ORCPT ); Sat, 14 Jan 2017 07:42:15 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51608 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100AbdANMmN (ORCPT ); Sat, 14 Jan 2017 07:42:13 -0500 Date: Sat, 14 Jan 2017 04:41:15 -0800 From: tip-bot for Matt Fleming Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, umgwanakikbuti@gmail.com, efault@gmx.de, yuyang.du@intel.com, sergey.senozhatsky.work@gmail.com, peterz@infradead.org, fweisbec@gmail.com, pmladek@suse.com, luca.abeni@unitn.it, mgorman@techsingularity.net, byungchul.park@lge.com, linux-kernel@vger.kernel.org, wanpeng.li@hotmail.com, tglx@linutronix.de, riel@redhat.com, jack@suse.cz, mingo@kernel.org, matt@codeblueprint.co.uk Reply-To: efault@gmx.de, yuyang.du@intel.com, sergey.senozhatsky.work@gmail.com, hpa@zytor.com, umgwanakikbuti@gmail.com, torvalds@linux-foundation.org, riel@redhat.com, tglx@linutronix.de, jack@suse.cz, matt@codeblueprint.co.uk, mingo@kernel.org, linux-kernel@vger.kernel.org, wanpeng.li@hotmail.com, pmladek@suse.com, luca.abeni@unitn.it, mgorman@techsingularity.net, byungchul.park@lge.com, peterz@infradead.org, fweisbec@gmail.com In-Reply-To: <20160921133813.31976-6-matt@codeblueprint.co.uk> References: <20160921133813.31976-6-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/core: Reset RQCF_ACT_SKIP before unpinning rq->lock Git-Commit-ID: 92509b732baf14c59ca702307270cfaa3a585ae7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 92509b732baf14c59ca702307270cfaa3a585ae7 Gitweb: http://git.kernel.org/tip/92509b732baf14c59ca702307270cfaa3a585ae7 Author: Matt Fleming AuthorDate: Wed, 21 Sep 2016 14:38:11 +0100 Committer: Ingo Molnar CommitDate: Sat, 14 Jan 2017 11:29:31 +0100 sched/core: Reset RQCF_ACT_SKIP before unpinning rq->lock rq_clock() is called from sched_info_{depart,arrive}() after resetting RQCF_ACT_SKIP but prior to a call to update_rq_clock(). In preparation for pending patches that check whether the rq clock has been updated inside of a pin context before rq_clock() is called, move the reset of rq->clock_skip_update immediately before unpinning the rq lock. This will avoid the new warnings which check if update_rq_clock() is being actively skipped. Signed-off-by: Matt Fleming Signed-off-by: Peter Zijlstra (Intel) Cc: Byungchul Park Cc: Frederic Weisbecker Cc: Jan Kara Cc: Linus Torvalds Cc: Luca Abeni Cc: Mel Gorman Cc: Mike Galbraith Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Petr Mladek Cc: Rik van Riel Cc: Sergey Senozhatsky Cc: Thomas Gleixner Cc: Wanpeng Li Cc: Yuyang Du Link: http://lkml.kernel.org/r/20160921133813.31976-6-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- kernel/sched/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 41df935..311460b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2887,6 +2887,9 @@ context_switch(struct rq *rq, struct task_struct *prev, prev->active_mm = NULL; rq->prev_mm = oldmm; } + + rq->clock_skip_update = 0; + /* * Since the runqueue lock will be released by the next * task (which is an invalid locking op but in the case @@ -3392,7 +3395,6 @@ static void __sched notrace __schedule(bool preempt) next = pick_next_task(rq, prev, &rf); clear_tsk_need_resched(prev); clear_preempt_need_resched(); - rq->clock_skip_update = 0; if (likely(prev != next)) { rq->nr_switches++; @@ -3402,6 +3404,7 @@ static void __sched notrace __schedule(bool preempt) trace_sched_switch(preempt, prev, next); rq = context_switch(rq, prev, next, &rf); /* unlocks the rq */ } else { + rq->clock_skip_update = 0; rq_unpin_lock(rq, &rf); raw_spin_unlock_irq(&rq->lock); }