14 Feb
2019
14 Feb
'19
12:52 p.m.
On Wed, 13 Feb 2019 23:07:24 +0100, Pierre-Louis Bossart wrote:
+/* wait for IPC message reply */ +static int tx_wait_done(struct snd_sof_ipc *ipc, struct snd_sof_ipc_msg *msg,
void *reply_data)+{
- struct snd_sof_dev *sdev = ipc->sdev;
- struct sof_ipc_cmd_hdr *hdr = (struct sof_ipc_cmd_hdr *)msg->msg_data;
- int ret;
- /* wait for DSP IPC completion */
- ret = wait_event_timeout(msg->waitq, msg->ipc_complete,
msecs_to_jiffies(IPC_TIMEOUT_MS));- /*
* ipc_lock is used to protect ipc message list shared by user* contexts and a workqueue. There is no need to save interrupt* status with spin_lock_irqsave.*/- spin_lock_irq(&sdev->ipc_lock);
- if (ret == 0) {
dev_err(sdev->dev, "error: ipc timed out for 0x%x size 0x%x\n",hdr->cmd, hdr->size);snd_sof_dsp_dbg_dump(ipc->sdev, SOF_DBG_REGS | SOF_DBG_MBOX);snd_sof_trace_notify_for_error(ipc->sdev);ret = -ETIMEDOUT;- } else {
/* copy the data returned from DSP */ret = snd_sof_dsp_get_reply(sdev, msg);if (msg->reply_size)memcpy(reply_data, msg->reply_data, msg->reply_size);
I'd add a sanity check here for avoiding a buffer overflow. The reply buffer seems to be allocated in PAGE_SIZE. Will it be more than that?
+/* find original TX message from DSP reply */ +static struct snd_sof_ipc_msg *sof_ipc_reply_find_msg(struct snd_sof_ipc *ipc,
u32 header)+{
- struct snd_sof_dev *sdev = ipc->sdev;
- struct snd_sof_ipc_msg *msg;
- header = SOF_IPC_MESSAGE_ID(header);
- list_for_each_entry(msg, &ipc->reply_list, list) {
if (SOF_IPC_MESSAGE_ID(msg->header) == header)return msg;- }
Is it safe to traverse the list without lock here? There seems no lock in this and relevant code.
thanks,
Takashi