Skip to content

Commit 5b10b62

Browse files
ktrzcinxbroonie
authored andcommitted
ASoC: SOF: Add memory_info file to debugfs
This file content describes memory allocation status at run-time, typically to detect memory leaks. Signed-off-by: Karol Trzcinski <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Kai Vehmanen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6dd9589 commit 5b10b62

File tree

8 files changed

+185
-1
lines changed

8 files changed

+185
-1
lines changed

include/sound/sof/debug.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
2+
/*
3+
* This file is provided under a dual BSD/GPLv2 license. When using or
4+
* redistributing this file, you may do so under either license.
5+
*
6+
* Copyright(c) 2020 Intel Corporation. All rights reserved.
7+
*
8+
* Author: Karol Trzcinski <[email protected]>
9+
*/
10+
11+
#ifndef __INCLUDE_SOUND_SOF_DEBUG_H__
12+
#define __INCLUDE_SOUND_SOF_DEBUG_H__
13+
14+
#include <sound/sof/header.h>
15+
16+
/** ABI3.18 */
17+
enum sof_ipc_dbg_mem_zone {
18+
SOF_IPC_MEM_ZONE_SYS = 0, /**< System zone */
19+
SOF_IPC_MEM_ZONE_SYS_RUNTIME = 1, /**< System-runtime zone */
20+
SOF_IPC_MEM_ZONE_RUNTIME = 2, /**< Runtime zone */
21+
SOF_IPC_MEM_ZONE_BUFFER = 3, /**< Buffer zone */
22+
};
23+
24+
/** ABI3.18 */
25+
struct sof_ipc_dbg_mem_usage_elem {
26+
uint32_t zone; /**< see sof_ipc_dbg_mem_zone */
27+
uint32_t id; /**< heap index within zone */
28+
uint32_t used; /**< number of bytes used in zone */
29+
uint32_t free; /**< number of bytes free to use within zone */
30+
uint32_t reserved; /**< for future use */
31+
} __packed;
32+
33+
/** ABI3.18 */
34+
struct sof_ipc_dbg_mem_usage {
35+
struct sof_ipc_reply rhdr; /**< generic IPC reply header */
36+
uint32_t reserved[4]; /**< reserved for future use */
37+
uint32_t num_elems; /**< elems[] counter */
38+
struct sof_ipc_dbg_mem_usage_elem elems[]; /**< memory usage information */
39+
} __packed;
40+
41+
#endif

include/sound/sof/ext_manifest.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ struct ext_man_dbg_abi {
104104
enum config_elem_type {
105105
SOF_EXT_MAN_CONFIG_EMPTY = 0,
106106
SOF_EXT_MAN_CONFIG_IPC_MSG_SIZE = 1,
107+
SOF_EXT_MAN_CONFIG_MEMORY_USAGE_SCAN = 2, /**< ABI 3.18 */
107108
};
108109

109110
struct sof_config_elem {

include/sound/sof/header.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#define SOF_IPC_GLB_GDB_DEBUG SOF_GLB_TYPE(0xAU)
5353
#define SOF_IPC_GLB_TEST_MSG SOF_GLB_TYPE(0xBU)
5454
#define SOF_IPC_GLB_PROBE SOF_GLB_TYPE(0xCU)
55+
#define SOF_IPC_GLB_DEBUG SOF_GLB_TYPE(0xDU)
5556

5657
/*
5758
* DSP Command Message Types
@@ -118,6 +119,9 @@
118119
#define SOF_IPC_TRACE_DMA_POSITION SOF_CMD_TYPE(0x002)
119120
#define SOF_IPC_TRACE_DMA_PARAMS_EXT SOF_CMD_TYPE(0x003)
120121

122+
/* debug */
123+
#define SOF_IPC_DEBUG_MEM_USAGE SOF_CMD_TYPE(0x001)
124+
121125
/* test */
122126
#define SOF_IPC_TEST_IPC_FLOOD SOF_CMD_TYPE(0x001)
123127

include/uapi/sound/sof/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/* SOF ABI version major, minor and patch numbers */
2828
#define SOF_ABI_MAJOR 3
29-
#define SOF_ABI_MINOR 17
29+
#define SOF_ABI_MINOR 18
3030
#define SOF_ABI_PATCH 0
3131

3232
/* SOF ABI version number. Format within 32bit word is MMmmmppp */

sound/soc/sof/debug.c

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <linux/debugfs.h>
1515
#include <linux/io.h>
1616
#include <linux/pm_runtime.h>
17+
#include <sound/sof/ext_manifest.h>
18+
#include <sound/sof/debug.h>
1719
#include "sof-priv.h"
1820
#include "ops.h"
1921

@@ -626,6 +628,121 @@ int snd_sof_debugfs_buf_item(struct snd_sof_dev *sdev,
626628
}
627629
EXPORT_SYMBOL_GPL(snd_sof_debugfs_buf_item);
628630

631+
static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_size)
632+
{
633+
struct sof_ipc_cmd_hdr msg = {
634+
.size = sizeof(struct sof_ipc_cmd_hdr),
635+
.cmd = SOF_IPC_GLB_DEBUG | SOF_IPC_DEBUG_MEM_USAGE,
636+
};
637+
struct sof_ipc_dbg_mem_usage *reply;
638+
int len;
639+
int ret;
640+
int i;
641+
642+
reply = kmalloc(SOF_IPC_MSG_MAX_SIZE, GFP_KERNEL);
643+
if (!reply)
644+
return -ENOMEM;
645+
646+
ret = pm_runtime_get_sync(sdev->dev);
647+
if (ret < 0 && ret != -EACCES) {
648+
pm_runtime_put_noidle(sdev->dev);
649+
dev_err(sdev->dev, "error: enabling device failed: %d\n", ret);
650+
goto error;
651+
}
652+
653+
ret = sof_ipc_tx_message(sdev->ipc, msg.cmd, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);
654+
pm_runtime_mark_last_busy(sdev->dev);
655+
pm_runtime_put_autosuspend(sdev->dev);
656+
if (ret < 0 || reply->rhdr.error < 0) {
657+
ret = min(ret, reply->rhdr.error);
658+
dev_err(sdev->dev, "error: reading memory info failed, %d\n", ret);
659+
goto error;
660+
}
661+
662+
if (struct_size(reply, elems, reply->num_elems) != reply->rhdr.hdr.size) {
663+
dev_err(sdev->dev, "error: invalid memory info ipc struct size, %d\n",
664+
reply->rhdr.hdr.size);
665+
ret = -EINVAL;
666+
goto error;
667+
}
668+
669+
for (i = 0, len = 0; i < reply->num_elems; i++) {
670+
ret = snprintf(buf + len, buff_size - len, "zone %d.%d used %#8x free %#8x\n",
671+
reply->elems[i].zone, reply->elems[i].id,
672+
reply->elems[i].used, reply->elems[i].free);
673+
if (ret < 0)
674+
goto error;
675+
len += ret;
676+
}
677+
678+
ret = len;
679+
error:
680+
kfree(reply);
681+
return ret;
682+
}
683+
684+
static ssize_t memory_info_read(struct file *file, char __user *to, size_t count, loff_t *ppos)
685+
{
686+
struct snd_sof_dfsentry *dfse = file->private_data;
687+
struct snd_sof_dev *sdev = dfse->sdev;
688+
int data_length;
689+
690+
/* read memory info from FW only once for each file read */
691+
if (!*ppos) {
692+
dfse->buf_data_size = 0;
693+
data_length = memory_info_update(sdev, dfse->buf, dfse->size);
694+
if (data_length < 0)
695+
return data_length;
696+
dfse->buf_data_size = data_length;
697+
}
698+
699+
return simple_read_from_buffer(to, count, ppos, dfse->buf, dfse->buf_data_size);
700+
}
701+
702+
static int memory_info_open(struct inode *inode, struct file *file)
703+
{
704+
struct snd_sof_dfsentry *dfse = inode->i_private;
705+
struct snd_sof_dev *sdev = dfse->sdev;
706+
707+
file->private_data = dfse;
708+
709+
/* allocate buffer memory only in first open run, to save memory when unused */
710+
if (!dfse->buf) {
711+
dfse->buf = devm_kmalloc(sdev->dev, PAGE_SIZE, GFP_KERNEL);
712+
if (!dfse->buf)
713+
return -ENOMEM;
714+
dfse->size = PAGE_SIZE;
715+
}
716+
717+
return 0;
718+
}
719+
720+
static const struct file_operations memory_info_fops = {
721+
.open = memory_info_open,
722+
.read = memory_info_read,
723+
.llseek = default_llseek,
724+
};
725+
726+
int snd_sof_dbg_memory_info_init(struct snd_sof_dev *sdev)
727+
{
728+
struct snd_sof_dfsentry *dfse;
729+
730+
dfse = devm_kzalloc(sdev->dev, sizeof(*dfse), GFP_KERNEL);
731+
if (!dfse)
732+
return -ENOMEM;
733+
734+
/* don't allocate buffer before first usage, to save memory when unused */
735+
dfse->type = SOF_DFSENTRY_TYPE_BUF;
736+
dfse->sdev = sdev;
737+
738+
debugfs_create_file("memory_info", 0444, sdev->debugfs_root, dfse, &memory_info_fops);
739+
740+
/* add to dfsentry list */
741+
list_add(&dfse->list, &sdev->dfsentry_list);
742+
return 0;
743+
}
744+
EXPORT_SYMBOL_GPL(snd_sof_dbg_memory_info_init);
745+
629746
int snd_sof_dbg_init(struct snd_sof_dev *sdev)
630747
{
631748
const struct snd_sof_dsp_ops *ops = sof_ops(sdev);

sound/soc/sof/ipc.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,15 @@ static void ipc_log_header(struct device *dev, u8 *text, u32 cmd)
181181
str2 = "unknown type"; break;
182182
}
183183
break;
184+
case SOF_IPC_GLB_DEBUG:
185+
str = "GLB_DEBUG";
186+
switch (type) {
187+
case SOF_IPC_DEBUG_MEM_USAGE:
188+
str2 = "MEM_USAGE"; break;
189+
default:
190+
str2 = "unknown type"; break;
191+
}
192+
break;
184193
default:
185194
str = "unknown GLB command"; break;
186195
}

sound/soc/sof/loader.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ static int ext_man_get_config_data(struct snd_sof_dev *sdev,
205205
const struct sof_config_elem *elem;
206206
int elems_counter;
207207
int elems_size;
208+
int ret = 0;
208209
int i;
209210

210211
/* calculate elements counter */
@@ -225,11 +226,20 @@ static int ext_man_get_config_data(struct snd_sof_dev *sdev,
225226
case SOF_EXT_MAN_CONFIG_IPC_MSG_SIZE:
226227
/* TODO: use ipc msg size from config data */
227228
break;
229+
case SOF_EXT_MAN_CONFIG_MEMORY_USAGE_SCAN:
230+
if (sdev->first_boot && elem->value)
231+
ret = snd_sof_dbg_memory_info_init(sdev);
232+
break;
228233
default:
229234
dev_info(sdev->dev, "Unknown firmware configuration token %d value %d",
230235
elem->token, elem->value);
231236
break;
232237
}
238+
if (ret < 0) {
239+
dev_err(sdev->dev, "error: processing sof_ext_man_config_data failed for token %d value 0x%x, %d\n",
240+
elem->token, elem->value, ret);
241+
return ret;
242+
}
233243
}
234244

235245
return 0;

sound/soc/sof/sof-priv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ enum sof_debugfs_access_type {
290290
/* FS entry for debug files that can expose DSP memories, registers */
291291
struct snd_sof_dfsentry {
292292
size_t size;
293+
size_t buf_data_size; /* length of buffered data for file read operation */
293294
enum sof_dfsentry_type type;
294295
/*
295296
* access_type specifies if the
@@ -523,6 +524,7 @@ void snd_sof_get_status(struct snd_sof_dev *sdev, u32 panic_code,
523524
void *stack, size_t stack_words);
524525
int snd_sof_init_trace_ipc(struct snd_sof_dev *sdev);
525526
void snd_sof_handle_fw_exception(struct snd_sof_dev *sdev);
527+
int snd_sof_dbg_memory_info_init(struct snd_sof_dev *sdev);
526528

527529
/*
528530
* Platform specific ops.

0 commit comments

Comments
 (0)