Skip to content

[DEBUG] dtrace position and copy #3526

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
ujfalusi wants to merge 6 commits into from
Closed

[DEBUG] dtrace position and copy #3526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e43a64d
ASoC: SOF: trace: Introduce SOF_DTRACE_INITIALIZING state
ujfalusi Mar 16, 2022
18bcb31
ASoC: SOF: trace: Add helper function to update the sdev->host_offset
ujfalusi Mar 14, 2022
a3cdaad
ASoC: SOF: trace: Return from trace_read if there is no new data avai…
ujfalusi Mar 14, 2022
dfc1f81
ASoC: SOF: trace: Print out the new host_offset value on change
ujfalusi Mar 14, 2022
92a7488
ASoC: SOF: trace: DEBUG messages for reading
ujfalusi Mar 16, 2022
83f74b0
ASoC: SOF: trace: DEBUG: track trace file open/release
ujfalusi Mar 18, 2022
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 sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ struct snd_sof_ipc {
enum sof_dtrace_state {
SOF_DTRACE_DISABLED,
SOF_DTRACE_STOPPED,
SOF_DTRACE_INITIALIZING,
SOF_DTRACE_ENABLED,
};

Expand Down
67 changes: 57 additions & 10 deletions sound/soc/sof/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
#define TRACE_FILTER_ELEMENTS_PER_ENTRY 4
#define TRACE_FILTER_MAX_CONFIG_STRING_LENGTH 1024

static bool trace_pos_update_expected(struct snd_sof_dev *sdev)
{
if (sdev->dtrace_state == SOF_DTRACE_ENABLED ||
sdev->dtrace_state == SOF_DTRACE_INITIALIZING)
return true;

return false;
}

static int trace_filter_append_elem(struct snd_sof_dev *sdev, uint32_t key, uint32_t value,
struct sof_ipc_trace_filter_elem *elem_list,
int capacity, int *counter)
Expand Down Expand Up @@ -233,6 +242,23 @@ static int trace_debugfs_filter_create(struct snd_sof_dev *sdev)
return 0;
}

static bool sof_trace_set_host_offset(struct snd_sof_dev *sdev, u32 new_offset)
{
u32 host_offset = READ_ONCE(sdev->host_offset);

if (host_offset != new_offset) {
/* This is a bit paranoid and unlikely that it is needed */
u32 ret = cmpxchg(&sdev->host_offset, host_offset, new_offset);

if (ret == host_offset) {
dev_dbg(sdev->dev, "trace: new host_offset: %#x\n", new_offset);
return true;
}
}

return false;
}

static size_t sof_trace_avail(struct snd_sof_dev *sdev,
loff_t pos, size_t buffer_size)
{
Expand Down Expand Up @@ -263,7 +289,7 @@ static size_t sof_wait_trace_avail(struct snd_sof_dev *sdev,
if (ret)
return ret;

if (sdev->dtrace_state != SOF_DTRACE_ENABLED && sdev->dtrace_draining) {
if (sdev->dtrace_draining && !trace_pos_update_expected(sdev)) {
/*
* tracing has ended and all traces have been
* read by client, return EOF
Expand Down Expand Up @@ -296,6 +322,8 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
size_t avail, buffer_size = dfse->size;
u64 lpos_64;

dev_dbg(sdev->dev, "trace: %s: ENTER (count: %zu, lpos: %llu)\n", __func__, count, lpos);

/* make sure we know about any failures on the DSP side */
sdev->dtrace_error = false;

Expand All @@ -316,6 +344,12 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
return -EIO;
}

/* no new trace data */
if (!avail) {
dev_dbg(sdev->dev, "trace: nothing to copy\n");
return 0;
}

/* make sure count is <= avail */
if (count > avail)
count = avail;
Expand All @@ -328,6 +362,8 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
*/
snd_dma_buffer_sync(&sdev->dmatb, SNDRV_DMA_SYNC_CPU);
/* copy available trace data to debugfs */
dev_dbg(sdev->dev, "trace: copy to user from offset : %#llx, count: %#zx\n",
lpos, count);
rem = copy_to_user(buffer, ((u8 *)(dfse->buf) + lpos), count);
if (rem)
return -EFAULT;
Expand All @@ -338,20 +374,31 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer,
return count;
}

static int sof_dfsentry_trace_open(struct inode *inode, struct file *file)
{
struct snd_sof_dfsentry *dfse = inode->i_private;
struct snd_sof_dev *sdev = dfse->sdev;

dev_dbg(sdev->dev, "trace: %s: ENTER\n", __func__);

return simple_open(inode, file);
}

static int sof_dfsentry_trace_release(struct inode *inode, struct file *file)
{
struct snd_sof_dfsentry *dfse = inode->i_private;
struct snd_sof_dev *sdev = dfse->sdev;

dev_dbg(sdev->dev, "trace: %s: ENTER\n", __func__);
/* avoid duplicate traces at next open */
if (sdev->dtrace_state != SOF_DTRACE_ENABLED)
sdev->host_offset = 0;
sof_trace_set_host_offset(sdev, 0);

return 0;
}

static const struct file_operations sof_dfs_trace_fops = {
.open = simple_open,
.open = sof_dfsentry_trace_open,
.read = sof_dfsentry_trace_read,
.llseek = default_llseek,
.release = sof_dfsentry_trace_release,
Expand Down Expand Up @@ -417,7 +464,7 @@ static int snd_sof_enable_trace(struct snd_sof_dev *sdev)
params.buffer.pages = sdev->dma_trace_pages;
params.stream_tag = 0;

sdev->host_offset = 0;
sof_trace_set_host_offset(sdev, 0);
sdev->dtrace_draining = false;

ret = snd_sof_dma_trace_init(sdev, &params);
Expand All @@ -429,6 +476,7 @@ static int snd_sof_enable_trace(struct snd_sof_dev *sdev)
dev_dbg(sdev->dev, "%s: stream_tag: %d\n", __func__, params.stream_tag);

/* send IPC to the DSP */
sdev->dtrace_state = SOF_DTRACE_INITIALIZING;
ret = sof_ipc_tx_message(sdev->ipc, &params, sizeof(params), &ipc_reply, sizeof(ipc_reply));
if (ret < 0) {
dev_err(sdev->dev,
Expand All @@ -437,15 +485,15 @@ static int snd_sof_enable_trace(struct snd_sof_dev *sdev)
}

start:
sdev->dtrace_state = SOF_DTRACE_ENABLED;

ret = snd_sof_dma_trace_trigger(sdev, SNDRV_PCM_TRIGGER_START);
if (ret < 0) {
dev_err(sdev->dev,
"error: snd_sof_dma_trace_trigger: start: %d\n", ret);
goto trace_release;
}

sdev->dtrace_state = SOF_DTRACE_ENABLED;

return 0;

trace_release:
Expand Down Expand Up @@ -524,10 +572,9 @@ int snd_sof_trace_update_pos(struct snd_sof_dev *sdev,
if (!sdev->dtrace_is_supported)
return 0;

if (sdev->dtrace_state == SOF_DTRACE_ENABLED &&
sdev->host_offset != posn->host_offset) {
sdev->host_offset = posn->host_offset;
wake_up(&sdev->trace_sleep);
if (trace_pos_update_expected(sdev)) {
if (sof_trace_set_host_offset(sdev, posn->host_offset))
wake_up(&sdev->trace_sleep);
}

if (posn->overflow != 0)
Expand Down