Re: [PATCH] rtmutex: ensure only the top waiter or higher priority task can take the lock and reduce unrelated boosting

Steven Rostedt
2011-01-06T14:50:33Z

On Wed, 2010-12-15 at 16:09 +0800, Lai Jiangshan wrote:

> kernel/futex.c | 26 +---
> kernel/rtmutex.c | 306 ++++++++++++++++--------------------------------
> kernel/rtmutex_common.h | 16 --
> 3 files changed, 116 insertions(+), 232 deletions(-)
>
> diff --git a/kernel/futex.c b/kernel/futex.c
> index 6c683b3..5f4ea5f 100644
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -775,18 +775,10 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
> return -EINVAL;
>
> raw_spin_lock(&pi_state->pi_mutex.wait_lock);
> + /* set new owner to the most possible owner(top waiter). */
> new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
>
> /*
> - * This happens when we have stolen the lock and the original
> - * pending owner did not enqueue itself back on the rt_mutex.
> - * Thats not a tragedy. We know that way, that a lock waiter
> - * is on the fly. We make the futex_q waiter the pending owner.
> - */
> - if (!new_owner)
> - new_owner = this->task;

Lai,

Why did you remove this? I just triggered a bug that was caused by
rt_mutex_next_owner() returning NULL.

Hmm, reading the comment it looks like it would only return NULL if the
next owner woke up and removed itself (which it does not do anymore).
But, this code is called unconditionally. I'm thinking we can trigger
this if a timeout occurred too.

I guess the real change should just be to the comment.

I can add trace debug to see if that was indeed the case.

-- Steve