From: "Bill Huey (hui)" <bill.huey@gmail.com>
To: "Gregory Haskins" <ghaskins@novell.com>, mingo@elte.hu
Cc: a.p.zijlstra@chello.nl, tglx@linutronix.de, rostedt@goodmis.org,
linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org,
kevin@hilman.org, cminyard@mvista.com, dsingleton@mvista.com,
dwalker@mvista.com, npiggin@suse.de, dsaxena@plexity.net,
ak@suse.de, pavel@ucw.cz, acme@redhat.com, gregkh@suse.de,
sdietrich@novell.com, pmorreale@novell.com, mkohari@novell.com
Subject: Re: [PATCH RT 5/6] lockstat measurement extensions
Date: Thu, 13 Mar 2008 17:18:04 -0700 [thread overview]
Message-ID: <9810cff90803131718ge958e9fo9ae3f43b57f7654c@mail.gmail.com> (raw)
In-Reply-To: <9810cff90803131715h1a93c9a1q86f480cf398d4dfb@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 110 bytes --]
Lock function bodies are extended to pass down a struct lockdep_map
and friends for contention logging.
bill
[-- Attachment #2: patch4.diff --]
[-- Type: application/octet-stream, Size: 10929 bytes --]
--- linux-2.6.24/kernel/rt.c 2008-02-25 15:32:05.000000000 -0800
+++ linux-2.6.24.working/kernel/rt.c 2008-03-12 22:40:09.000000000 -0700
@@ -102,9 +102,9 @@
}
EXPORT_SYMBOL(_mutex_lock);
-static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock)
+static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock __LOCKDEP_DECLS)
{
- return rt_mutex_lock_interruptible(lock, 0);
+ return rt_mutex_lock_interruptible(lock, 0 __LOCKDEP_PARAMS);
}
int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
@@ -144,7 +144,7 @@
int __lockfunc _mutex_trylock(struct mutex *lock)
{
- int ret = rt_mutex_trylock(&lock->lock);
+ int ret = __rt_mutex_trylock(&lock->lock __LOCKDEP_PARAMS_L0);
if (ret)
mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
@@ -163,21 +163,28 @@
/*
* rwlock_t functions
*/
-int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+static
+int __lockfunc __rt_write_trylock(rwlock_t *rwlock __LOCKDEP_DECLS)
{
- int ret = rt_mutex_trylock(&rwlock->lock);
+ //int ret = __rt_mutex_trylock(&rwlock->lock __LOCKDEP_PARAMS);
+ int ret = __rt_mutex_trylock(&rwlock->lock, rt_mutex_real_owner(&rwlock->lock), _dep_map, _ip);
if (ret)
rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
return ret;
}
+
+int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+{
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
+}
EXPORT_SYMBOL(rt_write_trylock);
int __lockfunc rt_write_trylock_irqsave(rwlock_t *rwlock, unsigned long *flags)
{
*flags = 0;
- return rt_write_trylock(rwlock);
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
}
EXPORT_SYMBOL(rt_write_trylock_irqsave);
@@ -453,7 +460,7 @@
void fastcall rt_down(struct semaphore *sem)
{
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
__down_complete(sem);
}
EXPORT_SYMBOL(rt_down);
@@ -462,7 +469,7 @@
{
int ret;
- ret = rt_mutex_lock_interruptible(&sem->lock, 0);
+ ret = rt_mutex_lock_interruptible(&sem->lock, 0 __LOCKDEP_PARAMS_SEM(sem));
if (ret)
return ret;
__down_complete(sem);
@@ -516,7 +523,7 @@
switch (val) {
case 0:
__rt_mutex_init(&sem->lock, name);
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
break;
default:
__rt_mutex_init(&sem->lock, name);
--- linux-2.6.24/kernel/mutex.c 2008-01-24 14:58:37.000000000 -0800
+++ linux-2.6.24.working/kernel/mutex.c 2008-03-13 13:03:06.000000000 -0700
@@ -146,7 +146,7 @@
if (old_val == 1)
goto done;
- lock_contended(&lock->dep_map, ip);
+// lock_note_contended(LOCKDEP_PARAMS);
for (;;) {
/*
@@ -184,7 +184,7 @@
}
done:
- lock_acquired(&lock->dep_map);
+// lock_acquired(&lock->dep_map);
/* got the lock - rejoice! */
mutex_remove_waiter(lock, &waiter, task_thread_info(task));
debug_mutex_set_owner(lock, task_thread_info(task));
--- linux-2.6.24/kernel/rwsem.c 2008-02-25 15:32:05.000000000 -0800
+++ linux-2.6.24.working/kernel/rwsem.c 2008-03-11 02:45:20.000000000 -0700
@@ -21,7 +21,7 @@
might_sleep();
rwsem_acquire_read(&sem->dep_map, 0, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_read_trylock, __down_read);
+ LOCK_CONTENDED_COMPAT(sem, __down_read_trylock, __down_read);
}
EXPORT_SYMBOL(compat_down_read);
@@ -48,7 +48,7 @@
might_sleep();
rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_write_trylock, __down_write);
+ LOCK_CONTENDED_COMPAT(sem, __down_write_trylock, __down_write);
}
EXPORT_SYMBOL(compat_down_write);
@@ -112,7 +112,7 @@
might_sleep();
rwsem_acquire_read(&sem->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_read_trylock, __down_read);
+ LOCK_CONTENDED_COMPAT(sem, __down_read_trylock, __down_read);
}
EXPORT_SYMBOL(compat_down_read_nested);
@@ -131,7 +131,7 @@
might_sleep();
rwsem_acquire(&sem->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_write_trylock, __down_write);
+ LOCK_CONTENDED_COMPAT(sem, __down_write_trylock, __down_write);
}
EXPORT_SYMBOL(compat_down_write_nested);
--- linux-2.6.24/kernel/rt.c 2008-02-25 15:32:05.000000000 -0800
+++ linux-2.6.24.working/kernel/rt.c 2008-03-12 22:40:09.000000000 -0700
@@ -102,9 +102,9 @@
}
EXPORT_SYMBOL(_mutex_lock);
-static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock)
+static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock __LOCKDEP_DECLS)
{
- return rt_mutex_lock_interruptible(lock, 0);
+ return rt_mutex_lock_interruptible(lock, 0 __LOCKDEP_PARAMS);
}
int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
@@ -144,7 +144,7 @@
int __lockfunc _mutex_trylock(struct mutex *lock)
{
- int ret = rt_mutex_trylock(&lock->lock);
+ int ret = __rt_mutex_trylock(&lock->lock __LOCKDEP_PARAMS_L0);
if (ret)
mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
@@ -163,21 +163,28 @@
/*
* rwlock_t functions
*/
-int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+static
+int __lockfunc __rt_write_trylock(rwlock_t *rwlock __LOCKDEP_DECLS)
{
- int ret = rt_mutex_trylock(&rwlock->lock);
+ //int ret = __rt_mutex_trylock(&rwlock->lock __LOCKDEP_PARAMS);
+ int ret = __rt_mutex_trylock(&rwlock->lock, rt_mutex_real_owner(&rwlock->lock), _dep_map, _ip);
if (ret)
rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
return ret;
}
+
+int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+{
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
+}
EXPORT_SYMBOL(rt_write_trylock);
int __lockfunc rt_write_trylock_irqsave(rwlock_t *rwlock, unsigned long *flags)
{
*flags = 0;
- return rt_write_trylock(rwlock);
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
}
EXPORT_SYMBOL(rt_write_trylock_irqsave);
@@ -453,7 +460,7 @@
void fastcall rt_down(struct semaphore *sem)
{
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
__down_complete(sem);
}
EXPORT_SYMBOL(rt_down);
@@ -462,7 +469,7 @@
{
int ret;
- ret = rt_mutex_lock_interruptible(&sem->lock, 0);
+ ret = rt_mutex_lock_interruptible(&sem->lock, 0 __LOCKDEP_PARAMS_SEM(sem));
if (ret)
return ret;
__down_complete(sem);
@@ -516,7 +523,7 @@
switch (val) {
case 0:
__rt_mutex_init(&sem->lock, name);
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
break;
default:
__rt_mutex_init(&sem->lock, name);
--- linux-2.6.24/kernel/mutex.c 2008-01-24 14:58:37.000000000 -0800
+++ linux-2.6.24.working/kernel/mutex.c 2008-03-13 13:03:06.000000000 -0700
@@ -146,7 +146,7 @@
if (old_val == 1)
goto done;
- lock_contended(&lock->dep_map, ip);
+// lock_note_contended(LOCKDEP_PARAMS);
for (;;) {
/*
@@ -184,7 +184,7 @@
}
done:
- lock_acquired(&lock->dep_map);
+// lock_acquired(&lock->dep_map);
/* got the lock - rejoice! */
mutex_remove_waiter(lock, &waiter, task_thread_info(task));
debug_mutex_set_owner(lock, task_thread_info(task));
--- linux-2.6.24/kernel/rwsem.c 2008-02-25 15:32:05.000000000 -0800
+++ linux-2.6.24.working/kernel/rwsem.c 2008-03-11 02:45:20.000000000 -0700
@@ -21,7 +21,7 @@
might_sleep();
rwsem_acquire_read(&sem->dep_map, 0, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_read_trylock, __down_read);
+ LOCK_CONTENDED_COMPAT(sem, __down_read_trylock, __down_read);
}
EXPORT_SYMBOL(compat_down_read);
@@ -48,7 +48,7 @@
might_sleep();
rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_write_trylock, __down_write);
+ LOCK_CONTENDED_COMPAT(sem, __down_write_trylock, __down_write);
}
EXPORT_SYMBOL(compat_down_write);
@@ -112,7 +112,7 @@
might_sleep();
rwsem_acquire_read(&sem->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_read_trylock, __down_read);
+ LOCK_CONTENDED_COMPAT(sem, __down_read_trylock, __down_read);
}
EXPORT_SYMBOL(compat_down_read_nested);
@@ -131,7 +131,7 @@
might_sleep();
rwsem_acquire(&sem->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED(sem, __down_write_trylock, __down_write);
+ LOCK_CONTENDED_COMPAT(sem, __down_write_trylock, __down_write);
}
EXPORT_SYMBOL(compat_down_write_nested);
--- linux-2.6.24/kernel/rt.c 2008-02-25 15:32:05.000000000 -0800
+++ linux-2.6.24.working/kernel/rt.c 2008-03-12 22:40:09.000000000 -0700
@@ -102,9 +102,9 @@
}
EXPORT_SYMBOL(_mutex_lock);
-static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock)
+static int __lockfunc __rt_mutex_lock_interruptible(struct rt_mutex *lock __LOCKDEP_DECLS)
{
- return rt_mutex_lock_interruptible(lock, 0);
+ return rt_mutex_lock_interruptible(lock, 0 __LOCKDEP_PARAMS);
}
int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
@@ -144,7 +144,7 @@
int __lockfunc _mutex_trylock(struct mutex *lock)
{
- int ret = rt_mutex_trylock(&lock->lock);
+ int ret = __rt_mutex_trylock(&lock->lock __LOCKDEP_PARAMS_L0);
if (ret)
mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
@@ -163,21 +163,28 @@
/*
* rwlock_t functions
*/
-int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+static
+int __lockfunc __rt_write_trylock(rwlock_t *rwlock __LOCKDEP_DECLS)
{
- int ret = rt_mutex_trylock(&rwlock->lock);
+ //int ret = __rt_mutex_trylock(&rwlock->lock __LOCKDEP_PARAMS);
+ int ret = __rt_mutex_trylock(&rwlock->lock, rt_mutex_real_owner(&rwlock->lock), _dep_map, _ip);
if (ret)
rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
return ret;
}
+
+int __lockfunc rt_write_trylock(rwlock_t *rwlock)
+{
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
+}
EXPORT_SYMBOL(rt_write_trylock);
int __lockfunc rt_write_trylock_irqsave(rwlock_t *rwlock, unsigned long *flags)
{
*flags = 0;
- return rt_write_trylock(rwlock);
+ return __rt_write_trylock(rwlock __LOCKDEP_PARAMS_L0);
}
EXPORT_SYMBOL(rt_write_trylock_irqsave);
@@ -453,7 +460,7 @@
void fastcall rt_down(struct semaphore *sem)
{
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
__down_complete(sem);
}
EXPORT_SYMBOL(rt_down);
@@ -462,7 +469,7 @@
{
int ret;
- ret = rt_mutex_lock_interruptible(&sem->lock, 0);
+ ret = rt_mutex_lock_interruptible(&sem->lock, 0 __LOCKDEP_PARAMS_SEM(sem));
if (ret)
return ret;
__down_complete(sem);
@@ -516,7 +523,7 @@
switch (val) {
case 0:
__rt_mutex_init(&sem->lock, name);
- rt_mutex_lock(&sem->lock);
+ rt_mutex_lock(&sem->lock __LOCKDEP_PARAMS_SEM(sem));
break;
default:
__rt_mutex_init(&sem->lock, name);
--- linux-2.6.24/kernel/mutex.c 2008-01-24 14:58:37.000000000 -0800
+++ linux-2.6.24.working/kernel/mutex.c 2008-03-13 13:03:06.000000000 -0700
@@ -146,7 +146,7 @@
if (old_val == 1)
goto done;
- lock_contended(&lock->dep_map, ip);
+// lock_note_contended(LOCKDEP_PARAMS);
for (;;) {
/*
@@ -184,7 +184,7 @@
}
done:
- lock_acquired(&lock->dep_map);
+// lock_acquired(&lock->dep_map);
/* got the lock - rejoice! */
mutex_remove_waiter(lock, &waiter, task_thread_info(task));
debug_mutex_set_owner(lock, task_thread_info(task));
next prev parent reply other threads:[~2008-03-14 0:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-14 0:03 [PATCH RT 0/6] " Bill Huey (hui)
2008-03-14 0:07 ` [PATCH RT 1/6] " Bill Huey (hui)
2008-03-14 0:09 ` [PATCH RT 2/6] " Bill Huey (hui)
2008-03-14 0:12 ` [PATCH RT 3/6] " Bill Huey (hui)
2008-03-14 0:15 ` [PATCH RT 4/6] " Bill Huey (hui)
2008-03-14 0:18 ` Bill Huey (hui) [this message]
2008-03-14 0:19 ` [PATCH RT 6/6] " Bill Huey (hui)
2008-03-14 0:26 ` [PATCH RT 0/6] " Bill Huey (hui)
2008-03-14 0:40 ` Bill Huey (hui)
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=9810cff90803131718ge958e9fo9ae3f43b57f7654c@mail.gmail.com \
--to=bill.huey@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=ak@suse.de \
--cc=cminyard@mvista.com \
--cc=dsaxena@plexity.net \
--cc=dsingleton@mvista.com \
--cc=dwalker@mvista.com \
--cc=ghaskins@novell.com \
--cc=gregkh@suse.de \
--cc=kevin@hilman.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mkohari@novell.com \
--cc=npiggin@suse.de \
--cc=pavel@ucw.cz \
--cc=pmorreale@novell.com \
--cc=rostedt@goodmis.org \
--cc=sdietrich@novell.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
all inboxes | Powered by JetHome®