Move recovery/coredump configuration to sysfs
v7 cover Move recovery/coredump configuration to sysfs
From Android R onwards Google has restricted access to debugfs in user and user-debug builds. This restricts access to most of the features exposed through debugfs. 'Coredump' and 'Recovery' are critical interfaces that are required for remoteproc to work on Qualcomm Chipsets. This patch series adds recovery/coredump configuration to sysfs interface and disables coredump collection by default. Having coredump disabled by default on production devices makes sense.
Changelog:
v7 -> v6:
- Keep the debugfs entries intact for now.
- Reorder the patches to have a consistent sysfs interface.
v6 -> v5:
- Disable coredump collection by default
- Rename the "default" configuration to "enabled" to avoid confusion
v5 -> v4:
- Fix the cover-letter of tha patch series.
v4 -> v3:
- Remove the feature flag to expose recovery/coredump
v3 -> v2:
- Remove the coredump/recovery entries from debugfs
- Expose recovery/coredump from sysfs under a feature flag
v1 -> v2:
- Correct the contact name in the sysfs documentation.
- Remove the redundant write documentation for coredump/recovery sysfs
- Add a feature flag to make this interface switch configurable.
Rishabh Bhatnagar (3):
remoteproc: Change default dump configuration to "disabled"
remoteproc: Add coredump as part of sysfs interface
remoteproc: Add recovery configuration to the sysfs interface
Documentation/ABI/testing/sysfs-class-remoteproc | 44 +++++++++ drivers/remoteproc/remoteproc_coredump.c | 6 +- drivers/remoteproc/remoteproc_debugfs.c | 23 +++-- drivers/remoteproc/remoteproc_sysfs.c | 119 +++++++++++++++++++++++ include/linux/remoteproc.h | 8 +- 5 files changed, 181 insertions(+), 19 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 1/3 remoteproc: Change default dump configuration to "disabled"
Currently "default" configuration option means coredumps are enabled. To avoid confusion rename the "default" configuration option to "enabled" and disable collection of dumps by default as doing so makes sense for production devices.
--- drivers/remoteproc/remoteproc_coredump.c | 6 +++--- drivers/remoteproc/remoteproc_debugfs.c | 23 +++++++++++------------ include/linux/remoteproc.h | 8 ++++---- 3 files changed, 18 insertions(+), 19 deletions(-)
drivers/remoteproc/remoteproc_coredump.c +3 -3
@@ -257,7 +257,7 @@ void rproc_coredump(struct rproc *rproc)* directly read from device memory. */ data_size +=elf_size_of_phdr (class); -if (dump_conf ==RPROC_COREDUMP_DEFAULT ) +if (dump_conf ==RPROC_COREDUMP_ENABLED ) data_size += segment->size; phnum++;
@@ -297,14 +297,14 @@ void rproc_coredump(struct rproc *rproc)elf_phdr_set_p_flags (class, phdr,PF_R |PF_W |PF_X );elf_phdr_set_p_align (class, phdr,0 ); -if (dump_conf ==RPROC_COREDUMP_DEFAULT ) +if (dump_conf ==RPROC_COREDUMP_ENABLED )rproc_copy_segment (rproc, data + offset, segment,0 , segment->size); offset +=elf_phdr_get_p_filesz (class, phdr); phdr +=elf_size_of_phdr (class); } -if (dump_conf ==RPROC_COREDUMP_DEFAULT ) { +if (dump_conf ==RPROC_COREDUMP_ENABLED ) {dev_coredumpv (&rproc->dev, data, data_size,GFP_KERNEL );return ; }
drivers/remoteproc/remoteproc_debugfs.c +11 -12
@@ -33,9 +33,9 @@ static struct dentry *rproc_dbg;* enum rproc_coredump_mechanism */ static const char *const rproc_coredump_str[] = { - [RPROC_COREDUMP_DEFAULT ] ="default" , - [RPROC_COREDUMP_INLINE ] ="inline" , [RPROC_COREDUMP_DISABLED ] ="disabled" , + [RPROC_COREDUMP_ENABLED ] ="enabled" , + [RPROC_COREDUMP_INLINE ] ="inline" , };/* Expose the current coredump configuration via debugfs */
@@ -54,20 +54,19 @@ static ssize_t rproc_coredump_read(struct file *filp, char __user *userbuf,/* * By writing to the 'coredump' debugfs entry, we control the behavior of the -* coredump mechanism dynamically. The default value of this entry is "default". +* coredump mechanism dynamically. The default value of this entry is "disabled". * * The 'coredump' debugfs entry supports these commands: * -* default: This is the default coredump mechanism. When the remoteproc -* crashes the entire coredump will be copied to a separate buffer -* and exposed to userspace. +* disabled: By default coredump collection is disabled. Recovery will +* proceed without collecting any dump. +* +* enabled: When the remoteproc crashes the entire coredump will be copied +* to a separate buffer and exposed to userspace. * * inline: The coredump will not be copied to a separate buffer and the * recovery process will have to wait until data is read by * userspace. But this avoid usage of extra memory. -* -* disabled: This will disable coredump. Recovery will proceed without -* collecting any dump. */ static ssize_t rproc_coredump_write(struct file *filp, const char __user *user_buf, size_t count,
@@ -94,12 +93,12 @@ static ssize_t rproc_coredump_write(struct file *filp, goto out; } -if (!strncmp (buf,"disable" , count)) { +if (!strncmp (buf,"disabled" , count)) { rproc->dump_conf =RPROC_COREDUMP_DISABLED ; + }else if (!strncmp (buf,"enabled" , count)) { + rproc->dump_conf =RPROC_COREDUMP_ENABLED ; }else if (!strncmp (buf,"inline" , count)) { rproc->dump_conf =RPROC_COREDUMP_INLINE ; - }else if (!strncmp (buf,"default" , count)) { - rproc->dump_conf =RPROC_COREDUMP_DEFAULT ; }else {dev_err (&rproc->dev,"Invalid coredump configuration\n" ); err = -EINVAL ;
include/linux/remoteproc.h +4 -4
@@ -442,16 +442,16 @@ enum rproc_crash_type {/** * enum rproc_dump_mechanism - Coredump options for core -* @RPROC_COREDUMP_DEFAULT: Copy dump to separate buffer and carry on with +* @RPROC_COREDUMP_DISABLED: Don't perform any dump +* @RPROC_COREDUMP_ENABLED: Copy dump to separate buffer and carry on with recovery * @RPROC_COREDUMP_INLINE: Read segments directly from device memory. Stall recovery until all segments are read -* @RPROC_COREDUMP_DISABLED: Don't perform any dump */ enum rproc_dump_mechanism { -RPROC_COREDUMP_DEFAULT , -RPROC_COREDUMP_INLINE ,RPROC_COREDUMP_DISABLED , +RPROC_COREDUMP_ENABLED , +RPROC_COREDUMP_INLINE , };/**
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 2/3 remoteproc: Add coredump as part of sysfs interface
In reply to Rishabh BhatnagarAdd coredump as part of the sysfs interface. This will allow usage of this configuration feature in production devices where access to debugfs might be limited.
--- Documentation/ABI/testing/sysfs-class-remoteproc | 24 +++++++++ drivers/remoteproc/remoteproc_sysfs.c | 63 ++++++++++++++++++++++++ 2 files changed, 87 insertions(+)
Documentation/ABI/testing/sysfs-class-remoteproc +24 -0
@@ -58,3 +58,27 @@ Description: Remote processor name Reports the name of the remote processor. This can be used by userspace in exactly identifying a remote processor and ease up the usage in modifying the 'firmware' or 'state' files. + +What: /sys/class/remoteproc/.../coredump +Date: July 2020 +Contact: Bjorn Andersson <[email protected]>, Ohad Ben-Cohen <[email protected]> +Description: Remote processor coredump configuration + + Reports the coredump configuration of the remote processor, + which will be one of: + + "disabled" + "enabled" + "inline" + + "disabled" means no dump will be collected. + + "enabled" means when the remote processor's coredump is + collected it will be copied to a separate buffer and that + buffer is exposed to userspace. + + "inline" means when the remote processor's coredump is + collected userspace will directly read from the remote + processor's device memory. Extra buffer will not be used to + copy the dump. Also recovery process will not proceed until + all data is read by usersapce.
drivers/remoteproc/remoteproc_sysfs.c +63 -0
75 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v7 3/3 remoteproc: Add recovery configuration to the sysfs interface
In reply to Rishabh BhatnagarAdd recovery configuration to the sysfs interface. This will allow usage of this configuration feature in production devices where access to debugfs might be limited.
--- Documentation/ABI/testing/sysfs-class-remoteproc | 20 +++++++++ drivers/remoteproc/remoteproc_sysfs.c | 56 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+)
Documentation/ABI/testing/sysfs-class-remoteproc +20 -0
@@ -82,3 +82,23 @@ Description: Remote processor coredump configuration processor's device memory. Extra buffer will not be used to copy the dump. Also recovery process will not proceed until all data is read by usersapce. + +What: /sys/class/remoteproc/.../recovery +Date: July 2020 +Contact: Bjorn Andersson <[email protected]>, Ohad Ben-Cohen <[email protected]> +Description: Remote processor recovery mechanism + + Reports the recovery mechanism of the remote processor, + which will be one of: + + "enabled" + "disabled" + + "enabled" means, the remote processor will be automatically + recovered whenever it crashes. Moreover, if the remote + processor crashes while recovery is disabled, it will + be automatically recovered too as soon as recovery is enabled. + + "disabled" means, a remote processor will remain in a crashed + state if it crashes. This is useful for debugging purposes; + without it, debugging a crash is substantially harder.
drivers/remoteproc/remoteproc_sysfs.c +56 -0
68 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project