Skip to content
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

[nrf fromlist] ipc: ipc_service: icbmsg backend: workaround endpoint binding deadlock #1676

Merged
merged 1 commit into from
May 8, 2024
Merged

[nrf fromlist] ipc: ipc_service: icbmsg backend: workaround endpoint binding deadlock #1676

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
22 changes: 21 additions & 1 deletion subsys/ipc/ipc_service/backends/ipc_icbmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ LOG_MODULE_REGISTER(ipc_icbmsg,
/** Registered endpoints count mask in flags. */
#define FLAG_EPT_COUNT_MASK 0xFFFF

/** Workqueue stack size for bounding processing (this configuration is not optimized). */
#define EP_BOUND_WORK_Q_STACK_SIZE (512U)

/** Workqueue priority for bounding processing. */
#define EP_BOUND_WORK_Q_PRIORITY (CONFIG_SYSTEM_WORKQUEUE_PRIORITY)

enum msg_type {
MSG_DATA = 0, /* Data message. */
MSG_RELEASE_DATA, /* Release data buffer message. */
Expand Down Expand Up @@ -194,6 +200,9 @@ struct control_message {

BUILD_ASSERT(NUM_EPT <= EPT_ADDR_INVALID, "Too many endpoints");

/* Work queue for bounding processing. */
static struct k_work_q ep_bound_work_q;

/**
* Calculate pointer to block from its index and channel configuration (RX or TX).
* No validation is performed.
Expand Down Expand Up @@ -672,7 +681,7 @@ static int send_bound_message(struct backend_data *dev_data, struct ept_data *ep
*/
static void schedule_ept_bound_process(struct backend_data *dev_data)
{
k_work_submit(&dev_data->ep_bound_work);
k_work_submit_to_queue(&ep_bound_work_q, &dev_data->ep_bound_work);
}

/**
Expand Down Expand Up @@ -1117,6 +1126,17 @@ static int backend_init(const struct device *instance)
{
const struct icbmsg_config *conf = instance->config;
struct backend_data *dev_data = instance->data;
static K_THREAD_STACK_DEFINE(ep_bound_work_q_stack, EP_BOUND_WORK_Q_STACK_SIZE);
static bool is_work_q_started;

if (!is_work_q_started) {
k_work_queue_init(&ep_bound_work_q);
k_work_queue_start(&ep_bound_work_q, ep_bound_work_q_stack,
K_THREAD_STACK_SIZEOF(ep_bound_work_q_stack),
EP_BOUND_WORK_Q_PRIORITY, NULL);

is_work_q_started = true;
}

dev_data->conf = conf;
dev_data->is_initiator = (conf->rx.blocks_ptr < conf->tx.blocks_ptr);
Expand Down
Loading