Skip to content

[Not For Merge] PR to demonstrate trace crash issue #4683

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
keyonjie wants to merge 2 commits into from
Closed

[Not For Merge] PR to demonstrate trace crash issue #4683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de7119f
dma-trace: hold the lock during switching on/off the trace
keyonjie Aug 31, 2021
47679c4
trace: don't hold trace->lock during dma_trace_on/off
keyonjie Aug 31, 2021
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
10 changes: 9 additions & 1 deletion src/trace/dma-trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,26 +475,34 @@ void dma_trace_flush(void *t)
void dma_trace_on(void)
{
struct dma_trace_data *trace_data = dma_trace_data_get();
uint32_t flags;

if (!trace_data || trace_data->enabled)
return;

trace_data->enabled = 1;
spin_lock_irq(&trace_data->lock, flags);

schedule_task(&trace_data->dmat_work, DMA_TRACE_PERIOD,
DMA_TRACE_PERIOD);
trace_data->enabled = 1;

spin_unlock_irq(&trace_data->lock, flags);
}

void dma_trace_off(void)
{
struct dma_trace_data *trace_data = dma_trace_data_get();
uint32_t flags;

if (!trace_data || !trace_data->enabled)
return;

spin_lock_irq(&trace_data->lock, flags);

schedule_task_cancel(&trace_data->dmat_work);
trace_data->enabled = 0;

spin_unlock_irq(&trace_data->lock, flags);
}

static int dtrace_calc_buf_overflow(struct dma_trace_buf *buffer,
Expand Down
12 changes: 6 additions & 6 deletions src/trace/trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,11 @@ void trace_on(void)
struct trace *trace = trace_get();
uint32_t flags;

spin_lock_irq(&trace->lock, flags);

trace->enable = 1;
/* should not do this with trace->lock held as there is trace calling internal */
dma_trace_on();

spin_lock_irq(&trace->lock, flags);
trace->enable = 1;
spin_unlock_irq(&trace->lock, flags);
}

Expand All @@ -499,11 +499,11 @@ void trace_off(void)
struct trace *trace = trace_get();
uint32_t flags;

spin_lock_irq(&trace->lock, flags);

trace->enable = 0;
/* should not do this with trace->lock held as there is trace calling internal */
dma_trace_off();

spin_lock_irq(&trace->lock, flags);
trace->enable = 0;
spin_unlock_irq(&trace->lock, flags);
}

Expand Down