* [PATCH 0/2] Move recovery and coredump interface to sysfs @ 2020-07-28 23:08 Rishabh Bhatnagar 2020-07-28 23:08 ` [PATCH 1/2] remoteproc: Move coredump entry from debugfs " Rishabh Bhatnagar 2020-07-28 23:08 ` [PATCH 2/2] remoteproc: Move recovery debugfs entry " Rishabh Bhatnagar 0 siblings, 2 replies; 5+ messages in thread From: Rishabh Bhatnagar @ 2020-07-28 23:08 UTC (permalink / raw) To: linux-remoteproc, linux-kernel Cc: bjorn.andersson, mathieu.poirier, tsoni, psodagud, sidgup, Rishabh Bhatnagar 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. Coredump configuration needs to be set to "inline" in debug/test builds and "disabled" in production builds. Whereas recovery needs to be "disabled" for debugging purposes and "enabled" on production builds. Moving these interfaces to sysfs will allow usage for these interfaces for production and debug builds. Rishabh Bhatnagar (2): remoteproc: Move coredump entry from debugfs to sysfs. remoteproc: Move recovery debugfs entry to sysfs Documentation/ABI/testing/sysfs-class-remoteproc | 76 +++++++++++ drivers/remoteproc/remoteproc_debugfs.c | 167 ----------------------- drivers/remoteproc/remoteproc_sysfs.c | 123 +++++++++++++++++ 3 files changed, 199 insertions(+), 167 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] remoteproc: Move coredump entry from debugfs to sysfs. 2020-07-28 23:08 [PATCH 0/2] Move recovery and coredump interface to sysfs Rishabh Bhatnagar @ 2020-07-28 23:08 ` Rishabh Bhatnagar 2020-08-18 20:02 ` Mathieu Poirier 2020-07-28 23:08 ` [PATCH 2/2] remoteproc: Move recovery debugfs entry " Rishabh Bhatnagar 1 sibling, 1 reply; 5+ messages in thread From: Rishabh Bhatnagar @ 2020-07-28 23:08 UTC (permalink / raw) To: linux-remoteproc, linux-kernel Cc: bjorn.andersson, mathieu.poirier, tsoni, psodagud, sidgup, Rishabh Bhatnagar Expose coredump configuration from sysfs instead of debugfs. In some operating systems access to debugfs might be limited. This restricts user from selecting the coredump configuration at all, hence move this interface to sysfs. Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> --- Documentation/ABI/testing/sysfs-class-remoteproc | 40 +++++++++++ drivers/remoteproc/remoteproc_debugfs.c | 90 ------------------------ drivers/remoteproc/remoteproc_sysfs.c | 64 +++++++++++++++++ 3 files changed, 104 insertions(+), 90 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc index 36094fb..812582a 100644 --- a/Documentation/ABI/testing/sysfs-class-remoteproc +++ b/Documentation/ABI/testing/sysfs-class-remoteproc @@ -58,3 +58,43 @@ 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: Rishabh Bhatnagar <rishabhb@codeaurora.org> +Description: Remote processor coredump configuration + + Reports the coredump configuration of the remote processor, + which will be one of: + + "default" + "inline" + "disabled" + + "default" 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. + + "disabled" means no dump will be collected. + + Writing this file controls the coredump configuration of the + remote processor. The following configurations can be written: + + "default" + "inline" + "disable" + + Writing "default" will change the coredump configuration to + default option. + + Writing "inline" will change the coredump configuration to + inline. + + Writing "disable" will disable the coredump collection for + that remoteproc. diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c index 2e3b3e2..732770e 100644 --- a/drivers/remoteproc/remoteproc_debugfs.c +++ b/drivers/remoteproc/remoteproc_debugfs.c @@ -28,94 +28,6 @@ static struct dentry *rproc_dbg; /* - * A coredump-configuration-to-string lookup table, for exposing a - * human readable configuration via debugfs. Always keep in sync with - * enum rproc_coredump_mechanism - */ -static const char * const rproc_coredump_str[] = { - [RPROC_COREDUMP_DEFAULT] = "default", - [RPROC_COREDUMP_INLINE] = "inline", - [RPROC_COREDUMP_DISABLED] = "disabled", -}; - -/* Expose the current coredump configuration via debugfs */ -static ssize_t rproc_coredump_read(struct file *filp, char __user *userbuf, - size_t count, loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - char buf[20]; - int len; - - len = scnprintf(buf, sizeof(buf), "%s\n", - rproc_coredump_str[rproc->dump_conf]); - - return simple_read_from_buffer(userbuf, count, ppos, buf, len); -} - -/* - * By writing to the 'coredump' debugfs entry, we control the behavior of the - * coredump mechanism dynamically. The default value of this entry is "default". - * - * 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. - * - * 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, - loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - int ret, err = 0; - char buf[20]; - - if (count > sizeof(buf)) - return -EINVAL; - - ret = copy_from_user(buf, user_buf, count); - if (ret) - return -EFAULT; - - /* remove end of line */ - if (buf[count - 1] == '\n') - buf[count - 1] = '\0'; - - if (rproc->state == RPROC_CRASHED) { - dev_err(&rproc->dev, "can't change coredump configuration\n"); - err = -EBUSY; - goto out; - } - - if (!strncmp(buf, "disable", count)) { - rproc->dump_conf = RPROC_COREDUMP_DISABLED; - } 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; - } -out: - return err ? err : count; -} - -static const struct file_operations rproc_coredump_fops = { - .read = rproc_coredump_read, - .write = rproc_coredump_write, - .open = simple_open, - .llseek = generic_file_llseek, -}; - -/* * Some remote processors may support dumping trace logs into a shared * memory buffer. We expose this trace buffer using debugfs, so users * can easily tell what's going on remotely. @@ -425,8 +337,6 @@ void rproc_create_debug_dir(struct rproc *rproc) rproc, &rproc_rsc_table_fops); debugfs_create_file("carveout_memories", 0400, rproc->dbg_dir, rproc, &rproc_carveouts_fops); - debugfs_create_file("coredump", 0600, rproc->dbg_dir, - rproc, &rproc_coredump_fops); } void __init rproc_init_debugfs(void) diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index eea514c..40949a0 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -10,6 +10,69 @@ #define to_rproc(d) container_of(d, struct rproc, dev) +/* + * A coredump-configuration-to-string lookup table, for exposing a + * human readable configuration via sysfs. Always keep in sync with + * enum rproc_coredump_mechanism + */ +static const char * const rproc_coredump_str[] = { + [RPROC_COREDUMP_DEFAULT] = "default", + [RPROC_COREDUMP_INLINE] = "inline", + [RPROC_COREDUMP_DISABLED] = "disabled", +}; + +/* Expose the current coredump configuration via debugfs */ +static ssize_t coredump_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rproc *rproc = to_rproc(dev); + + return sprintf(buf, "%s\n", rproc_coredump_str[rproc->dump_conf]); +} + +/* + * By writing to the 'coredump' sysfs entry, we control the behavior of the + * coredump mechanism dynamically. The default value of this entry is "default". + * + * The 'coredump' sysfs 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. + * + * 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 coredump_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rproc *rproc = to_rproc(dev); + + if (rproc->state == RPROC_CRASHED) { + dev_err(&rproc->dev, "can't change coredump configuration\n"); + return -EBUSY; + } + + if (sysfs_streq(buf, "disable")) { + rproc->dump_conf = RPROC_COREDUMP_DISABLED; + } else if (sysfs_streq(buf, "inline")) { + rproc->dump_conf = RPROC_COREDUMP_INLINE; + } else if (sysfs_streq(buf, "default")) { + rproc->dump_conf = RPROC_COREDUMP_DEFAULT; + } else { + dev_err(&rproc->dev, "Invalid coredump configuration\n"); + return -EINVAL; + } + + return count; +} +static DEVICE_ATTR_RW(coredump); + /* Expose the loaded / running firmware name via sysfs */ static ssize_t firmware_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -138,6 +201,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(name); static struct attribute *rproc_attrs[] = { + &dev_attr_coredump.attr, &dev_attr_firmware.attr, &dev_attr_state.attr, &dev_attr_name.attr, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] remoteproc: Move coredump entry from debugfs to sysfs. 2020-07-28 23:08 ` [PATCH 1/2] remoteproc: Move coredump entry from debugfs " Rishabh Bhatnagar @ 2020-08-18 20:02 ` Mathieu Poirier 0 siblings, 0 replies; 5+ messages in thread From: Mathieu Poirier @ 2020-08-18 20:02 UTC (permalink / raw) To: Rishabh Bhatnagar Cc: linux-remoteproc, linux-kernel, bjorn.andersson, tsoni, psodagud, sidgup On Tue, Jul 28, 2020 at 04:08:16PM -0700, Rishabh Bhatnagar wrote: > Expose coredump configuration from sysfs instead of debugfs. > In some operating systems access to debugfs might be limited. > This restricts user from selecting the coredump configuration > at all, hence move this interface to sysfs. > > Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > --- > Documentation/ABI/testing/sysfs-class-remoteproc | 40 +++++++++++ This needs to be a patch on its own. > drivers/remoteproc/remoteproc_debugfs.c | 90 ------------------------ > drivers/remoteproc/remoteproc_sysfs.c | 64 +++++++++++++++++ > 3 files changed, 104 insertions(+), 90 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc > index 36094fb..812582a 100644 > --- a/Documentation/ABI/testing/sysfs-class-remoteproc > +++ b/Documentation/ABI/testing/sysfs-class-remoteproc > @@ -58,3 +58,43 @@ 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: Rishabh Bhatnagar <rishabhb@codeaurora.org> This should be Bjorn and Ohad > +Description: Remote processor coredump configuration > + > + Reports the coredump configuration of the remote processor, > + which will be one of: > + > + "default" > + "inline" > + "disabled" > + > + "default" 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. > + > + "disabled" means no dump will be collected. Everything below should be removed. > + > + Writing this file controls the coredump configuration of the > + remote processor. The following configurations can be written: > + > + "default" > + "inline" > + "disable" > + > + Writing "default" will change the coredump configuration to > + default option. > + > + Writing "inline" will change the coredump configuration to > + inline. > + > + Writing "disable" will disable the coredump collection for > + that remoteproc. > diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c > index 2e3b3e2..732770e 100644 > --- a/drivers/remoteproc/remoteproc_debugfs.c > +++ b/drivers/remoteproc/remoteproc_debugfs.c > @@ -28,94 +28,6 @@ > static struct dentry *rproc_dbg; > > /* > - * A coredump-configuration-to-string lookup table, for exposing a > - * human readable configuration via debugfs. Always keep in sync with > - * enum rproc_coredump_mechanism > - */ > -static const char * const rproc_coredump_str[] = { > - [RPROC_COREDUMP_DEFAULT] = "default", > - [RPROC_COREDUMP_INLINE] = "inline", > - [RPROC_COREDUMP_DISABLED] = "disabled", > -}; > - > -/* Expose the current coredump configuration via debugfs */ > -static ssize_t rproc_coredump_read(struct file *filp, char __user *userbuf, > - size_t count, loff_t *ppos) > -{ > - struct rproc *rproc = filp->private_data; > - char buf[20]; > - int len; > - > - len = scnprintf(buf, sizeof(buf), "%s\n", > - rproc_coredump_str[rproc->dump_conf]); > - > - return simple_read_from_buffer(userbuf, count, ppos, buf, len); > -} > - > -/* > - * By writing to the 'coredump' debugfs entry, we control the behavior of the > - * coredump mechanism dynamically. The default value of this entry is "default". > - * > - * 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. > - * > - * 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, > - loff_t *ppos) > -{ > - struct rproc *rproc = filp->private_data; > - int ret, err = 0; > - char buf[20]; > - > - if (count > sizeof(buf)) > - return -EINVAL; > - > - ret = copy_from_user(buf, user_buf, count); > - if (ret) > - return -EFAULT; > - > - /* remove end of line */ > - if (buf[count - 1] == '\n') > - buf[count - 1] = '\0'; > - > - if (rproc->state == RPROC_CRASHED) { > - dev_err(&rproc->dev, "can't change coredump configuration\n"); > - err = -EBUSY; > - goto out; > - } > - > - if (!strncmp(buf, "disable", count)) { > - rproc->dump_conf = RPROC_COREDUMP_DISABLED; > - } 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; > - } > -out: > - return err ? err : count; > -} > - > -static const struct file_operations rproc_coredump_fops = { > - .read = rproc_coredump_read, > - .write = rproc_coredump_write, > - .open = simple_open, > - .llseek = generic_file_llseek, > -}; > - > -/* > * Some remote processors may support dumping trace logs into a shared > * memory buffer. We expose this trace buffer using debugfs, so users > * can easily tell what's going on remotely. > @@ -425,8 +337,6 @@ void rproc_create_debug_dir(struct rproc *rproc) > rproc, &rproc_rsc_table_fops); > debugfs_create_file("carveout_memories", 0400, rproc->dbg_dir, > rproc, &rproc_carveouts_fops); > - debugfs_create_file("coredump", 0600, rproc->dbg_dir, > - rproc, &rproc_coredump_fops); > } > > void __init rproc_init_debugfs(void) > diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c > index eea514c..40949a0 100644 > --- a/drivers/remoteproc/remoteproc_sysfs.c > +++ b/drivers/remoteproc/remoteproc_sysfs.c > @@ -10,6 +10,69 @@ > > #define to_rproc(d) container_of(d, struct rproc, dev) > > +/* > + * A coredump-configuration-to-string lookup table, for exposing a > + * human readable configuration via sysfs. Always keep in sync with > + * enum rproc_coredump_mechanism > + */ > +static const char * const rproc_coredump_str[] = { > + [RPROC_COREDUMP_DEFAULT] = "default", > + [RPROC_COREDUMP_INLINE] = "inline", > + [RPROC_COREDUMP_DISABLED] = "disabled", > +}; > + > +/* Expose the current coredump configuration via debugfs */ > +static ssize_t coredump_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct rproc *rproc = to_rproc(dev); > + > + return sprintf(buf, "%s\n", rproc_coredump_str[rproc->dump_conf]); > +} > + > +/* > + * By writing to the 'coredump' sysfs entry, we control the behavior of the > + * coredump mechanism dynamically. The default value of this entry is "default". > + * > + * The 'coredump' sysfs 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. > + * > + * 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 coredump_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct rproc *rproc = to_rproc(dev); > + > + if (rproc->state == RPROC_CRASHED) { > + dev_err(&rproc->dev, "can't change coredump configuration\n"); > + return -EBUSY; > + } > + > + if (sysfs_streq(buf, "disable")) { > + rproc->dump_conf = RPROC_COREDUMP_DISABLED; > + } else if (sysfs_streq(buf, "inline")) { > + rproc->dump_conf = RPROC_COREDUMP_INLINE; > + } else if (sysfs_streq(buf, "default")) { > + rproc->dump_conf = RPROC_COREDUMP_DEFAULT; > + } else { > + dev_err(&rproc->dev, "Invalid coredump configuration\n"); > + return -EINVAL; > + } > + > + return count; > +} > +static DEVICE_ATTR_RW(coredump); > + > /* Expose the loaded / running firmware name via sysfs */ > static ssize_t firmware_show(struct device *dev, struct device_attribute *attr, > char *buf) > @@ -138,6 +201,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, > static DEVICE_ATTR_RO(name); > > static struct attribute *rproc_attrs[] = { > + &dev_attr_coredump.attr, This patch it guaranteed to break someone's user space but I don't think debugfs is part of the ABI (other people may disagree with me). Please make the feature configurable in order to give people the choice of making it available to users or not. > &dev_attr_firmware.attr, > &dev_attr_state.attr, > &dev_attr_name.attr, > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] remoteproc: Move recovery debugfs entry to sysfs 2020-07-28 23:08 [PATCH 0/2] Move recovery and coredump interface to sysfs Rishabh Bhatnagar 2020-07-28 23:08 ` [PATCH 1/2] remoteproc: Move coredump entry from debugfs " Rishabh Bhatnagar @ 2020-07-28 23:08 ` Rishabh Bhatnagar 2020-08-18 20:12 ` Mathieu Poirier 1 sibling, 1 reply; 5+ messages in thread From: Rishabh Bhatnagar @ 2020-07-28 23:08 UTC (permalink / raw) To: linux-remoteproc, linux-kernel Cc: bjorn.andersson, mathieu.poirier, tsoni, psodagud, sidgup, Rishabh Bhatnagar Expose recovery mechanism through sysfs rather than exposing through debugfs. Some operating systems may limit access to debugfs through access policies. This restricts user access to recovery mechanism, hence move it to sysfs. Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> --- Documentation/ABI/testing/sysfs-class-remoteproc | 36 +++++++++++ drivers/remoteproc/remoteproc_debugfs.c | 77 ------------------------ drivers/remoteproc/remoteproc_sysfs.c | 57 ++++++++++++++++++ 3 files changed, 93 insertions(+), 77 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc index 812582a..16c5267 100644 --- a/Documentation/ABI/testing/sysfs-class-remoteproc +++ b/Documentation/ABI/testing/sysfs-class-remoteproc @@ -98,3 +98,39 @@ Description: Remote processor coredump configuration Writing "disable" will disable the coredump collection for that remoteproc. + +What: /sys/class/remoteproc/.../recovery +Date: July 2020 +Contact: Rishabh Bhatnagar <rishabhb@codeaurora.org> +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. + + Writing this file controls the recovery mechanism of the + remote processor. The following options can be written: + + "enabled" + "disabled" + "recover" + + Writing "enabled" will enable recovery and recover the remote + processor if its crashed. + + Writing "disabled" will disable recovery and if crashed the + remote processor will remain in crashed state. + + Writing "recover" will trigger an immediate recovery if the + remote processor is in crashed state. diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c index 732770e..71194a0 100644 --- a/drivers/remoteproc/remoteproc_debugfs.c +++ b/drivers/remoteproc/remoteproc_debugfs.c @@ -84,81 +84,6 @@ static const struct file_operations rproc_name_ops = { .llseek = generic_file_llseek, }; -/* expose recovery flag via debugfs */ -static ssize_t rproc_recovery_read(struct file *filp, char __user *userbuf, - size_t count, loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - char *buf = rproc->recovery_disabled ? "disabled\n" : "enabled\n"; - - return simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf)); -} - -/* - * By writing to the 'recovery' debugfs entry, we control the behavior of the - * recovery mechanism dynamically. The default value of this entry is "enabled". - * - * The 'recovery' debugfs entry supports these commands: - * - * enabled: When enabled, 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: When disabled, 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. - * - * recover: This function will trigger an immediate recovery if the - * remote processor is in a crashed state, without changing - * or checking the recovery state (enabled/disabled). - * This is useful during debugging sessions, when one expects - * additional crashes to happen after enabling recovery. In this - * case, enabling recovery will make it hard to debug subsequent - * crashes, so it's recommended to keep recovery disabled, and - * instead use the "recover" command as needed. - */ -static ssize_t -rproc_recovery_write(struct file *filp, const char __user *user_buf, - size_t count, loff_t *ppos) -{ - struct rproc *rproc = filp->private_data; - char buf[10]; - int ret; - - if (count < 1 || count > sizeof(buf)) - return -EINVAL; - - ret = copy_from_user(buf, user_buf, count); - if (ret) - return -EFAULT; - - /* remove end of line */ - if (buf[count - 1] == '\n') - buf[count - 1] = '\0'; - - if (!strncmp(buf, "enabled", count)) { - /* change the flag and begin the recovery process if needed */ - rproc->recovery_disabled = false; - rproc_trigger_recovery(rproc); - } else if (!strncmp(buf, "disabled", count)) { - rproc->recovery_disabled = true; - } else if (!strncmp(buf, "recover", count)) { - /* begin the recovery process without changing the flag */ - rproc_trigger_recovery(rproc); - } else { - return -EINVAL; - } - - return count; -} - -static const struct file_operations rproc_recovery_ops = { - .read = rproc_recovery_read, - .write = rproc_recovery_write, - .open = simple_open, - .llseek = generic_file_llseek, -}; /* expose the crash trigger via debugfs */ static ssize_t @@ -329,8 +254,6 @@ void rproc_create_debug_dir(struct rproc *rproc) debugfs_create_file("name", 0400, rproc->dbg_dir, rproc, &rproc_name_ops); - debugfs_create_file("recovery", 0600, rproc->dbg_dir, - rproc, &rproc_recovery_ops); debugfs_create_file("crash", 0200, rproc->dbg_dir, rproc, &rproc_crash_ops); debugfs_create_file("resource_table", 0400, rproc->dbg_dir, diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 40949a0..49b846e 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -10,6 +10,62 @@ #define to_rproc(d) container_of(d, struct rproc, dev) +/* expose recovery flag via sysfs */ +static ssize_t recovery_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rproc *rproc = to_rproc(dev); + + return sprintf(buf, "%s", rproc->recovery_disabled ? "disabled\n" : "enabled\n"); +} + +/* + * By writing to the 'recovery' sysfs entry, we control the behavior of the + * recovery mechanism dynamically. The default value of this entry is "enabled". + * + * The 'recovery' sysfs entry supports these commands: + * + * enabled: When enabled, 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: When disabled, 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. + * + * recover: This function will trigger an immediate recovery if the + * remote processor is in a crashed state, without changing + * or checking the recovery state (enabled/disabled). + * This is useful during debugging sessions, when one expects + * additional crashes to happen after enabling recovery. In this + * case, enabling recovery will make it hard to debug subsequent + * crashes, so it's recommended to keep recovery disabled, and + * instead use the "recover" command as needed. + */ +static ssize_t recovery_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rproc *rproc = to_rproc(dev); + + if (sysfs_streq(buf, "enabled")) { + /* change the flag and begin the recovery process if needed */ + rproc->recovery_disabled = false; + rproc_trigger_recovery(rproc); + } else if (sysfs_streq(buf, "disabled")) { + rproc->recovery_disabled = true; + } else if (sysfs_streq(buf, "recover")) { + /* begin the recovery process without changing the flag */ + rproc_trigger_recovery(rproc); + } else { + return -EINVAL; + } + + return count; +} +static DEVICE_ATTR_RW(recovery); + /* * A coredump-configuration-to-string lookup table, for exposing a * human readable configuration via sysfs. Always keep in sync with @@ -201,6 +257,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(name); static struct attribute *rproc_attrs[] = { + &dev_attr_recovery.attr, &dev_attr_coredump.attr, &dev_attr_firmware.attr, &dev_attr_state.attr, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] remoteproc: Move recovery debugfs entry to sysfs 2020-07-28 23:08 ` [PATCH 2/2] remoteproc: Move recovery debugfs entry " Rishabh Bhatnagar @ 2020-08-18 20:12 ` Mathieu Poirier 0 siblings, 0 replies; 5+ messages in thread From: Mathieu Poirier @ 2020-08-18 20:12 UTC (permalink / raw) To: Rishabh Bhatnagar Cc: linux-remoteproc, linux-kernel, bjorn.andersson, tsoni, psodagud, sidgup On Tue, Jul 28, 2020 at 04:08:17PM -0700, Rishabh Bhatnagar wrote: > Expose recovery mechanism through sysfs rather than exposing through > debugfs. Some operating systems may limit access to debugfs through > access policies. This restricts user access to recovery mechanism, > hence move it to sysfs. > > Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > --- > Documentation/ABI/testing/sysfs-class-remoteproc | 36 +++++++++++ Please disregard my previous comment about making this a separate patch. I initially thought Jon Corbet would have to take this but it is not the case, it can go through Bjorn's tree. > drivers/remoteproc/remoteproc_debugfs.c | 77 ------------------------ > drivers/remoteproc/remoteproc_sysfs.c | 57 ++++++++++++++++++ > 3 files changed, 93 insertions(+), 77 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-class-remoteproc b/Documentation/ABI/testing/sysfs-class-remoteproc > index 812582a..16c5267 100644 > --- a/Documentation/ABI/testing/sysfs-class-remoteproc > +++ b/Documentation/ABI/testing/sysfs-class-remoteproc > @@ -98,3 +98,39 @@ Description: Remote processor coredump configuration > > Writing "disable" will disable the coredump collection for > that remoteproc. > + > +What: /sys/class/remoteproc/.../recovery > +Date: July 2020 > +Contact: Rishabh Bhatnagar <rishabhb@codeaurora.org> Same comment as the previous patch > +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. > + > + Writing this file controls the recovery mechanism of the > + remote processor. The following options can be written: > + Same, I don't think we need to distinguish between reading and writing. The above would do just fine. > + "enabled" > + "disabled" > + "recover" > + > + Writing "enabled" will enable recovery and recover the remote > + processor if its crashed. > + > + Writing "disabled" will disable recovery and if crashed the > + remote processor will remain in crashed state. > + > + Writing "recover" will trigger an immediate recovery if the > + remote processor is in crashed state. > diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c > index 732770e..71194a0 100644 > --- a/drivers/remoteproc/remoteproc_debugfs.c > +++ b/drivers/remoteproc/remoteproc_debugfs.c > @@ -84,81 +84,6 @@ static const struct file_operations rproc_name_ops = { > .llseek = generic_file_llseek, > }; > > -/* expose recovery flag via debugfs */ > -static ssize_t rproc_recovery_read(struct file *filp, char __user *userbuf, > - size_t count, loff_t *ppos) > -{ > - struct rproc *rproc = filp->private_data; > - char *buf = rproc->recovery_disabled ? "disabled\n" : "enabled\n"; > - > - return simple_read_from_buffer(userbuf, count, ppos, buf, strlen(buf)); > -} > - > -/* > - * By writing to the 'recovery' debugfs entry, we control the behavior of the > - * recovery mechanism dynamically. The default value of this entry is "enabled". > - * > - * The 'recovery' debugfs entry supports these commands: > - * > - * enabled: When enabled, 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: When disabled, 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. > - * > - * recover: This function will trigger an immediate recovery if the > - * remote processor is in a crashed state, without changing > - * or checking the recovery state (enabled/disabled). > - * This is useful during debugging sessions, when one expects > - * additional crashes to happen after enabling recovery. In this > - * case, enabling recovery will make it hard to debug subsequent > - * crashes, so it's recommended to keep recovery disabled, and > - * instead use the "recover" command as needed. > - */ > -static ssize_t > -rproc_recovery_write(struct file *filp, const char __user *user_buf, > - size_t count, loff_t *ppos) > -{ > - struct rproc *rproc = filp->private_data; > - char buf[10]; > - int ret; > - > - if (count < 1 || count > sizeof(buf)) > - return -EINVAL; > - > - ret = copy_from_user(buf, user_buf, count); > - if (ret) > - return -EFAULT; > - > - /* remove end of line */ > - if (buf[count - 1] == '\n') > - buf[count - 1] = '\0'; > - > - if (!strncmp(buf, "enabled", count)) { > - /* change the flag and begin the recovery process if needed */ > - rproc->recovery_disabled = false; > - rproc_trigger_recovery(rproc); > - } else if (!strncmp(buf, "disabled", count)) { > - rproc->recovery_disabled = true; > - } else if (!strncmp(buf, "recover", count)) { > - /* begin the recovery process without changing the flag */ > - rproc_trigger_recovery(rproc); > - } else { > - return -EINVAL; > - } > - > - return count; > -} > - > -static const struct file_operations rproc_recovery_ops = { > - .read = rproc_recovery_read, > - .write = rproc_recovery_write, > - .open = simple_open, > - .llseek = generic_file_llseek, > -}; > > /* expose the crash trigger via debugfs */ > static ssize_t > @@ -329,8 +254,6 @@ void rproc_create_debug_dir(struct rproc *rproc) > > debugfs_create_file("name", 0400, rproc->dbg_dir, > rproc, &rproc_name_ops); > - debugfs_create_file("recovery", 0600, rproc->dbg_dir, > - rproc, &rproc_recovery_ops); > debugfs_create_file("crash", 0200, rproc->dbg_dir, > rproc, &rproc_crash_ops); > debugfs_create_file("resource_table", 0400, rproc->dbg_dir, > diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c > index 40949a0..49b846e 100644 > --- a/drivers/remoteproc/remoteproc_sysfs.c > +++ b/drivers/remoteproc/remoteproc_sysfs.c > @@ -10,6 +10,62 @@ > > #define to_rproc(d) container_of(d, struct rproc, dev) > > +/* expose recovery flag via sysfs */ > +static ssize_t recovery_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct rproc *rproc = to_rproc(dev); > + > + return sprintf(buf, "%s", rproc->recovery_disabled ? "disabled\n" : "enabled\n"); > +} > + > +/* > + * By writing to the 'recovery' sysfs entry, we control the behavior of the > + * recovery mechanism dynamically. The default value of this entry is "enabled". > + * > + * The 'recovery' sysfs entry supports these commands: > + * > + * enabled: When enabled, 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: When disabled, 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. > + * > + * recover: This function will trigger an immediate recovery if the > + * remote processor is in a crashed state, without changing > + * or checking the recovery state (enabled/disabled). > + * This is useful during debugging sessions, when one expects > + * additional crashes to happen after enabling recovery. In this > + * case, enabling recovery will make it hard to debug subsequent > + * crashes, so it's recommended to keep recovery disabled, and > + * instead use the "recover" command as needed. > + */ > +static ssize_t recovery_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct rproc *rproc = to_rproc(dev); > + > + if (sysfs_streq(buf, "enabled")) { > + /* change the flag and begin the recovery process if needed */ > + rproc->recovery_disabled = false; > + rproc_trigger_recovery(rproc); > + } else if (sysfs_streq(buf, "disabled")) { > + rproc->recovery_disabled = true; > + } else if (sysfs_streq(buf, "recover")) { > + /* begin the recovery process without changing the flag */ > + rproc_trigger_recovery(rproc); > + } else { > + return -EINVAL; > + } > + > + return count; > +} > +static DEVICE_ATTR_RW(recovery); > + > /* > * A coredump-configuration-to-string lookup table, for exposing a > * human readable configuration via sysfs. Always keep in sync with > @@ -201,6 +257,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, > static DEVICE_ATTR_RO(name); > > static struct attribute *rproc_attrs[] = { > + &dev_attr_recovery.attr, Here too I think it would be a good idea to make the feature configurable. Thanks, Mathieu > &dev_attr_coredump.attr, > &dev_attr_firmware.attr, > &dev_attr_state.attr, > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-18 20:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-28 23:08 [PATCH 0/2] Move recovery and coredump interface to sysfs Rishabh Bhatnagar 2020-07-28 23:08 ` [PATCH 1/2] remoteproc: Move coredump entry from debugfs " Rishabh Bhatnagar 2020-08-18 20:02 ` Mathieu Poirier 2020-07-28 23:08 ` [PATCH 2/2] remoteproc: Move recovery debugfs entry " Rishabh Bhatnagar 2020-08-18 20:12 ` Mathieu Poirier
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.