Skip to content

ipc: fix recursive data queue locking on SMP #11643

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
GuEe-GUI wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −18
Open

ipc: fix recursive data queue locking on SMP #11643

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
35 changes: 17 additions & 18 deletions components/drivers/ipc/dataqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ struct rt_data_item
rt_size_t data_size;
};

static rt_uint16_t _data_queue_len_nolock(struct rt_data_queue *queue)
{
if (queue->is_empty)
{
return 0;
}
if (queue->put_index > queue->get_index)
{
return queue->put_index - queue->get_index;
}

return queue->size + queue->put_index - queue->get_index;
}

/**
* @brief This function will initialize the data queue. Calling this function will
* initialize the data queue control block and set the notification callback function.
Expand Down Expand Up @@ -283,7 +297,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
queue->is_empty = 1;
}

if (rt_data_queue_len(queue) <= queue->lwm)
if (_data_queue_len_nolock(queue) <= queue->lwm)
{
/* there is at least one thread in suspended list */
if (rt_susp_list_dequeue(&queue->suspended_push_list,
Expand Down Expand Up @@ -432,30 +446,15 @@ RTM_EXPORT(rt_data_queue_deinit);
rt_uint16_t rt_data_queue_len(struct rt_data_queue *queue)
{
rt_base_t level;
rt_int16_t len;
rt_uint16_t len;

RT_ASSERT(queue != RT_NULL);
RT_ASSERT(queue->magic == DATAQUEUE_MAGIC);

if (queue->is_empty)
{
return 0;
}

level = rt_spin_lock_irqsave(&(queue->spinlock));

if (queue->put_index > queue->get_index)
{
len = queue->put_index - queue->get_index;
}
else
{
len = queue->size + queue->put_index - queue->get_index;
}

len = _data_queue_len_nolock(queue);
rt_spin_unlock_irqrestore(&(queue->spinlock), level);

return len;
}
RTM_EXPORT(rt_data_queue_len);

Loading