History

futex: Add mutex around futex exit

The mutex will be used in subsequent changes to replace the busy looping of a waiter when the futex owner is currently executing the exit cleanup to prevent a potential live lock.

Thomas Gleixner committed 7 years ago

Commit 3f186d91 parent af8cbda3 files · +18 −0Browse files

Unified · Split

3 files
  1. include/linux/futex.h +1 −0
  2. include/linux/sched.h +1 −0
  3. kernel/futex.c +16 −0
include/linux/futex.h+1−0
@@ -65,6 +65,7 @@ static inline void futex_init_task(struct task_struct *tsk) · 64 unmodified lines
65 INIT_LIST_HEAD(&tsk->pi_state_list);65 INIT_LIST_HEAD(&tsk->pi_state_list);
66 tsk->pi_state_cache = NULL;66 tsk->pi_state_cache = NULL;
67 tsk->futex_state = FUTEX_STATE_OK;67 tsk->futex_state = FUTEX_STATE_OK;
68 mutex_init(&tsk->futex_exit_mutex);
68}69}
69 70
70void futex_exit_recursive(struct task_struct *tsk);71void futex_exit_recursive(struct task_struct *tsk);
include/linux/sched.h+1−0
@@ -1053,6 +1053,7 @@ struct task_struct { · 1052 unmodified lines
1053#endif1053#endif
1054 struct list_head pi_state_list;1054 struct list_head pi_state_list;
1055 struct futex_pi_state *pi_state_cache;1055 struct futex_pi_state *pi_state_cache;
1056 struct mutex futex_exit_mutex;
1056 unsigned int futex_state;1057 unsigned int futex_state;
1057#endif1058#endif
1058#ifdef CONFIG_PERF_EVENTS1059#ifdef CONFIG_PERF_EVENTS
kernel/futex.c+16−0
@@ -3698,11 +3698,22 @@ static void futex_cleanup(struct task_struct *tsk) · 3697 unmodified lines
3698 */3698 */
3699void futex_exit_recursive(struct task_struct *tsk)3699void 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
3704static void futex_cleanup_begin(struct task_struct *tsk)3707static 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
3731void futex_exec_release(struct task_struct *tsk)3747void futex_exec_release(struct task_struct *tsk)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t