From: Leonard Crestez <leonard.crestez@nxp.com> To: Matthias Kaehlcke <mka@chromium.org>, Chanwoo Choi <cw00.choi@samsung.com>, MyungJoo Ham <myungjoo.ham@samsung.com> Cc: "Kyungmin Park" <kyungmin.park@samsung.com>, "Artur Świgoń" <a.swigon@partner.samsung.com>, "Saravana Kannan" <saravanak@google.com>, "Krzysztof Kozlowski" <krzk@kernel.org>, "Alexandre Bailon" <abailon@baylibre.com>, "Georgi Djakov" <georgi.djakov@linaro.org>, "Abel Vesa" <abel.vesa@nxp.com>, "Jacky Bai" <ping.bai@nxp.com>, "Viresh Kumar" <viresh.kumar@linaro.org>, "Lukasz Luba" <l.luba@partner.samsung.com>, "NXP Linux Team" <linux-imx@nxp.com>, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 4/8] PM / devfreq: Move more initialization before registration Date: Wed, 2 Oct 2019 22:25:07 +0300 [thread overview] Message-ID: <25f46d76dc95d5509edd7bf9d1a2e0532faef4cc.1570044052.git.leonard.crestez@nxp.com> (raw) In-Reply-To: <cover.1570044052.git.leonard.crestez@nxp.com> In-Reply-To: <cover.1570044052.git.leonard.crestez@nxp.com> In general it is a better to initialize an object before making it accessible externally (through device_register). This makes it possible to avoid remove locking the partially initialized object and simplifies the code. However devm is not available before device_register (only after the device_initialize step) so the two allocations need to be managed manually. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 3e0e936185a3..0b40f40ee7aa 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -591,10 +591,12 @@ static void devfreq_dev_release(struct device *dev) mutex_unlock(&devfreq_list_lock); if (devfreq->profile->exit) devfreq->profile->exit(devfreq->dev.parent); + kfree(devfreq->time_in_state); + kfree(devfreq->trans_table); mutex_destroy(&devfreq->lock); kfree(devfreq); } /** @@ -674,44 +676,43 @@ struct devfreq *devfreq_add_device(struct device *dev, devfreq->max_freq = devfreq->scaling_max_freq; devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); atomic_set(&devfreq->suspend_count, 0); - dev_set_name(&devfreq->dev, "devfreq%d", - atomic_inc_return(&devfreq_no)); - err = device_register(&devfreq->dev); - if (err) { - mutex_unlock(&devfreq->lock); - put_device(&devfreq->dev); - goto err_out; - } - - devfreq->trans_table = devm_kzalloc(&devfreq->dev, + devfreq->trans_table = kzalloc( array3_size(sizeof(unsigned int), devfreq->profile->max_state, devfreq->profile->max_state), GFP_KERNEL); if (!devfreq->trans_table) { mutex_unlock(&devfreq->lock); err = -ENOMEM; - goto err_devfreq; + goto err_dev; } - devfreq->time_in_state = devm_kcalloc(&devfreq->dev, - devfreq->profile->max_state, - sizeof(unsigned long), - GFP_KERNEL); + devfreq->time_in_state = kcalloc(devfreq->profile->max_state, + sizeof(unsigned long), + GFP_KERNEL); if (!devfreq->time_in_state) { mutex_unlock(&devfreq->lock); err = -ENOMEM; - goto err_devfreq; + goto err_dev; } devfreq->last_stat_updated = jiffies; srcu_init_notifier_head(&devfreq->transition_notifier_list); + dev_set_name(&devfreq->dev, "devfreq%d", + atomic_inc_return(&devfreq_no)); + err = device_register(&devfreq->dev); + if (err) { + mutex_unlock(&devfreq->lock); + put_device(&devfreq->dev); + goto err_out; + } + mutex_unlock(&devfreq->lock); mutex_lock(&devfreq_list_lock); governor = try_then_request_governor(devfreq->governor_name); @@ -737,14 +738,20 @@ struct devfreq *devfreq_add_device(struct device *dev, return devfreq; err_init: mutex_unlock(&devfreq_list_lock); -err_devfreq: devfreq_remove_device(devfreq); - devfreq = NULL; + return ERR_PTR(err); + err_dev: + /* + * Cleanup path for errors that happen before registration. + * Otherwise we rely on devfreq_dev_release. + */ + kfree(devfreq->time_in_state); + kfree(devfreq->trans_table); kfree(devfreq); err_out: return ERR_PTR(err); } EXPORT_SYMBOL(devfreq_add_device); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Leonard Crestez <leonard.crestez@nxp.com> To: Matthias Kaehlcke <mka@chromium.org>, Chanwoo Choi <cw00.choi@samsung.com>, MyungJoo Ham <myungjoo.ham@samsung.com> Cc: "Artur Świgoń" <a.swigon@partner.samsung.com>, "Abel Vesa" <abel.vesa@nxp.com>, "Saravana Kannan" <saravanak@google.com>, linux-pm@vger.kernel.org, "Viresh Kumar" <viresh.kumar@linaro.org>, "NXP Linux Team" <linux-imx@nxp.com>, "Krzysztof Kozlowski" <krzk@kernel.org>, "Lukasz Luba" <l.luba@partner.samsung.com>, "Kyungmin Park" <kyungmin.park@samsung.com>, "Alexandre Bailon" <abailon@baylibre.com>, "Georgi Djakov" <georgi.djakov@linaro.org>, linux-arm-kernel@lists.infradead.org, "Jacky Bai" <ping.bai@nxp.com> Subject: [PATCH v9 4/8] PM / devfreq: Move more initialization before registration Date: Wed, 2 Oct 2019 22:25:07 +0300 [thread overview] Message-ID: <25f46d76dc95d5509edd7bf9d1a2e0532faef4cc.1570044052.git.leonard.crestez@nxp.com> (raw) In-Reply-To: <cover.1570044052.git.leonard.crestez@nxp.com> In-Reply-To: <cover.1570044052.git.leonard.crestez@nxp.com> In general it is a better to initialize an object before making it accessible externally (through device_register). This makes it possible to avoid remove locking the partially initialized object and simplifies the code. However devm is not available before device_register (only after the device_initialize step) so the two allocations need to be managed manually. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 3e0e936185a3..0b40f40ee7aa 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -591,10 +591,12 @@ static void devfreq_dev_release(struct device *dev) mutex_unlock(&devfreq_list_lock); if (devfreq->profile->exit) devfreq->profile->exit(devfreq->dev.parent); + kfree(devfreq->time_in_state); + kfree(devfreq->trans_table); mutex_destroy(&devfreq->lock); kfree(devfreq); } /** @@ -674,44 +676,43 @@ struct devfreq *devfreq_add_device(struct device *dev, devfreq->max_freq = devfreq->scaling_max_freq; devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); atomic_set(&devfreq->suspend_count, 0); - dev_set_name(&devfreq->dev, "devfreq%d", - atomic_inc_return(&devfreq_no)); - err = device_register(&devfreq->dev); - if (err) { - mutex_unlock(&devfreq->lock); - put_device(&devfreq->dev); - goto err_out; - } - - devfreq->trans_table = devm_kzalloc(&devfreq->dev, + devfreq->trans_table = kzalloc( array3_size(sizeof(unsigned int), devfreq->profile->max_state, devfreq->profile->max_state), GFP_KERNEL); if (!devfreq->trans_table) { mutex_unlock(&devfreq->lock); err = -ENOMEM; - goto err_devfreq; + goto err_dev; } - devfreq->time_in_state = devm_kcalloc(&devfreq->dev, - devfreq->profile->max_state, - sizeof(unsigned long), - GFP_KERNEL); + devfreq->time_in_state = kcalloc(devfreq->profile->max_state, + sizeof(unsigned long), + GFP_KERNEL); if (!devfreq->time_in_state) { mutex_unlock(&devfreq->lock); err = -ENOMEM; - goto err_devfreq; + goto err_dev; } devfreq->last_stat_updated = jiffies; srcu_init_notifier_head(&devfreq->transition_notifier_list); + dev_set_name(&devfreq->dev, "devfreq%d", + atomic_inc_return(&devfreq_no)); + err = device_register(&devfreq->dev); + if (err) { + mutex_unlock(&devfreq->lock); + put_device(&devfreq->dev); + goto err_out; + } + mutex_unlock(&devfreq->lock); mutex_lock(&devfreq_list_lock); governor = try_then_request_governor(devfreq->governor_name); @@ -737,14 +738,20 @@ struct devfreq *devfreq_add_device(struct device *dev, return devfreq; err_init: mutex_unlock(&devfreq_list_lock); -err_devfreq: devfreq_remove_device(devfreq); - devfreq = NULL; + return ERR_PTR(err); + err_dev: + /* + * Cleanup path for errors that happen before registration. + * Otherwise we rely on devfreq_dev_release. + */ + kfree(devfreq->time_in_state); + kfree(devfreq->trans_table); kfree(devfreq); err_out: return ERR_PTR(err); } EXPORT_SYMBOL(devfreq_add_device); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-02 19:25 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-02 19:25 [PATCH v9 0/8] PM / devfreq: Add dev_pm_qos support Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 1/8] PM / devfreq: Don't fail devfreq_dev_release if not in list Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 2/8] PM / devfreq: Fix devfreq_notifier_call returning errno Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 21:24 ` Matthias Kaehlcke 2019-10-02 21:24 ` Matthias Kaehlcke 2019-10-02 23:47 ` Leonard Crestez 2019-10-02 23:47 ` Leonard Crestez 2019-10-31 2:29 ` Chanwoo Choi 2019-10-31 2:29 ` Chanwoo Choi 2019-10-02 19:25 ` [PATCH v9 3/8] PM / devfreq: Set scaling_max_freq to max on OPP notifier error Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 21:33 ` Matthias Kaehlcke 2019-10-02 21:33 ` Matthias Kaehlcke 2019-10-31 2:21 ` Chanwoo Choi 2019-10-31 2:21 ` Chanwoo Choi 2019-10-02 19:25 ` Leonard Crestez [this message] 2019-10-02 19:25 ` [PATCH v9 4/8] PM / devfreq: Move more initialization before registration Leonard Crestez 2019-10-31 3:15 ` Chanwoo Choi 2019-10-31 3:15 ` Chanwoo Choi 2019-10-31 13:31 ` Leonard Crestez 2019-10-31 13:31 ` Leonard Crestez 2019-11-01 8:31 ` Chanwoo Choi 2019-11-01 8:31 ` Chanwoo Choi 2019-11-01 14:36 ` Leonard Crestez 2019-11-01 14:36 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 5/8] PM / devfreq: Don't take lock in devfreq_add_device Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 6/8] PM / devfreq: Introduce get_freq_range helper Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-03 18:19 ` Matthias Kaehlcke 2019-10-03 18:19 ` Matthias Kaehlcke 2019-10-03 19:16 ` Leonard Crestez 2019-10-03 19:16 ` Leonard Crestez 2019-10-03 19:36 ` Matthias Kaehlcke 2019-10-03 19:36 ` Matthias Kaehlcke 2019-10-11 18:29 ` Matthias Kaehlcke 2019-10-11 18:29 ` Matthias Kaehlcke 2019-10-31 2:44 ` Chanwoo Choi 2019-10-31 2:44 ` Chanwoo Choi 2019-10-31 2:42 ` Chanwoo Choi 2019-10-31 2:42 ` Chanwoo Choi 2019-10-31 13:12 ` Leonard Crestez 2019-10-31 13:12 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 7/8] PM / devfreq: Add PM QoS support Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-02 22:22 ` Matthias Kaehlcke 2019-10-02 22:22 ` Matthias Kaehlcke 2019-10-04 17:04 ` Matthias Kaehlcke 2019-10-04 17:04 ` Matthias Kaehlcke 2019-10-31 3:01 ` Chanwoo Choi 2019-10-31 3:01 ` Chanwoo Choi 2019-10-31 13:21 ` Leonard Crestez 2019-10-31 13:21 ` Leonard Crestez 2019-10-02 19:25 ` [PATCH v9 8/8] PM / devfreq: Use PM QoS for sysfs min/max_freq Leonard Crestez 2019-10-02 19:25 ` Leonard Crestez 2019-10-04 17:05 ` Matthias Kaehlcke 2019-10-04 17:05 ` Matthias Kaehlcke 2019-10-31 3:10 ` Chanwoo Choi 2019-10-31 3:10 ` Chanwoo Choi 2019-10-23 14:06 ` [PATCH v9 0/8] PM / devfreq: Add dev_pm_qos support Leonard Crestez 2019-10-23 14:06 ` Leonard Crestez 2019-10-23 16:34 ` Matthias Kaehlcke 2019-10-23 16:34 ` Matthias Kaehlcke 2019-10-24 16:21 ` Leonard Crestez 2019-10-24 16:21 ` Leonard Crestez
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=25f46d76dc95d5509edd7bf9d1a2e0532faef4cc.1570044052.git.leonard.crestez@nxp.com \ --to=leonard.crestez@nxp.com \ --cc=a.swigon@partner.samsung.com \ --cc=abailon@baylibre.com \ --cc=abel.vesa@nxp.com \ --cc=cw00.choi@samsung.com \ --cc=georgi.djakov@linaro.org \ --cc=krzk@kernel.org \ --cc=kyungmin.park@samsung.com \ --cc=l.luba@partner.samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-pm@vger.kernel.org \ --cc=mka@chromium.org \ --cc=myungjoo.ham@samsung.com \ --cc=ping.bai@nxp.com \ --cc=saravanak@google.com \ --cc=viresh.kumar@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.