remoteproc: core: Fixes for rproc cdev and add
PATCH 2/3 remoteproc: core: Move validate before device add
In reply to Siddharth GuptaWe can validate whether the remoteproc is correctly setup before calling making the cdev_add and device_add calls. This saves us the trouble of cleaning up later on.
--- drivers/remoteproc/remoteproc_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/remoteproc/remoteproc_core.c +4 -4
@@ -2316,16 +2316,16 @@ int rproc_add(struct rproc *rproc)struct device *dev = &rproc->dev;int ret; -/* add char device for this remoteproc */ - ret =rproc_char_device_add (rproc); + ret =rproc_validate (rproc);if (ret <0 )return ret; - ret =device_add (dev); +/* add char device for this remoteproc */ + ret =rproc_char_device_add (rproc);if (ret <0 )return ret; - ret =rproc_validate (rproc); + ret =device_add (dev);if (ret <0 )return ret;
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/3 remoteproc: core: Move cdev add before device add
In reply to Siddharth GuptaWhen cdev_add is called after device_add has been called there is no way for the userspace to know about the addition of a cdev as cdev_add itself doesn't trigger a uevent notification, or for the kernel to know about the change to devt. This results in two problems:
- mknod is never called for the cdev and hence no cdev appears on devtmpfs.
- sysfs links to the new cdev are not established.
The cdev needs to be added and devt assigned before device_add() is called in order for the relevant sysfs and devtmpfs entries to be created and the uevent to be properly populated.
--- drivers/remoteproc/remoteproc_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/remoteproc/remoteproc_core.c +5 -5
@@ -2316,6 +2316,11 @@ int rproc_add(struct rproc *rproc)struct device *dev = &rproc->dev;int ret; +/* add char device for this remoteproc */ + ret =rproc_char_device_add (rproc); +if (ret <0 ) +return ret; + ret =device_add (dev);if (ret <0 )return ret;
@@ -2329,11 +2334,6 @@ int rproc_add(struct rproc *rproc)/* create debugfs entries */ rproc_create_debug_dir (rproc); -/* add char device for this remoteproc */ - ret =rproc_char_device_add (rproc); -if (ret <0 ) -return ret; -/* if rproc is marked always-on, request it to boot */ if (rproc->auto_boot) { ret =rproc_trigger_auto_boot (rproc);
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
cover remoteproc: core: Fixes for rproc cdev and add
This patch series contains stability fixes and error handling for remoteproc.
The changes included in this series do the following:
Patch 1: Fixes the creation of the rproc character device. Patch 2: Validates rproc as the first step of rproc_add(). Patch 3: Adds error handling in rproc_add().
Siddharth Gupta (3):
remoteproc: core: Move cdev add before device add
remoteproc: core: Move validate before device add
remoteproc: core: Cleanup device in case of failure
drivers/remoteproc/remoteproc_core.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/3 remoteproc: core: Cleanup device in case of failure
When a failure occurs in rproc_add() it returns an error, but does not cleanup after itself. This change adds the failure path in such cases.
--- drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/remoteproc/remoteproc_core.c +12 -3
@@ -2326,8 +2326,10 @@ int rproc_add(struct rproc *rproc)return ret; ret =device_add (dev); -if (ret <0 ) -return ret; +if (ret <0 ) { +put_device (dev); + goto rproc_remove_cdev; + }dev_info (dev,"%s is available\n" , rproc->name);
@@ -2338,7 +2340,7 @@ int rproc_add(struct rproc *rproc)if (rproc->auto_boot) { ret =rproc_trigger_auto_boot (rproc);if (ret <0 ) -return ret; + goto rproc_remove_dev; }/* expose to rproc_get_by_phandle users */
@@ -2347,6 +2349,13 @@ int rproc_add(struct rproc *rproc)mutex_unlock (&rproc_list_mutex);return 0 ; + +rproc_remove_dev: +rproc_delete_debug_dir (rproc); +device_del (dev); +rproc_remove_cdev: +rproc_char_device_remove (rproc); +return ret; }EXPORT_SYMBOL (rproc_add);
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 1/3] remoteproc: core: Move cdev add before device add
In reply to Siddharth GuptaQuoted 8 lines · Siddharth Gupta
When
cdev_addis called afterdevice_addhas been called there is no way for the userspace to know about the addition of a cdev ascdev_additself doesn't trigger a uevent notification, or for the kernel to know about the change to devt. This results in two problems:
- mknod is never called for the cdev and hence no cdev appears on devtmpfs.
- sysfs links to the new cdev are not established.
Quoted 4 lines
The cdev needs to be added and devt assigned before
device_add()is called in order for the relevant sysfs and devtmpfs entries to be created and the uevent to be properly populated.
Regards,
Bjorn
Quoted 37 lines
Signed-off-by Siddharth Gupta <[email protected]>--- drivers/remoteproc/remoteproc_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/remoteproc/remoteproc_core.c +5
-5@@ -2316,6 +2316,11 @@ int rproc_add(struct rproc *rproc)struct device *dev = &rproc->dev;int ret; +/* add char device for this remoteproc */ + ret =rproc_char_device_add (rproc); +if (ret <0 ) +return ret; + ret =device_add (dev);if (ret <0 )return ret;@@ -2329,11 +2334,6 @@ int rproc_add(struct rproc *rproc)/* create debugfs entries */ rproc_create_debug_dir (rproc); -/* add char device for this remoteproc */ - ret =rproc_char_device_add (rproc); -if (ret <0 ) -return ret; -/* if rproc is marked always-on, request it to boot */ if (rproc->auto_boot) { ret =rproc_trigger_auto_boot (rproc);Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 2/3] remoteproc: core: Move validate before device add
In reply to Siddharth GuptaQuoted 4 lines · Siddharth Gupta
We can validate whether the remoteproc is correctly setup before calling making the
cdev_addanddevice_addcalls. This saves us the trouble of cleaning up later on.
Quoted 34 lines
Signed-off-by Siddharth Gupta <[email protected]>--- drivers/remoteproc/remoteproc_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/remoteproc/remoteproc_core.c +4
-4@@ -2316,16 +2316,16 @@ int rproc_add(struct rproc *rproc)struct device *dev = &rproc->dev;int ret; -/* add char device for this remoteproc */ - ret =rproc_char_device_add (rproc); + ret =rproc_validate (rproc);if (ret <0 )return ret; - ret =device_add (dev); +/* add char device for this remoteproc */ + ret =rproc_char_device_add (rproc);if (ret <0 )return ret; - ret =rproc_validate (rproc); + ret =device_add (dev);if (ret <0 )return ret;Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 3/3] remoteproc: core: Cleanup device in case of failure
In reply to Siddharth GuptaQuoted 36 lines · Siddharth Gupta
When a failure occurs in
rproc_add()it returns an error, but does not cleanup after itself. This change adds the failure path in such cases.Signed-off-by Siddharth Gupta <[email protected]>--- drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/remoteproc/remoteproc_core.c +5
-3@@ -2326,8 +2326,10 @@ int rproc_add(struct rproc *rproc)return ret; ret =device_add (dev); -if (ret <0 ) -return ret; +if (ret <0 ) { +put_device (dev); + goto rproc_remove_cdev; + }dev_info (dev,"%s is available\n" , rproc->name);@@ -2338,7 +2340,7 @@ int rproc_add(struct rproc *rproc)if (rproc->auto_boot) { ret =rproc_trigger_auto_boot (rproc);if (ret <0 ) -return ret; + goto rproc_remove_dev; }/* expose to rproc_get_by_phandle users */
drivers/remoteproc/remoteproc_core.c int rproc_add(struct rproc *rproc) · line 2357
Quoted 9 lines
drivers/remoteproc/remoteproc_core.c +6
-0@@ -2347,6 +2349,13 @@ int rproc_add(struct rproc *rproc)mutex_unlock (&rproc_list_mutex);return 0 ; + +rproc_remove_dev: +rproc_delete_debug_dir (rproc); +device_del (dev); +rproc_remove_cdev: +rproc_char_device_remove (rproc);
I'm confused, shouldn't this function just do cdev_del()? __unregister_chrdev() seems to do more than unroll what cdev_add() did...
Apart from this, I think the patch looks good. Really nice to see you tidy this up!
Regards,
Bjorn
Quoted 8 lines
drivers/remoteproc/remoteproc_core.c +1
-0+return ret; }EXPORT_SYMBOL (rproc_add);Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project