From: tip-bot for Matt Fleming <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:sched/core] sched/core: Reset RQCF_ACT_SKIP before unpinning rq->lock
Date: Sat, 14 Jan 2017 04:41:15 -0800 [thread overview]
Message-ID: <tip-92509b732baf14c59ca702307270cfaa3a585ae7@git.kernel.org> (raw)
In-Reply-To: <20160921133813.31976-6-matt@codeblueprint.co.uk>
Commit-ID: 92509b732baf14c59ca702307270cfaa3a585ae7
Gitweb: http://git.kernel.org/tip/92509b732baf14c59ca702307270cfaa3a585ae7
Author: Matt Fleming <matt@codeblueprint.co.uk>
AuthorDate: Wed, 21 Sep 2016 14:38:11 +0100
Committer: Ingo Molnar <mingo@kernel.org>
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 <matt@codeblueprint.co.uk>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Byungchul Park <byungchul.park@lge.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luca Abeni <luca.abeni@unitn.it>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Mike Galbraith <umgwanakikbuti@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: Yuyang Du <yuyang.du@intel.com>
Link: http://lkml.kernel.org/r/20160921133813.31976-6-matt@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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);
}
next prev parent reply other threads:[~2017-01-14 12:42 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 13:38 [PATCH v2 0/7] sched: Diagnostic checks for missing rq clock updates Matt Fleming
2016-09-21 13:38 ` [PATCH v2 1/7] sched/fair: Update the rq clock before detaching tasks Matt Fleming
2016-10-03 12:49 ` Peter Zijlstra
2016-10-03 14:37 ` Matt Fleming
2016-10-03 14:42 ` Peter Zijlstra
2016-09-21 13:38 ` [PATCH v2 2/7] sched/fair: Update rq clock before waking up new task Matt Fleming
2016-09-21 13:38 ` [PATCH v2 3/7] sched/fair: Update rq clock in task_hot() Matt Fleming
2016-09-21 13:38 ` [PATCH v2 4/7] sched: Add wrappers for lockdep_(un)pin_lock() Matt Fleming
2017-01-14 12:40 ` [tip:sched/core] sched/core: " tip-bot for Matt Fleming
2016-09-21 13:38 ` [PATCH v2 5/7] sched/core: Reset RQCF_ACT_SKIP before unpinning rq->lock Matt Fleming
2017-01-14 12:41 ` tip-bot for Matt Fleming [this message]
2016-09-21 13:38 ` [PATCH v2 6/7] sched/fair: Push rq lock pin/unpin into idle_balance() Matt Fleming
2017-01-14 12:41 ` [tip:sched/core] " tip-bot for Matt Fleming
2016-09-21 13:38 ` [PATCH v2 7/7] sched/core: Add debug code to catch missing update_rq_clock() Matt Fleming
2016-09-21 15:58 ` Petr Mladek
2016-09-21 19:08 ` Matt Fleming
2016-09-21 19:46 ` Thomas Gleixner
2016-09-22 0:44 ` Sergey Senozhatsky
2016-09-22 8:04 ` Peter Zijlstra
2016-09-22 8:36 ` Jan Kara
2016-09-22 9:39 ` Peter Zijlstra
2016-09-22 10:17 ` Peter Zijlstra
2017-01-14 12:44 ` [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls tip-bot for Matt Fleming
2017-01-30 21:24 ` Michael Ellerman
2017-01-30 21:24 ` Michael Ellerman
2017-01-30 21:34 ` Matt Fleming
2017-01-31 8:35 ` Michael Ellerman
2017-01-31 8:35 ` Michael Ellerman
2017-01-31 11:00 ` Sachin Sant
2017-01-31 11:00 ` Sachin Sant
2017-01-31 11:00 ` Sachin Sant
2017-01-31 11:48 ` Mike Galbraith
2017-01-31 11:48 ` Mike Galbraith
2017-01-31 11:48 ` Mike Galbraith
2017-01-31 17:22 ` Ross Zwisler
2017-01-31 17:22 ` Ross Zwisler
2017-02-02 15:55 ` Peter Zijlstra
2017-02-02 22:01 ` Matt Fleming
2017-02-03 3:05 ` Mike Galbraith
2017-02-03 4:33 ` Sachin Sant
2017-02-03 4:33 ` Sachin Sant
2017-02-03 8:53 ` Peter Zijlstra
2017-02-03 8:53 ` Peter Zijlstra
2017-02-03 11:04 ` Sachin Sant
2017-02-03 11:04 ` Sachin Sant
2017-02-03 12:59 ` Mike Galbraith
2017-02-03 12:59 ` Mike Galbraith
2017-02-03 13:37 ` Peter Zijlstra
2017-02-03 13:52 ` Mike Galbraith
2017-02-03 13:52 ` Mike Galbraith
2017-02-03 15:44 ` Paul E. McKenney
2017-02-03 15:54 ` Paul E. McKenney
2017-02-06 6:23 ` Sachin Sant
2017-02-06 6:23 ` Sachin Sant
2017-02-06 15:10 ` Paul E. McKenney
2017-02-06 15:14 ` Paul E. McKenney
2017-02-03 13:04 ` Borislav Petkov
2017-02-22 9:03 ` Wanpeng Li
2017-02-24 9:16 ` [tip:sched/urgent] sched/core: Fix update_rq_clock() splat on hotplug (and suspend/resume) tip-bot for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-92509b732baf14c59ca702307270cfaa3a585ae7@git.kernel.org \
--to=tipbot@zytor.com \
--cc=byungchul.park@lge.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luca.abeni@unitn.it \
--cc=matt@codeblueprint.co.uk \
--cc=mgorman@techsingularity.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=riel@redhat.com \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=umgwanakikbuti@gmail.com \
--cc=wanpeng.li@hotmail.com \
--cc=yuyang.du@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.