Introduce mini-dump support for remoteproc.
Subsystems (2)
v2 cover Introduce mini-dump support for remoteproc.
Sometimes firmware sizes can be in ten's of MB's and reading all the memory during coredump can consume lot of time and memory.
Introducing support for mini-dumps. Mini-dump contains smallest amount of useful information, that could help to debug subsystem crashes.
During bootup memory is allocated in SMEM (Shared memory) in the form of a table that contains the physical addresses and sizes of the regions that are supposed to be collected during coredump. This memory is shared amongst all processors in a Qualcomm platform, so all remoteprocs fill in their entry in the global table once they are out of reset.
This patch series adds support for parsing the global minidump table and uses the current coredump frameork to expose this memory to userspace during remoteproc's recovery.
This patch series also integrates the patch:
https://patchwork.kernel.org/patch/11695541/ sent by Siddharth.
Changelog:
v1 -> v2:
- 3 kernel test robot warnings have been resolved.
- Introduced priv_cleanup op in order to making the cleaning of private elements used by the remoteproc more readable.
- Removed rproc_cleanup_priv as it is no longer needed.
- Switched to if/else format for rproc_alloc in order to keep the static const decalaration of adsp_minidump_ops.
Gurbir Arora (3):
remoteproc: core: Add multiple components to remoteproc ops
remoteproc: qcom: Add capability to collect minidumps
remoteproc: qcom: Add minidump id for sm8150 modem remoteproc
drivers/remoteproc/qcom_minidump.h | 64 +++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 36 ++++- drivers/remoteproc/remoteproc_core.c | 6 +- drivers/remoteproc/remoteproc_coredump.c | 203 +++++++++++++++++++++++++++- drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++ drivers/remoteproc/remoteproc_internal.h | 1 + include/linux/remoteproc.h | 4 + 7 files changed, 337 insertions(+), 4 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h
Signature · 1 line
2.7.4
PATCH v2 1/3 remoteproc: core: Add multiple components to remoteproc ops
Each remoteproc might have different requirements for coredumps and might want to choose the type of dumps it wants to collect. This change allows remoteproc drivers to specify their own custom dump function to be executed in place of rproc_coredump. If the coredump op is not specified by the remoteproc driver it will be set to rproc_coredump by default.The priv_cleanup op cleans up the private resources used by the remoteproc.
--- drivers/remoteproc/remoteproc_core.c | 6 +++++- include/linux/remoteproc.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/remoteproc/remoteproc_core.c +5 -1
@@ -1681,7 +1681,7 @@ int rproc_trigger_recovery(struct rproc *rproc) goto unlock_mutex;/* generate coredump */ -rproc_coredump (rproc); + rproc->ops->coredump (rproc);/* load firmware */ ret =request_firmware (&firmware_p, rproc->firmware, dev);
@@ -2103,6 +2103,10 @@ static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops)if (!rproc->ops)return -ENOMEM ; +/* Default to rproc_coredump if no coredump function is specified */ +if (!rproc->ops->coredump) + rproc->ops->coredump = rproc_coredump; +if (rproc->ops->load)return 0 ;
include/linux/remoteproc.h +4 -0
@@ -373,8 +373,10 @@ enum rsc_handling_status {* expects to find it * @sanity_check: sanity check the fw image * @get_boot_addr: get boot address to entry point specified in firmware +* @coredump: collect firmware dump after the subsystem is shutdown * @panic: optional callback to react to system panic, core will delay * panic at least the returned number of milliseconds +* @priv_cleanup: cleans up the private resources used by the rproc */ struct rproc_ops {int (*prepare)(struct rproc *rproc);
@@ -392,7 +394,9 @@ struct rproc_ops {int (*load)(struct rproc *rproc,const struct firmware *fw);int (*sanity_check)(struct rproc *rproc,const struct firmware *fw);u64 (*get_boot_addr)(struct rproc *rproc,const struct firmware *fw); +void (*coredump)(struct rproc *rproc);unsigned long (*panic)(struct rproc *rproc); +void (*priv_cleanup)(struct rproc *rproc); };/**
Signature · 1 line
2.7.4
PATCH v2 2/3 remoteproc: qcom: Add capability to collect minidumps
In reply to Gurbir AroraThis patch adds support for collecting minidump in the event of remoteproc crash. Parse the minidump table based on remoteproc's unique minidump-id, read all memory regions from the remoteproc's minidump table entry and expose the memory to userspace.
The remoteproc platform driver can choose to collect a full/mini dump by specifying the coredump op.
--- drivers/remoteproc/qcom_minidump.h | 64 +++++++++ drivers/remoteproc/qcom_q6v5_pas.c | 36 ++++- drivers/remoteproc/remoteproc_coredump.c | 202 +++++++++++++++++++++++++++- drivers/remoteproc/remoteproc_elf_helpers.h | 27 ++++ drivers/remoteproc/remoteproc_internal.h | 1 + 5 files changed, 327 insertions(+), 3 deletions(-) create mode 100644 drivers/remoteproc/qcom_minidump.h
drivers/remoteproc/qcom_minidump.h new file +64 -0
@@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2020, The Linux Foundation. All rights reserved. +*/ + +#ifndef __QCOM_MINIDUMP_H +#define __QCOM_MINIDUMP_H + +#define MAX_NUM_OF_SS 10 +#define MAX_REGION_NAME_LENGTH 16 +#define SBL_MINIDUMP_SMEM_ID 602 +#define MD_REGION_VALID ('V' << 24 | 'A' << 16 | 'L' << 8 | 'I' << 0) +#define MD_SS_ENCR_DONE ('D' << 24 | 'O' << 16 | 'N' << 8 | 'E' << 0) +#define MD_SS_ENABLED ('E' << 24 | 'N' << 16 | 'B' << 8 | 'L' << 0) + +/** +* md_ss_region - Minidump region +* @name : Name of the region to be dumped +* @seq_num: : Use to differentiate regions with same name. +* @md_valid : This entry to be dumped (if set to 1) +* @region_base_address : Physical address of region to be dumped +* @region_size : Size of the region +*/ +struct md_ss_region { +char name[MAX_REGION_NAME_LENGTH ]; +u32 seq_num; +u32 md_valid; +u64 region_base_address; +u64 region_size; +}; + +/** +* md_ss_toc: Subsystem's SMEM Table of content +* @md_ss_toc_init : Subsystem toc init status +* @md_ss_enable_status : if set to 1, this region would be copied during coredump +* @encryption_status: Encryption status for this subsystem +* @encryption_required : Decides to encrypt the subsystem regions or not +* @ss_region_count : Number of regions added in this subsystem toc +* @md_ss_smem_regions_baseptr : regions base pointer of the subsystem +*/ +struct md_ss_toc { +u32 md_ss_toc_init; +u32 md_ss_enable_status; +u32 encryption_status; +u32 encryption_required; +u32 ss_region_count; +u64 md_ss_smem_regions_baseptr; +}; + +/** +* md_global_toc: Global Table of Content +* @md_toc_init : Global Minidump init status +* @md_revision : Minidump revision +* @md_enable_status : Minidump enable status +* @md_ss_toc : Array of subsystems toc +*/ +struct md_global_toc { +u32 md_toc_init; +u32 md_revision; +u32 md_enable_status; +struct md_ss_toc md_ss_toc[MAX_NUM_OF_SS ]; +}; + +#endif
drivers/remoteproc/qcom_q6v5_pas.c +34 -2
@@ -33,6 +33,7 @@ struct adsp_data {int crash_reason_smem;const char *firmware_name;int pas_id; +unsigned int minidump_id;bool has_aggre2_clk;bool auto_boot;
@@ -63,6 +64,7 @@ struct qcom_adsp {int proxy_pd_count;int pas_id; +unsigned int minidump_id;int crash_reason_smem;bool has_aggre2_clk;const char *info_name;
@@ -116,6 +118,21 @@ static void adsp_pds_disable(struct qcom_adsp *adsp, struct device **pds, } } +static void adsp_dump (struct rproc *rproc) +{ +struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; + +qcom_rproc_minidump (rproc, adsp->minidump_id); +} + +void adsp_priv_cleanup (struct rproc *rproc) +{ +struct rproc_dump_segment *segment; + +list_for_each_entry (segment, &rproc->dump_segments, node) +kfree (segment->priv); +} +static int adsp_load (struct rproc *rproc,const struct firmware *fw) {struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
@@ -258,6 +275,15 @@ static const struct rproc_ops adsp_ops = { .panic = adsp_panic, }; +static const struct rproc_ops adsp_minidump_ops = { + .start = adsp_start, + .stop = adsp_stop, + .da_to_va = adsp_da_to_va, + .load = adsp_load, + .coredump = adsp_dump, + .priv_cleanup = adsp_priv_cleanup, +}; +static int adsp_init_clock (struct qcom_adsp *adsp) {int ret;
@@ -398,8 +424,13 @@ static int adsp_probe(struct platform_device *pdev)if (ret <0 && ret != -EINVAL )return ret; - rproc =rproc_alloc (&pdev->dev, pdev->name, &adsp_ops, - fw_name,sizeof (*adsp)); +if (desc->minidump_id) + rproc =rproc_alloc (&pdev->dev, pdev->name, &adsp_minidump_ops, fw_name, +sizeof (*adsp)); +else + rproc =rproc_alloc (&pdev->dev, pdev->name, &adsp_ops, fw_name, +sizeof (*adsp)); +if (!rproc) {dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ;
@@ -411,6 +442,7 @@ static int adsp_probe(struct platform_device *pdev) adsp = (struct qcom_adsp *)rproc->priv; adsp->dev = &pdev->dev; adsp->rproc = rproc; + adsp->minidump_id = desc->minidump_id; adsp->pas_id = desc->pas_id; adsp->has_aggre2_clk = desc->has_aggre2_clk; adsp->info_name = desc->sysmon_name;
drivers/remoteproc/remoteproc_coredump.c +201 -1
223 lines not on this page · raw message
drivers/remoteproc/remoteproc_elf_helpers.h +27 -0
@@ -11,6 +11,7 @@#include <linux/elf.h> #include <linux/types.h> +#define MAX_NAME_LENGTH 16/** * fw_elf_get_class - Get elf class * @fw: the ELF firmware image
@@ -65,6 +66,7 @@ ELF_GEN_FIELD_GET_SET(hdr, e_type, u16) ELF_GEN_FIELD_GET_SET(hdr, e_version, u32) ELF_GEN_FIELD_GET_SET(hdr, e_ehsize, u32) ELF_GEN_FIELD_GET_SET(hdr, e_phentsize, u16) +ELF_GEN_FIELD_GET_SET(hdr, e_shentsize, u16) ELF_GEN_FIELD_GET_SET(phdr, p_paddr, u64)ELF_GEN_FIELD_GET_SET (phdr, p_vaddr, u64)
@@ -74,6 +76,9 @@ ELF_GEN_FIELD_GET_SET(phdr, p_type, u32) ELF_GEN_FIELD_GET_SET(phdr, p_offset, u64) ELF_GEN_FIELD_GET_SET(phdr, p_flags, u32) ELF_GEN_FIELD_GET_SET(phdr, p_align, u64) +ELF_GEN_FIELD_GET_SET(shdr, sh_type, u32) +ELF_GEN_FIELD_GET_SET(shdr, sh_flags, u32) +ELF_GEN_FIELD_GET_SET(shdr, sh_entsize, u16) ELF_GEN_FIELD_GET_SET(shdr, sh_size, u64)ELF_GEN_FIELD_GET_SET (shdr, sh_offset, u64)
@@ -93,4 +98,26 @@ ELF_STRUCT_SIZE(shdr) ELF_STRUCT_SIZE(phdr) ELF_STRUCT_SIZE(hdr) +static inline unsigned int set_section_name(const char *name, void *ehdr, + u8 class) +{ + u16 shstrndx = elf_hdr_get_e_shstrndx(class, ehdr); + void *shdr; + char *strtab; + static int strtable_idx = 1; + int idx, ret = 0; + + shdr = ehdr + elf_size_of_hdr(class) + shstrndx * elf_size_of_shdr(class); + strtab = ehdr + elf_shdr_get_sh_offset(class, shdr); + idx = strtable_idx; + if (!strtab || !name) + return 0; + + ret = idx; + idx += strlcpy((strtab + idx), name, MAX_NAME_LENGTH); + strtable_idx = idx + 1; + + return ret; +} +#endif /* REMOTEPROC_ELF_LOADER_H */
drivers/remoteproc/remoteproc_internal.h +1 -0
@@ -52,6 +52,7 @@ void rproc_exit_sysfs(void);/* from remoteproc_coredump.c */ void rproc_coredump_cleanup (struct rproc *rproc);void rproc_coredump (struct rproc *rproc); +void qcom_rproc_minidump (struct rproc *rproc,unsigned int minidump_id);#ifdef CONFIG_REMOTEPROC_CDEV void rproc_init_cdev (void );
Signature · 1 line
2.7.4
kernel test robot
build botRe: [PATCH v2 2/3] remoteproc: qcom: Add capability to collect minidumps
Thank you for the patch! Yet something to improve:
Hi Gurbir,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.9-rc3 next-20200902]
[cannot apply to linux/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Gurbir-Arora/Introduce-mini-dump-support-for-remoteproc/20200903-105359 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git fc3abb53250a90ba2150eebd182137c136f4d25a config: i386-randconfig-m021-20200902 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
ld: drivers/remoteproc/remoteproc_coredump.o: in function `qcom_rproc_minidump':
>> drivers/remoteproc/remoteproc_coredump.c:498: undefined reference to `qcom_smem_get'
# https://github.com/0day-ci/linux/commit/ff3d7cbd5128989c0f4961ea07d00ef31f2928e3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Gurbir-Arora/Introduce-mini-dump-support-for-remoteproc/20200903-105359 git checkout ff3d7cbd5128989c0f4961ea07d00ef31f2928e3
vim +498 drivers/remoteproc/remoteproc_coredump.c
490
491 void qcom_rproc_minidump(struct rproc *rproc, unsigned int minidump_id)
492 {
493 struct md_ss_toc *minidump_ss;
494 size_t size;
495
496 /* Get Global minidump ToC*/
497 if (!g_md_toc)
> 498 g_md_toc = qcom_smem_get(QCOM_SMEM_HOST_ANY,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 2/3] remoteproc: qcom: Add capability to collect minidumps
In reply to Gurbir AroraThank you for the patch! Yet something to improve:
Hi Gurbir,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.9-rc3 next-20200903]
[cannot apply to linux/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Gurbir-Arora/Introduce-mini-dump-support-for-remoteproc/20200903-105359 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git fc3abb53250a90ba2150eebd182137c136f4d25a config: nds32-randconfig-r026-20200902 (attached as .config) compiler: nds32le-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=nds32
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
nds32le-linux-ld: drivers/remoteproc/remoteproc_coredump.o: in function `qcom_rproc_minidump':
remoteproc_coredump.c:(.text+0x346): undefined reference to `qcom_smem_get'
>> nds32le-linux-ld: remoteproc_coredump.c:(.text+0x34a): undefined reference to `qcom_smem_get'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 3/3 remoteproc: qcom: Add minidump id for sm8150 modem remoteproc
In reply to Gurbir AroraAdd minidump id for modem in sm8150 chipset.
--- drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_q6v5_pas.c +1 -0
@@ -639,6 +639,7 @@ static const struct adsp_data mpss_resource_init = { .crash_reason_smem = 421, .firmware_name = "modem.mdt", .pas_id = 4, + .minidump_id = 3, .has_aggre2_clk = false, .auto_boot = false, .active_pd_names = (char *[]){
Signature · 1 line
2.7.4