From: Sasha Levin <levinsasha928@gmail.com>
To: kay@vrfy.org, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, isdn@linux-pingi.de, akpm@linux-foundation.org
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH 2/4] locking: add KERN_CONT when needed to self test
Date: Tue, 8 May 2012 17:56:11 +0200 [thread overview]
Message-ID: <1336492573-17530-2-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1336492573-17530-1-git-send-email-levinsasha928@gmail.com>
Fix this behaviour:
A-A deadlock:
ok |
ok |
ok |
ok |
ok |
ok |
Revealed due to a new modification to printk().
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
lib/locking-selftest.c | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 7aae0f2..885890a 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -959,16 +959,16 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
if (debug_locks != expected) {
if (expected_failure) {
expected_testcase_failures++;
- printk("failed|");
+ printk(KERN_CONT "failed|");
} else {
unexpected_testcase_failures++;
- printk("FAILED|");
+ printk(KERN_CONT "FAILED|");
dump_stack();
}
} else {
testcase_successes++;
- printk(" ok |");
+ printk(KERN_CONT " ok |");
}
testcase_total++;
@@ -998,26 +998,26 @@ static inline void print_testname(const char *testname)
#define DO_TESTCASE_1(desc, name, nr) \
print_testname(desc"/"#nr); \
dotest(name##_##nr, SUCCESS, LOCKTYPE_RWLOCK); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_1B(desc, name, nr) \
print_testname(desc"/"#nr); \
dotest(name##_##nr, FAILURE, LOCKTYPE_RWLOCK); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_3(desc, name, nr) \
print_testname(desc"/"#nr); \
dotest(name##_spin_##nr, FAILURE, LOCKTYPE_SPIN); \
dotest(name##_wlock_##nr, FAILURE, LOCKTYPE_RWLOCK); \
dotest(name##_rlock_##nr, SUCCESS, LOCKTYPE_RWLOCK); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_3RW(desc, name, nr) \
print_testname(desc"/"#nr); \
dotest(name##_spin_##nr, FAILURE, LOCKTYPE_SPIN|LOCKTYPE_RWLOCK);\
dotest(name##_wlock_##nr, FAILURE, LOCKTYPE_RWLOCK); \
dotest(name##_rlock_##nr, SUCCESS, LOCKTYPE_RWLOCK); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_6(desc, name) \
print_testname(desc); \
@@ -1027,7 +1027,7 @@ static inline void print_testname(const char *testname)
dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX); \
dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \
dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_6_SUCCESS(desc, name) \
print_testname(desc); \
@@ -1037,7 +1037,7 @@ static inline void print_testname(const char *testname)
dotest(name##_mutex, SUCCESS, LOCKTYPE_MUTEX); \
dotest(name##_wsem, SUCCESS, LOCKTYPE_RWSEM); \
dotest(name##_rsem, SUCCESS, LOCKTYPE_RWSEM); \
- printk("\n");
+ printk(KERN_CONT "\n");
/*
* 'read' variant: rlocks must not trigger.
@@ -1050,7 +1050,7 @@ static inline void print_testname(const char *testname)
dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX); \
dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \
dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \
- printk("\n");
+ printk(KERN_CONT "\n");
#define DO_TESTCASE_2I(desc, name, nr) \
DO_TESTCASE_1("hard-"desc, name##_hard, nr); \
@@ -1146,32 +1146,32 @@ void locking_selftest(void)
printk(" --------------------------------------------------------------------------\n");
print_testname("recursive read-lock");
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rlock_AA1, SUCCESS, LOCKTYPE_RWLOCK);
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rsem_AA1, FAILURE, LOCKTYPE_RWSEM);
- printk("\n");
+ printk(KERN_CONT "\n");
print_testname("recursive read-lock #2");
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rlock_AA1B, SUCCESS, LOCKTYPE_RWLOCK);
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM);
- printk("\n");
+ printk(KERN_CONT "\n");
print_testname("mixed read-write-lock");
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rlock_AA2, FAILURE, LOCKTYPE_RWLOCK);
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rsem_AA2, FAILURE, LOCKTYPE_RWSEM);
- printk("\n");
+ printk(KERN_CONT "\n");
print_testname("mixed write-read-lock");
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rlock_AA3, FAILURE, LOCKTYPE_RWLOCK);
- printk(" |");
+ printk(KERN_CONT " |");
dotest(rsem_AA3, FAILURE, LOCKTYPE_RWSEM);
- printk("\n");
+ printk(KERN_CONT "\n");
printk(" --------------------------------------------------------------------------\n");
--
1.7.8.5
next prev parent reply other threads:[~2012-05-08 15:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 15:56 [PATCH 1/4] mm: add missing KERN_CONT to free_area_init_nodes Sasha Levin
2012-05-08 15:56 ` Sasha Levin [this message]
2012-05-08 15:56 ` [PATCH 3/4] x86, NMI: add missing KERN_CONT to NMI selftest Sasha Levin
2012-05-21 17:25 ` [tip:x86/urgent] x86, printk: Add " tip-bot for Sasha Levin
2012-05-21 17:29 ` Joe Perches
2012-05-21 17:42 ` H. Peter Anvin
2012-05-21 17:56 ` Joe Perches
2012-05-21 17:57 ` H. Peter Anvin
2012-05-22 2:49 ` [PATCH 1/2] x86: asm: Add KERN_<LEVEL> to printks Joe Perches
2012-05-22 2:50 ` [PATCH 2/2] x86: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level> Joe Perches
2012-06-06 15:03 ` [tip:x86/debug] x86/debug: " tip-bot for Joe Perches
2012-05-08 15:56 ` [PATCH 4/4] ISDN: add missing KERN_CONT Sasha Levin
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=1336492573-17530-2-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=isdn@linux-pingi.de \
--cc=kay@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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
Powered by JetHome