* [PATCH -next 0/2] Fix error handling in omap sham ops
@ 2021-06-01 14:51 Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync Zhang Qilong
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Zhang Qilong @ 2021-06-01 14:51 UTC (permalink / raw)
To: herbert, davem; +Cc: pali, pavel, linux-crypto
First patch clear pm_runtime_get_sync calls. The other
fix PM disable depth imbalance.
Zhang Qilong (2):
crypto: omap-des - using pm_runtime_resume_and_get instead of
pm_runtime_get_sync
crypto: omap-sham - Fix PM reference leak in omap sham ops
drivers/crypto/omap-des.c | 9 +++------
drivers/crypto/omap-sham.c | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync
2021-06-01 14:51 [PATCH -next 0/2] Fix error handling in omap sham ops Zhang Qilong
@ 2021-06-01 14:51 ` Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 2/2] crypto: omap-sham - Fix PM reference leak in omap sham ops Zhang Qilong
2021-06-11 7:17 ` [PATCH -next 0/2] Fix error handling " Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Zhang Qilong @ 2021-06-01 14:51 UTC (permalink / raw)
To: herbert, davem; +Cc: pali, pavel, linux-crypto
Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. This change is just to simplify the code, no
actual functional changes.
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
drivers/crypto/omap-des.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index c9d38bcfd1c7..bc8631363d72 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -229,9 +229,8 @@ static int omap_des_hw_init(struct omap_des_dev *dd)
* It may be long delays between requests.
* Device might go to off mode to save power.
*/
- err = pm_runtime_get_sync(dd->dev);
+ err = pm_runtime_resume_and_get(dd->dev);
if (err < 0) {
- pm_runtime_put_noidle(dd->dev);
dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
return err;
}
@@ -994,9 +993,8 @@ static int omap_des_probe(struct platform_device *pdev)
pm_runtime_set_autosuspend_delay(dev, DEFAULT_AUTOSUSPEND_DELAY);
pm_runtime_enable(dev);
- err = pm_runtime_get_sync(dev);
+ err = pm_runtime_resume_and_get(dev);
if (err < 0) {
- pm_runtime_put_noidle(dev);
dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
goto err_get;
}
@@ -1124,9 +1122,8 @@ static int omap_des_resume(struct device *dev)
{
int err;
- err = pm_runtime_get_sync(dev);
+ err = pm_runtime_resume_and_get(dev);
if (err < 0) {
- pm_runtime_put_noidle(dev);
dev_err(dev, "%s: failed to get_sync(%d)\n", __func__, err);
return err;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH -next 2/2] crypto: omap-sham - Fix PM reference leak in omap sham ops
2021-06-01 14:51 [PATCH -next 0/2] Fix error handling in omap sham ops Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync Zhang Qilong
@ 2021-06-01 14:51 ` Zhang Qilong
2021-06-11 7:17 ` [PATCH -next 0/2] Fix error handling " Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Zhang Qilong @ 2021-06-01 14:51 UTC (permalink / raw)
To: herbert, davem; +Cc: pali, pavel, linux-crypto
pm_runtime_get_sync will increment pm usage counter
even it failed. Forgetting to putting operation will
result in reference leak here. We fix it by replacing
it with pm_runtime_resume_and_get to keep usage counter
balanced.
Fixes: 604c31039dae4 ("crypto: omap-sham - Check for return value from pm_runtime_get_sync")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
drivers/crypto/omap-sham.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index ae0d320d3c60..dd53ad9987b0 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -372,7 +372,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd)
{
int err;
- err = pm_runtime_get_sync(dd->dev);
+ err = pm_runtime_resume_and_get(dd->dev);
if (err < 0) {
dev_err(dd->dev, "failed to get sync: %d\n", err);
return err;
@@ -2244,7 +2244,7 @@ static int omap_sham_suspend(struct device *dev)
static int omap_sham_resume(struct device *dev)
{
- int err = pm_runtime_get_sync(dev);
+ int err = pm_runtime_resume_and_get(dev);
if (err < 0) {
dev_err(dev, "failed to get sync: %d\n", err);
return err;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH -next 0/2] Fix error handling in omap sham ops
2021-06-01 14:51 [PATCH -next 0/2] Fix error handling in omap sham ops Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 2/2] crypto: omap-sham - Fix PM reference leak in omap sham ops Zhang Qilong
@ 2021-06-11 7:17 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2021-06-11 7:17 UTC (permalink / raw)
To: Zhang Qilong; +Cc: davem, pali, pavel, linux-crypto
On Tue, Jun 01, 2021 at 10:51:16PM +0800, Zhang Qilong wrote:
> First patch clear pm_runtime_get_sync calls. The other
> fix PM disable depth imbalance.
>
> Zhang Qilong (2):
> crypto: omap-des - using pm_runtime_resume_and_get instead of
> pm_runtime_get_sync
> crypto: omap-sham - Fix PM reference leak in omap sham ops
>
> drivers/crypto/omap-des.c | 9 +++------
> drivers/crypto/omap-sham.c | 4 ++--
> 2 files changed, 5 insertions(+), 8 deletions(-)
All applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-11 7:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 14:51 [PATCH -next 0/2] Fix error handling in omap sham ops Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 1/2] crypto: omap-des - using pm_runtime_resume_and_get instead of pm_runtime_get_sync Zhang Qilong
2021-06-01 14:51 ` [PATCH -next 2/2] crypto: omap-sham - Fix PM reference leak in omap sham ops Zhang Qilong
2021-06-11 7:17 ` [PATCH -next 0/2] Fix error handling " Herbert Xu
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.