Skip to contentSkip to conversation

cpufreq: imx6: prorect calls to dev_pm_opp_get_opp_count with RCU lock

PATCH In review Dmitry Torokhov 2 participants 3 messages Dec 16, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpufreq: imx6: prorect calls to dev_pm_opp_get_opp_count with RCU lock

dev_pm_opp_get_opp_count() must be called with RCU lock held.

---

Not tested at all...

 drivers/cpufreq/imx6q-cpufreq.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/cpufreq/imx6q-cpufreq.c +4 -0
index 380a90d..851d4fd 100644
@@ -200,7 +200,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 	 * Just, incase the platform did not supply the OPP
 	 * table, it will try to get it.
 	 */
+	rcu_read_lock();
 	num = dev_pm_opp_get_opp_count(cpu_dev);
+	rcu_read_unlock();
 	if (num < 0) {
 		ret = of_init_opp_table(cpu_dev);
 		if (ret < 0) {
@@ -211,7 +213,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 		/* Because we have added the OPPs here, we must free them */
 		free_opp = true;
 
+		rcu_read_lock();
 		num = dev_pm_opp_get_opp_count(cpu_dev);
+		rcu_read_unlock();
 		if (num < 0) {
 			ret = num;
 			dev_err(cpu_dev, "no OPP table is found: %d\n", ret);
Signature · 5 lines
2.2.0.rc0.207.ga3a616c


-- 
Dmitry
maintainer
#1 lore raw
Quoted 25 lines · Dmitry Torokhov

dev_pm_opp_get_opp_count() must be called with RCU lock held.

---

Not tested at all...

 drivers/cpufreq/imx6q-cpufreq.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/cpufreq/imx6q-cpufreq.c +2 -0
index 380a90d..851d4fd 100644
@@ -200,7 +200,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
         * Just, incase the platform did not supply the OPP
         * table, it will try to get it.
         */
+       rcu_read_lock();
        num = dev_pm_opp_get_opp_count(cpu_dev);
+       rcu_read_unlock();
        if (num < 0) {
                ret = of_init_opp_table(cpu_dev);
                if (ret < 0) {

drivers/cpufreq/imx6q-cpufreq.c static int imx6q_cpufreq_probe(struct platform_device *pdev) · line 221

Quoted 9 lines
drivers/cpufreq/imx6q-cpufreq.c +2 -0
@@ -211,7 +213,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                /* Because we have added the OPPs here, we must free them */
                free_opp = true;
 
+               rcu_read_lock();
                num = dev_pm_opp_get_opp_count(cpu_dev);
+               rcu_read_unlock();
                if (num < 0) {
                        ret = num;
                        dev_err(cpu_dev, "no OPP table is found: %d\n", ret);

This one looks fine for sure but I was wondering for the users which just need to call opp-count from under the locks, what about something like:

dev_pm_opp_get_opp_count_locked() ?

--
viresh

#2 lore raw
Quoted 39 lines · Viresh Kumar
Quoted 25 lines · Dmitry Torokhov

dev_pm_opp_get_opp_count() must be called with RCU lock held.

---

Not tested at all...

 drivers/cpufreq/imx6q-cpufreq.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/cpufreq/imx6q-cpufreq.c +2 -0
index 380a90d..851d4fd 100644
@@ -200,7 +200,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
         * Just, incase the platform did not supply the OPP
         * table, it will try to get it.
         */
+       rcu_read_lock();
        num = dev_pm_opp_get_opp_count(cpu_dev);
+       rcu_read_unlock();
        if (num < 0) {
                ret = of_init_opp_table(cpu_dev);
                if (ret < 0) {

drivers/cpufreq/imx6q-cpufreq.c static int imx6q_cpufreq_probe(struct platform_device *pdev) · line 221

Quoted 9 lines
drivers/cpufreq/imx6q-cpufreq.c +2 -0
@@ -211,7 +213,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
                /* Because we have added the OPPs here, we must free them */
                free_opp = true;
 
+               rcu_read_lock();
                num = dev_pm_opp_get_opp_count(cpu_dev);
+               rcu_read_unlock();
                if (num < 0) {
                        ret = num;
                        dev_err(cpu_dev, "no OPP table is found: %d\n", ret);

This one looks fine for sure but I was wondering for the users which just need to call opp-count from under the locks, what about something like:

Quoted 1 line

dev_pm_opp_get_opp_count_locked() ?

Yeah, for the majority of callers taking the lock won't hurt as they call it in their init code.

Thanks,
Dmitry