Skip to content

lib: os: mpsc_pbuf: fix potential semaphore wait forever #97931

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

lib: os: mpsc_pbuf: fix potential semaphore wait forever #97931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions lib/os/mpsc_pbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,9 @@ const union mpsc_pbuf_generic *mpsc_pbuf_claim(struct mpsc_pbuf_buffer *buffer)
{
union mpsc_pbuf_generic *item;
bool cont;
#ifdef CONFIG_MULTITHREADING
bool need_post = false;
#endif

do {
uint32_t a;
Expand All @@ -562,6 +565,9 @@ const union mpsc_pbuf_generic *mpsc_pbuf_claim(struct mpsc_pbuf_buffer *buffer)
idx_inc(buffer, buffer->tmp_rd_idx, inc);
rd_idx_inc(buffer, inc);
cont = true;
#ifdef CONFIG_MULTITHREADING
need_post = true;
#endif
} else {
item->hdr.busy = 1;
buffer->tmp_rd_idx =
Expand All @@ -576,6 +582,11 @@ const union mpsc_pbuf_generic *mpsc_pbuf_claim(struct mpsc_pbuf_buffer *buffer)
k_spin_unlock(&buffer->lock, key);
} while (cont);

#ifdef CONFIG_MULTITHREADING
if (need_post && item == NULL) {
k_sem_give(&buffer->sem);
}
#endif
return item;
}

Expand Down