Skip to content

posix: pthread: correct race condition between pthread_create and pthread_join #57637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

posix: pthread: correct race condition between pthread_create and pthread_join #57637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd264e5
Revert "posix: pthread: consider PTHREAD_EXITED state in pthread_create"
May 8, 2023
22bf59f
posix: pthread: initial and final state must be TERMINATED
May 8, 2023
084132e
kernel: Add z_thread_wake_joiners() utility
andyross May 10, 2023
02df615
lib/pthread: Fix create/join race in thread lifecycle
andyross May 9, 2023
f972d8e
posix: pthread: rewrite of create, join, detach, cancel, and exit
May 14, 2023
0231ff5
Revert "tests: posix: pthread: init pthread_attr_t on each iteration"
May 14, 2023
56b335a
tests: posix: common: add a small delay in pthread_descriptor_leak
May 14, 2023
cd77548
tests: posix: stress test for pthread_create and pthread_join
May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kernel/include/ksched.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void z_ready_thread(struct k_thread *thread);
void z_requeue_current(struct k_thread *curr);
struct k_thread *z_swap_next_thread(void);
void z_thread_abort(struct k_thread *thread);
void z_thread_wake_joiners(struct k_thread *thread);

static inline void z_pend_curr_unlocked(_wait_q_t *wait_q, k_timeout_t timeout)
{
Expand Down
7 changes: 7 additions & 0 deletions kernel/sched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,13 @@ static void end_thread(struct k_thread *thread)
}
}

void z_thread_wake_joiners(struct k_thread *thread)
{
LOCKED(&sched_spinlock) {
unpend_all(&thread->join_queue);
}
}

void z_thread_abort(struct k_thread *thread)
{
k_spinlock_key_t key = k_spin_lock(&sched_spinlock);
Expand Down
9 changes: 4 additions & 5 deletions lib/posix/posix_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define ZEPHYR_LIB_POSIX_POSIX_INTERNAL_H_

#include <zephyr/kernel.h>
#include <zephyr/sys/atomic.h>

/*
* Bit used to mark a pthread object as initialized. Initialization status is
Expand All @@ -31,14 +32,15 @@ enum pthread_state {
PTHREAD_DETACHED = PTHREAD_CREATE_DETACHED,
/* The thread is running and joinable. */
PTHREAD_JOINABLE = PTHREAD_CREATE_JOINABLE,
/* A joinable thread exited and its return code is available. */
PTHREAD_EXITED,
/* The thread structure is unallocated and available for reuse. */
PTHREAD_TERMINATED,
/* A joinable thread exited and its return code is available. */
PTHREAD_EXITED
};

struct posix_thread {
struct k_thread thread;
struct k_spinlock lock;

/* List of keys that thread has called pthread_setspecific() on */
sys_slist_t key_list;
Expand All @@ -49,12 +51,9 @@ struct posix_thread {
/* Pthread cancellation */
int cancel_state;
int cancel_pending;
struct k_spinlock cancel_lock;

/* Pthread State */
enum pthread_state state;
pthread_mutex_t state_lock;
pthread_cond_t state_cond;
};

typedef struct pthread_key_obj {
Expand Down
Loading