| @@ -3698,11 +3698,22 @@ static void futex_cleanup(struct task_struct *tsk) · 3697 unmodified lines |
| 3698 | */ | 3698 | */ |
| 3699 | void futex_exit_recursive(struct task_struct *tsk) | 3699 | void futex_exit_recursive(struct task_struct *tsk) |
| 3700 | { | 3700 | { |
| | 3701 | /* If the state is FUTEX_STATE_EXITING then futex_exit_mutex is held */ |
| | 3702 | if (tsk->futex_state == FUTEX_STATE_EXITING) |
| | 3703 | mutex_unlock(&tsk->futex_exit_mutex); |
| 3701 | tsk->futex_state = FUTEX_STATE_DEAD; | 3704 | tsk->futex_state = FUTEX_STATE_DEAD; |
| 3702 | } | 3705 | } |
| 3703 | | 3706 | |
| 3704 | static void futex_cleanup_begin(struct task_struct *tsk) | 3707 | static void futex_cleanup_begin(struct task_struct *tsk) |
| 3705 | { | 3708 | { |
| | 3709 | /* |
| | 3710 | * Prevent various race issues against a concurrent incoming waiter |
| | 3711 | * including live locks by forcing the waiter to block on |
| | 3712 | * tsk->futex_exit_mutex when it observes FUTEX_STATE_EXITING in |
| | 3713 | * attach_to_pi_owner(). |
| | 3714 | */ |
| | 3715 | mutex_lock(&tsk->futex_exit_mutex); |
| | 3716 | |
| 3706 | /* | 3717 | /* |
| 3707 | * Switch the state to FUTEX_STATE_EXITING under tsk->pi_lock. | 3718 | * Switch the state to FUTEX_STATE_EXITING under tsk->pi_lock. |
| 3708 | * | 3719 | * |
| @@ -3726,6 +3737,11 @@ static void futex_cleanup_end(struct task_struct *tsk, int state) · 17 unmodified lines |
| 3726 | * take another loop until it becomes visible. | 3737 | * take another loop until it becomes visible. |
| 3727 | */ | 3738 | */ |
| 3728 | tsk->futex_state = state; | 3739 | tsk->futex_state = state; |
| | 3740 | /* |
| | 3741 | * Drop the exit protection. This unblocks waiters which observed |
| | 3742 | * FUTEX_STATE_EXITING to reevaluate the state. |
| | 3743 | */ |
| | 3744 | mutex_unlock(&tsk->futex_exit_mutex); |
| 3729 | } | 3745 | } |
| 3730 | | 3746 | |
| 3731 | void futex_exec_release(struct task_struct *tsk) | 3747 | void futex_exec_release(struct task_struct *tsk) |