Try to safely error out when mixing pi/non-pi futex operations on the same futex.
RFC PATCH 1/1 Try to safely error out when mixing pi/non-pi futex operations on the same futex.
Ingo,
We've been seeing some oopses because there are waiters on pi futexes
that do not have pi_states. This seems to be because they were used w/ futex_wait in one path and futex_lock_pi in another.
I'm told this shouldn't ever happen, but if it did, the kernel should safely error out, instead of oopsing or never releasing a lock.
Not sure if this is a solid fix (it does build and boot), but hopefully it will stir up some discussion.
thanks
-john
Try to handle odd cases where a futex is used w/ both the pi and non-pi methods.
kernel/futex.c +21 -6
@@ -472,11 +472,17 @@list_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &me->key)) { -/* -* Another waiter already exists - bump up -* the refcount and return its pi_state: -*/ +/* Another waiter already exists */ pi_state = this->pi_state; + +/* make sure its a PI waiter: */ +if (!pi_state) { +printk ("BUG: %s/%d: Mixing pi and non pi" +" futexes!\n" , current->comm, + current->pid); +return -EINVAL ; + } +/* bump up the refcount and return its pi_state: */ atomic_inc (&pi_state->refcount); me->pi_state = pi_state; pr_debug("Waiter found: %d\n",
@@ -638,8 +644,14 @@list_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &key)) { -if (this->pi_state) -return -EINVAL ; +/* XXX - this might cause odd behavior +* as we may have already woken some futexes +* before we return -EINVAL [email protected] +*/ +if (this->pi_state) { + ret = -EINVAL ; +break ; + }wake_futex (this);if (++ret >= nr_wake)break ;
@@ -1200,6 +1212,9 @@ ret =lookup_pi_state (uval, hb, &q);if (unlikely (ret)) { +/* Handle pi/non-pi mixups: */ +if (ret == -EINVAL ) + goto out_unlock_release_sem;/* * There were no waiters and the owner task lookup * failed. When the OWNER_DIED bit is set, then we
Ingo Molnar
AppliedQuoted 4 lines · john stultz
Ingo,
We've been seeing some oopses because there are waiters on pi
futexes that do not havepi_states. This seems to be because they were used w/futex_waitin one path andfutex_lock_piin another.
indeed, that's a bug.
Quoted 5 lines
I'm told this shouldn't ever happen, but if it did, the kernel should safely error out, instead of oopsing or never releasing a lock.
Not sure if this is a solid fix (it does build and boot), but hopefully it will stir up some discussion.
applied. I made some small fixes: i made the printk rate-limited and dependent on CONFIG_DEBUG_RT_MUTEXES. The right thing is indeed to -EINVAL.
Ingo