Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/include/sof/debug/telemetry/performance_monitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,11 @@ int get_performance_data(struct global_perf_data * const global_perf_data);
* \brief Retrieve extended global performance telemetry data with per-core breakdown.
* \ingroup telemetry_perf_api
* @param[out] ext_global_perf_data Destination structure to populate.
* @param[in] size Size of the destination buffer in bytes, items beyond it are not reported.
* @return 0 on success, or negative error code on failure.
*/
int get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data);
int get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data,
uint32_t size);

/**
* \brief Reset all performance measurement counters across all components.
Expand Down Expand Up @@ -176,7 +178,8 @@ static inline int get_performance_data(struct global_perf_data * const global_pe
}

static inline
int get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data)
int get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data,
uint32_t size)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/kernel/audio/base_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ __cold static int extended_global_perf_data_get(uint32_t *data_off_size, char *d
int ret;
struct extended_global_perf_data *perf_data = (struct extended_global_perf_data *)data;

ret = get_extended_performance_data(perf_data);
ret = get_extended_performance_data(perf_data, SOF_IPC_MSG_MAX_SIZE);
if (ret < 0)
return IPC4_ERROR_INVALID_PARAM;
*data_off_size = sizeof(*perf_data)
Expand Down
18 changes: 16 additions & 2 deletions src/kernel/debug/telemetry/performance_monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ __cold int get_performance_data(struct global_perf_data * const global_perf_data
}

__cold int
get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data)
get_extended_performance_data(struct extended_global_perf_data * const ext_global_perf_data,
uint32_t size)
{
assert_can_be_cold();

Expand All @@ -409,6 +410,14 @@ get_extended_performance_data(struct extended_global_perf_data * const ext_globa
return -EINVAL;
}

if (size < sizeof(*ext_global_perf_data)) {
tr_err(&ipc_tr, "IPC data size %u too small", size);
return -EINVAL;
}

/* the buffer cannot hold an item for every core and every perf slot */
const size_t max_slots =
(size - sizeof(*ext_global_perf_data)) / sizeof(struct ext_perf_data_item);
size_t slots_count;
size_t slot_idx = 0;
uint64_t total_dsp_cycles[CONFIG_MAX_CORE_COUNT];
Expand All @@ -421,7 +430,7 @@ get_extended_performance_data(struct extended_global_perf_data * const ext_globa
total_dsp_cycles[core_id] = 1;

/* Fill one performance record per core with total dsp cycles */
for (int core_id = 0; core_id < CONFIG_MAX_CORE_COUNT; ++core_id) {
for (int core_id = 0; core_id < CONFIG_MAX_CORE_COUNT && slot_idx < max_slots; ++core_id) {
if (!(cpu_enabled_cores() & BIT(core_id)))
continue;

Expand All @@ -435,6 +444,11 @@ get_extended_performance_data(struct extended_global_perf_data * const ext_globa
}

slots_count = perf_bitmap_get_occupied(&performance_data_bitmap) + slot_idx;
if (slots_count > max_slots) {
tr_warn(&ipc_tr, "%zu perf items do not fit, reporting %zu", slots_count,
max_slots);
slots_count = max_slots;
Comment on lines +447 to +450
}
ext_global_perf_data->perf_item_count = slots_count;

/* fill the rest of the IPC records with data from
Expand Down
Loading