From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Brad Mouring <brad.mouring@ni.com>
Subject: [PATCH RT 2/7] rtmutex: Use chainwalking control enum
Date: Fri, 26 Feb 2016 16:42:09 -0500 [thread overview]
Message-ID: <20160226214222.565530691@goodmis.org> (raw)
In-Reply-To: 20160226214207.654222592@goodmis.org
[-- Attachment #1: 0002-rtmutex-Use-chainwalking-control-enum.patch --]
[-- Type: text/plain, Size: 1155 bytes --]
3.4.110-rt139-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "bmouring@ni.com" <bmouring@ni.com>
In 8930ed80 (rtmutex: Cleanup deadlock detector debug logic),
chainwalking control enums were introduced to limit the deadlock
detection logic. One of the calls to task_blocks_on_rt_mutex was
missed when converting to use the enums.
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/rtmutex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index d353e9191955..fe0cc8f328c8 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -1163,7 +1163,7 @@ static void noinline __sched rt_spin_lock_slowlock(struct rt_mutex *lock)
__set_current_state(TASK_UNINTERRUPTIBLE);
pi_unlock(&self->pi_lock);
- ret = task_blocks_on_rt_mutex(lock, &waiter, self, 0);
+ ret = task_blocks_on_rt_mutex(lock, &waiter, self, RT_MUTEX_MIN_CHAINWALK);
BUG_ON(ret);
for (;;) {
--
2.7.0
next prev parent reply other threads:[~2016-02-26 21:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 21:42 [PATCH RT 0/7] Linux 3.4.110-rt139-rc1 Steven Rostedt
2016-02-26 21:42 ` [PATCH RT 1/7] rtmutex: Handle non enqueued waiters gracefully Steven Rostedt
2016-02-26 21:42 ` Steven Rostedt [this message]
2016-02-26 21:42 ` [PATCH RT 3/7] dump stack: dont disable preemption during trace Steven Rostedt
2016-02-26 21:42 ` [PATCH RT 4/7] net: Make synchronize_rcu_expedited() conditional on !RT_FULL Steven Rostedt
2016-02-26 21:42 ` [PATCH RT 5/7] sched: Introduce the trace_sched_waking tracepoint Steven Rostedt
2016-02-26 21:42 ` [PATCH RT 6/7] rtmutex: Have slowfn of rt_mutex_timed_fastlock() use enum Steven Rostedt
2016-02-26 21:42 ` [PATCH RT 7/7] Linux 3.4.110-rt139-rc1 Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2016-02-26 21:44 [PATCH RT 0/7] Linux 3.2.77-rt111-rc1 Steven Rostedt
2016-02-26 21:44 ` [PATCH RT 2/7] rtmutex: Use chainwalking control enum Steven Rostedt
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=20160226214222.565530691@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=brad.mouring@ni.com \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).