thermal: devfreq_cooling: use local ops instead of global ops
Subsystems (2)
PATCH v2 1/1 thermal: devfreq_cooling: use local ops instead of global ops
Fix access illegal address problem in following condition:
There are muti devfreq cooling devices in system, some of them has em model but other does not, energy model ops such as state2power will append to global devfreq_cooling_ops when the cooling device with em model register. It makes the cooling device without em model also use devfreq_cooling_ops after appending when register later by of_devfreq_cooling_register_power() or of_devfreq_cooling_register().
IPA governor regards the cooling devices without em model as a power actor because they also have energy model ops, and will access illegal address at dfc->em_pd when execute cdev->ops->get_requested_power, cdev->ops->state2power or cdev->ops->power2state.
--- drivers/thermal/devfreq_cooling.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/thermal/devfreq_cooling.c +18 -7
@@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,struct thermal_cooling_device *cdev;struct device *dev = df->dev.parent;struct devfreq_cooling_device *dfc; +struct thermal_cooling_device_ops *ops;char *name;int err, num_opps; - dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); -if (!dfc) + ops =kmemdup (&devfreq_cooling_ops,sizeof (*ops),GFP_KERNEL ); +if (!ops)return ERR_PTR (-ENOMEM ); + dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); +if (!dfc) { + err = -ENOMEM ; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd =em_pd_get (dev);if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state; dfc->power_ops = dfc_power;
@@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,if (!name) goto remove_qos_req; - cdev =thermal_of_cooling_device_register (np, name, dfc, - &devfreq_cooling_ops); + cdev =thermal_of_cooling_device_register (np, name, dfc, ops);kfree (name);if (IS_ERR (cdev)) {
@@ -429,6 +435,8 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,kfree (dfc->freq_table); free_dfc:kfree (dfc); +free_ops: +kfree (ops);return ERR_PTR (err); }
@@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_register);void devfreq_cooling_unregister (struct thermal_cooling_device *cdev) {struct devfreq_cooling_device *dfc; +const struct thermal_cooling_device_ops *ops;struct device *dev;if (IS_ERR_OR_NULL (cdev))return ; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent;
@@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)kfree (dfc->freq_table);kfree (dfc); +kfree (ops); }EXPORT_SYMBOL_GPL (devfreq_cooling_unregister);
Signature · 1 line
2.29.0
Hi Kant,
Quoted 92 lines · Kant Fan
Fix access illegal address problem in following condition:
There are muti devfreq cooling devices in system, some of them has em model but other does not, energy model ops such as state2power will append to globaldevfreq_cooling_opswhen the cooling device with em model register. It makes the cooling device without em model also usedevfreq_cooling_opsafter appending when register later byof_devfreq_cooling_register_power()orof_devfreq_cooling_register().IPA governor regards the cooling devices without em model as a power actor because they also have energy model ops, and will access illegal address at
dfc->em_pdwhen executecdev->ops->get_requested_power,cdev->ops->state2powerorcdev->ops->power2state.Fixes 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and use EM")Cc [email protected] # 5.13+Signed-off-by Kant Fan <[email protected]>--- drivers/thermal/devfreq_cooling.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)drivers/thermal/devfreq_cooling.c +17
-7@@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,struct thermal_cooling_device *cdev;struct device *dev = df->dev.parent;struct devfreq_cooling_device *dfc; +struct thermal_cooling_device_ops *ops;char *name;int err, num_opps; - dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); -if (!dfc) + ops =kmemdup (&devfreq_cooling_ops,sizeof (*ops),GFP_KERNEL ); +if (!ops)return ERR_PTR (-ENOMEM ); + dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); +if (!dfc) { + err = -ENOMEM ; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd =em_pd_get (dev);if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state; dfc->power_ops = dfc_power;@@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,if (!name) goto remove_qos_req; - cdev =thermal_of_cooling_device_register (np, name, dfc, - &devfreq_cooling_ops); + cdev =thermal_of_cooling_device_register (np, name, dfc, ops);kfree (name);if (IS_ERR (cdev)) {@@ -429,6 +435,8 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,kfree (dfc->freq_table); free_dfc:kfree (dfc); +free_ops: +kfree (ops);return ERR_PTR (err); }@@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_register);void devfreq_cooling_unregister (struct thermal_cooling_device *cdev) {struct devfreq_cooling_device *dfc; +const struct thermal_cooling_device_ops *ops;struct device *dev;if (IS_ERR_OR_NULL (cdev))return ; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent;
drivers/thermal/devfreq_cooling.c void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) · line 540
Quoted 6 lines
drivers/thermal/devfreq_cooling.c +1
-0@@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)kfree (dfc->freq_table);kfree (dfc); +kfree (ops); }EXPORT_SYMBOL_GPL (devfreq_cooling_unregister);
Thank you for updating it, LGTM
Regards,
Lukasz
Quoted 106 lines · Lukasz Luba
Hi Kant,
Quoted 92 lines · Kant Fan
Fix access illegal address problem in following condition:
There are muti devfreq cooling devices in system, some of them has em model but other does not, energy model ops such as state2power will append to globaldevfreq_cooling_opswhen the cooling device with em model register. It makes the cooling device without em model also usedevfreq_cooling_opsafter appending when register later byof_devfreq_cooling_register_power()orof_devfreq_cooling_register().IPA governor regards the cooling devices without em model as a power actor because they also have energy model ops, and will access illegal address at
dfc->em_pdwhen executecdev->ops->get_requested_power,cdev->ops->state2powerorcdev->ops->power2state.Fixes 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and use EM")Cc [email protected] # 5.13+Signed-off-by Kant Fan <[email protected]>--- drivers/thermal/devfreq_cooling.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)drivers/thermal/devfreq_cooling.c +17
-7@@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,struct thermal_cooling_device *cdev;struct device *dev = df->dev.parent;struct devfreq_cooling_device *dfc; +struct thermal_cooling_device_ops *ops;char *name;int err, num_opps; - dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); -if (!dfc) + ops =kmemdup (&devfreq_cooling_ops,sizeof (*ops),GFP_KERNEL ); +if (!ops)return ERR_PTR (-ENOMEM ); + dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); +if (!dfc) { + err = -ENOMEM ; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd =em_pd_get (dev);if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state; dfc->power_ops = dfc_power;@@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,if (!name) goto remove_qos_req; - cdev =thermal_of_cooling_device_register (np, name, dfc, - &devfreq_cooling_ops); + cdev =thermal_of_cooling_device_register (np, name, dfc, ops);kfree (name);if (IS_ERR (cdev)) {@@ -429,6 +435,8 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,kfree (dfc->freq_table); free_dfc:kfree (dfc); +free_ops: +kfree (ops);return ERR_PTR (err); }@@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_register);void devfreq_cooling_unregister (struct thermal_cooling_device *cdev) {struct devfreq_cooling_device *dfc; +const struct thermal_cooling_device_ops *ops;struct device *dev;if (IS_ERR_OR_NULL (cdev))return ; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent;drivers/thermal/devfreq_cooling.c void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) · line 540
Quoted 6 lines
drivers/thermal/devfreq_cooling.c +1
-0@@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)kfree (dfc->freq_table);kfree (dfc); +kfree (ops); }EXPORT_SYMBOL_GPL (devfreq_cooling_unregister);Thank you for updating it, LGTM
Quoted 1 line
Reviewed-by Lukasz Luba <[email protected]>
Applied as 5.19 material.
Lukasz, this had a conflict with your EM series, please double check if my resolution in the bleeding-edge branch is correct.
Thanks!
Lukasz Luba
reviewerQuoted 107 lines · Rafael J. Wysocki
Quoted 106 lines · Lukasz Luba
Hi Kant,
Quoted 92 lines · Kant Fan
Fix access illegal address problem in following condition:
There are muti devfreq cooling devices in system, some of them has em model but other does not, energy model ops such as state2power will append to globaldevfreq_cooling_opswhen the cooling device with em model register. It makes the cooling device without em model also usedevfreq_cooling_opsafter appending when register later byof_devfreq_cooling_register_power()orof_devfreq_cooling_register().IPA governor regards the cooling devices without em model as a power actor because they also have energy model ops, and will access illegal address at
dfc->em_pdwhen executecdev->ops->get_requested_power,cdev->ops->state2powerorcdev->ops->power2state.Fixes 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and use EM")Cc [email protected] # 5.13+Signed-off-by Kant Fan <[email protected]>--- drivers/thermal/devfreq_cooling.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)drivers/thermal/devfreq_cooling.c +17
-7@@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,struct thermal_cooling_device *cdev;struct device *dev = df->dev.parent;struct devfreq_cooling_device *dfc; +struct thermal_cooling_device_ops *ops;char *name;int err, num_opps; - dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); -if (!dfc) + ops =kmemdup (&devfreq_cooling_ops,sizeof (*ops),GFP_KERNEL ); +if (!ops)return ERR_PTR (-ENOMEM ); + dfc =kzalloc (sizeof (*dfc),GFP_KERNEL ); +if (!dfc) { + err = -ENOMEM ; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd =em_pd_get (dev);if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state; dfc->power_ops = dfc_power;@@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,if (!name) goto remove_qos_req; - cdev =thermal_of_cooling_device_register (np, name, dfc, - &devfreq_cooling_ops); + cdev =thermal_of_cooling_device_register (np, name, dfc, ops);kfree (name);if (IS_ERR (cdev)) {@@ -429,6 +435,8 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,kfree (dfc->freq_table); free_dfc:kfree (dfc); +free_ops: +kfree (ops);return ERR_PTR (err); }@@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_register);void devfreq_cooling_unregister (struct thermal_cooling_device *cdev) {struct devfreq_cooling_device *dfc; +const struct thermal_cooling_device_ops *ops;struct device *dev;if (IS_ERR_OR_NULL (cdev))return ; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent;drivers/thermal/devfreq_cooling.c void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) · line 540
Quoted 6 lines
drivers/thermal/devfreq_cooling.c +1
-0@@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)kfree (dfc->freq_table);kfree (dfc); +kfree (ops); }EXPORT_SYMBOL_GPL (devfreq_cooling_unregister);Thank you for updating it, LGTM
Quoted 6 lines
Quoted 1 line
Reviewed-by Lukasz Luba <[email protected]>Applied as 5.19 material.
Lukasz, this had a conflict with your EM series, please double check if my resolution in the bleeding-edge branch is correct.
OK, I'll let you know after I fetch and build that branch.
Quoted 2 lines
Thanks!
Lukasz Luba
reviewerQuoted 116 lines · Lukasz Luba
Quoted 113 lines · Rafael J. Wysocki
Quoted 112 lines · Lukasz Luba
Hi Kant,
Quoted 103 lines · Kant Fan
Fix access illegal address problem in following condition:
There are muti devfreq cooling devices in system, some of them has em model but other does not, energy model ops such as state2power will append to globaldevfreq_cooling_opswhen the cooling device with em model register. It makes the cooling device without em model also usedevfreq_cooling_opsafter appending when register later byof_devfreq_cooling_register_power()orof_devfreq_cooling_register().IPA governor regards the cooling devices without em model as a power actor because they also have energy model ops, and will access illegal address at
dfc->em_pdwhen executecdev->ops->get_requested_power,cdev->ops->state2powerorcdev->ops->power2state.Fixes 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and use EM")Cc [email protected] # 5.13+Signed-off-by Kant Fan <[email protected]>---
drivers/thermal/devfreq_cooling.c| 25 ++++++++++++++++++-------1 file changed, 18 insertions(+), 7 deletions(-)drivers/thermal/devfreq_cooling.c +12
-5@@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, struct thermal_cooling_device *cdev; struct device *dev = df->dev.parent; struct devfreq_cooling_device *dfc; + struct thermal_cooling_device_ops *ops; char *name; int err, num_opps; - dfc = kzalloc(sizeof(*dfc), GFP_KERNEL); - if (!dfc) + ops = kmemdup(&devfreq_cooling_ops, sizeof(*ops), GFP_KERNEL); + if (!ops) return ERR_PTR(-ENOMEM); + dfc = kzalloc(sizeof(*dfc), GFP_KERNEL); + if (!dfc) { + err = -ENOMEM; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd = em_pd_get(dev); if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state;
dfc->power_ops=dfc_power;drivers/thermal/devfreq_cooling.c +1
-2@@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, if (!name) goto remove_qos_req; - cdev = thermal_of_cooling_device_register(np, name, dfc, - &devfreq_cooling_ops); + cdev = thermal_of_cooling_device_register(np, name, dfc, ops); kfree(name);if (
IS_ERR(cdev)) {drivers/thermal/devfreq_cooling.c +0
-0@@ -429,6 +435,8 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, kfree(dfc->freq_table);
free_dfc:
kfree(dfc);
+free_ops:
+ kfree(ops);return
ERR_PTR(err);
}drivers/thermal/devfreq_cooling.c +3
-0@@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_register); void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) { struct devfreq_cooling_device *dfc; + const struct thermal_cooling_device_ops *ops; struct device *dev; if (IS_ERR_OR_NULL(cdev)) return; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent;@@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) kfree(dfc->freq_table); kfree(dfc); + kfree(ops); }Quoted 1 line
EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);Thank you for updating it, LGTM
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Reviewed-by Lukasz Luba <[email protected]>Applied as 5.19 material.
Lukasz, this had a conflict with your EM series, please double check if my resolution in the bleeding-edge branch is correct.
OK, I'll let you know after I fetch and build that branch.
I've read the code and confirm you've do this correctly. I've also built that branch with ENERGY_MODEL and DEVFREQ_COOLING configs set - no issues observed.
Later this week I would use it for some other development so I will test it as well.
Thank you for solving this!
Regards,
Lukasz