linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yong Zhang <yong.zhang0@gmail.com>
To: linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, Yong Zhang <yong.zhang@windriver.com>
Subject: [PATCH 3/3 -rt] lockdep: selftest: save/restore migrate_disable count
Date: Tue, 17 Apr 2012 15:23:39 +0800	[thread overview]
Message-ID: <1334647419-10337-1-git-send-email-yong.zhang0@gmail.com> (raw)
In-Reply-To: <1334559716-18447-1-git-send-email-yong.zhang0@gmail.com>

From: Yong Zhang <yong.zhang@windriver.com>

->migrate_disable_atomic will corrupt when doing some
case, such as double lock...

->migrate_disable will not be affected for now since
we have preempt disabled when doing seft test.
Just record it also for safe.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
---
Found it when enable CONFIG_SCHED_DEBUG.

 lib/locking-selftest.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 23b8564..a9cb9e4 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -939,6 +939,12 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
 {
 	unsigned long saved_preempt_count = preempt_count();
 	int expected_failure = 0;
+#ifdef CONFIG_PREEMPT_RT_FULL
+	int saved_migrate_disable = current->migrate_disable;
+# ifdef CONFIG_SCHED_DEBUG
+	int saved_migrate_disable_atomic = current->migrate_disable_atomic;
+# endif
+#endif
 
 	WARN_ON(irqs_disabled());
 
@@ -980,6 +986,13 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
 	 * count, so restore it:
 	 */
 	preempt_count() = saved_preempt_count;
+#ifdef CONFIG_PREEMPT_RT_FULL
+	current->migrate_disable = saved_migrate_disable;
+# ifdef CONFIG_SCHED_DEBUG
+	current->migrate_disable_atomic = saved_migrate_disable_atomic;
+# endif
+#endif
+
 #ifdef CONFIG_TRACE_IRQFLAGS
 	if (softirq_count())
 		current->softirqs_enabled = 0;
-- 
1.7.5.4


      parent reply	other threads:[~2012-04-17  7:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-16  7:01 [PATCH 0/2 -rt] make locckdep selftest work on -rt Yong Zhang
2012-04-16  7:01 ` [PATCH 1/2 -rt] lockdep: selftest: convert spinlock to raw spinlock Yong Zhang
2012-04-16  7:01 ` [PATCH 2/2 -rt] lockdep: selftest: Only do hardirq context test for " Yong Zhang
2012-04-17  7:23 ` Yong Zhang [this message]

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=1334647419-10337-1-git-send-email-yong.zhang0@gmail.com \
    --to=yong.zhang0@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=yong.zhang@windriver.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 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).