* [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable
@ 2020-11-23 10:20 Zhang Qilong
2020-11-25 14:41 ` Guenter Roeck
2020-11-29 3:04 ` Guenter Roeck
0 siblings, 2 replies; 4+ messages in thread
From: Zhang Qilong @ 2020-11-23 10:20 UTC (permalink / raw)
To: jdelvare, linux; +Cc: linux-hwmon
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: 323aeb0eb5d9a ("hwmon: (ina3221) Add PM runtime support")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
drivers/hwmon/ina3221.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 72cfdc007e60..d80bd3efcd6d 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -489,7 +489,7 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)
/* For enabling routine, increase refcount and resume() at first */
if (enable) {
- ret = pm_runtime_get_sync(ina->pm_dev);
+ ret = pm_runtime_resume_and_get(ina->pm_dev);
if (ret < 0) {
dev_err(dev, "Failed to get PM runtime\n");
return ret;
--
2.25.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable
2020-11-23 10:20 [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable Zhang Qilong
@ 2020-11-25 14:41 ` Guenter Roeck
2020-11-29 3:04 ` Guenter Roeck
1 sibling, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2020-11-25 14:41 UTC (permalink / raw)
To: Zhang Qilong; +Cc: jdelvare, linux-hwmon
On Mon, Nov 23, 2020 at 06:20:00PM +0800, Zhang Qilong wrote:
> 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: 323aeb0eb5d9a ("hwmon: (ina3221) Add PM runtime support")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/ina3221.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
> index 72cfdc007e60..d80bd3efcd6d 100644
> --- a/drivers/hwmon/ina3221.c
> +++ b/drivers/hwmon/ina3221.c
> @@ -489,7 +489,7 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)
>
> /* For enabling routine, increase refcount and resume() at first */
> if (enable) {
> - ret = pm_runtime_get_sync(ina->pm_dev);
> + ret = pm_runtime_resume_and_get(ina->pm_dev);
> if (ret < 0) {
> dev_err(dev, "Failed to get PM runtime\n");
> return ret;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable
2020-11-23 10:20 [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable Zhang Qilong
2020-11-25 14:41 ` Guenter Roeck
@ 2020-11-29 3:04 ` Guenter Roeck
2020-12-02 14:27 ` 答复: " zhangqilong
1 sibling, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2020-11-29 3:04 UTC (permalink / raw)
To: Zhang Qilong; +Cc: jdelvare, linux-hwmon
On Mon, Nov 23, 2020 at 06:20:00PM +0800, Zhang Qilong wrote:
> 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.
>
Turns out this function doesn't exist in the mainline kernel,
meaning it can not be used to fix a patch in the mainline kernel.
I dropped this patch from my queue.
Guenter
> Fixes: 323aeb0eb5d9a ("hwmon: (ina3221) Add PM runtime support")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> ---
> drivers/hwmon/ina3221.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
> index 72cfdc007e60..d80bd3efcd6d 100644
> --- a/drivers/hwmon/ina3221.c
> +++ b/drivers/hwmon/ina3221.c
> @@ -489,7 +489,7 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)
>
> /* For enabling routine, increase refcount and resume() at first */
> if (enable) {
> - ret = pm_runtime_get_sync(ina->pm_dev);
> + ret = pm_runtime_resume_and_get(ina->pm_dev);
> if (ret < 0) {
> dev_err(dev, "Failed to get PM runtime\n");
> return ret;
^ permalink raw reply [flat|nested] 4+ messages in thread
* 答复: [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable
2020-11-29 3:04 ` Guenter Roeck
@ 2020-12-02 14:27 ` zhangqilong
0 siblings, 0 replies; 4+ messages in thread
From: zhangqilong @ 2020-12-02 14:27 UTC (permalink / raw)
To: Guenter Roeck; +Cc: jdelvare, linux-hwmon
HI,
>
> On Mon, Nov 23, 2020 at 06:20:00PM +0800, Zhang Qilong wrote:
> > 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.
> >
> Turns out this function doesn't exist in the mainline kernel, meaning it can not
> be used to fix a patch in the mainline kernel.
> I dropped this patch from my queue.
>
I am sorry ,I forgot to add the dependency, the commit is as flowing:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.10-rc6&id=dd8088d5a8969dc2b42f71d7bc01c25c61a78066
I will update the description next version.
Best regards,
Zhang Qilong
> Guenter
>
> > Fixes: 323aeb0eb5d9a ("hwmon: (ina3221) Add PM runtime support")
> > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> > ---
> > drivers/hwmon/ina3221.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index
> > 72cfdc007e60..d80bd3efcd6d 100644
> > --- a/drivers/hwmon/ina3221.c
> > +++ b/drivers/hwmon/ina3221.c
> > @@ -489,7 +489,7 @@ static int ina3221_write_enable(struct device
> > *dev, int channel, bool enable)
> >
> > /* For enabling routine, increase refcount and resume() at first */
> > if (enable) {
> > - ret = pm_runtime_get_sync(ina->pm_dev);
> > + ret = pm_runtime_resume_and_get(ina->pm_dev);
> > if (ret < 0) {
> > dev_err(dev, "Failed to get PM runtime\n");
> > return ret;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-02 14:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 10:20 [PATCH] hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable Zhang Qilong
2020-11-25 14:41 ` Guenter Roeck
2020-11-29 3:04 ` Guenter Roeck
2020-12-02 14:27 ` 答复: " zhangqilong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).