Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 10:56:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

futex: Correct the number of requeued waiters for PI

Browse Source 
The accounting is wrong when either the PI sanity check or the
requeue PI operation fails. Adjust it in the failure path.

Will be simplified in the next step.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211305.416427548@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-08-15 23:29:10 +02:00 committed by Ingo Molnar
parent 8e74633dce
commit 59c7ecf154
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/futex.c
View File

@ -2116,6 +2116,8 @@ retry_private:
/* Ensure we requeue to the expected futex for requeue_pi. */
if (requeue_pi && !match_futex(this->requeue_pi_key, &key2)) {
/* Don't account for it */
task_count--;
ret = -EINVAL;
break;
}
@ -2157,6 +2159,8 @@ retry_private:
*/
this->pi_state = NULL;
put_pi_state(pi_state);
/* Don't account for it */
task_count--;
/*
* We stop queueing more waiters and let user
* space deal with the mess.