From: Leonard Crestez <leonard.crestez@nxp.com> To: MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Matthias Kaehlcke <mka@chromium.org> Cc: "Chanwoo Choi" <cw00.choi@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 v8 2/6] PM / devfreq: Move more initialization before registration Date: Tue, 24 Sep 2019 13:11:26 +0300 [thread overview] Message-ID: <398895f3b4f9ca4b03b47b56dfa25fbd58fd2311.1569319738.git.leonard.crestez@nxp.com> (raw) In-Reply-To: <cover.1569319738.git.leonard.crestez@nxp.com> In-Reply-To: <cover.1569319738.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 relying on locking a partially initialized object. 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 12c4bcdc1f17..dbc6dc882aba 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -588,10 +588,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); } /** @@ -671,44 +673,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); @@ -734,14 +735,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: MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Matthias Kaehlcke <mka@chromium.org> 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>, "Chanwoo Choi" <cw00.choi@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 v8 2/6] PM / devfreq: Move more initialization before registration Date: Tue, 24 Sep 2019 13:11:26 +0300 [thread overview] Message-ID: <398895f3b4f9ca4b03b47b56dfa25fbd58fd2311.1569319738.git.leonard.crestez@nxp.com> (raw) In-Reply-To: <cover.1569319738.git.leonard.crestez@nxp.com> In-Reply-To: <cover.1569319738.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 relying on locking a partially initialized object. 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 12c4bcdc1f17..dbc6dc882aba 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -588,10 +588,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); } /** @@ -671,44 +673,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); @@ -734,14 +735,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-09-24 10:11 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20190924101140epcas1p4abeedf42f223e65f58c88a0ddf1e4e56@epcas1p4.samsung.com> 2019-09-24 10:11 ` [PATCH v8 0/6] PM / devfreq: Add dev_pm_qos support Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-24 10:11 ` [PATCH v8 1/6] PM / devfreq: Don't fail devfreq_dev_release if not in list Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez [this message] 2019-09-24 10:11 ` [PATCH v8 2/6] PM / devfreq: Move more initialization before registration Leonard Crestez 2019-09-25 1:46 ` Chanwoo Choi 2019-09-25 1:46 ` Chanwoo Choi 2019-09-24 10:11 ` [PATCH v8 3/6] PM / devfreq: Don't take lock in devfreq_add_device Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-24 10:11 ` [PATCH v8 4/6] PM / devfreq: Introduce get_freq_range helper Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-25 1:37 ` Chanwoo Choi 2019-09-25 1:37 ` Chanwoo Choi 2019-09-25 20:55 ` Leonard Crestez 2019-09-25 20:55 ` Leonard Crestez 2019-09-26 1:06 ` Chanwoo Choi 2019-09-26 1:06 ` Chanwoo Choi 2019-09-26 14:03 ` Leonard Crestez 2019-09-26 14:03 ` Leonard Crestez 2019-09-24 10:11 ` [PATCH v8 5/6] PM / devfreq: Add PM QoS support Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-24 19:11 ` Matthias Kaehlcke 2019-09-24 19:11 ` Matthias Kaehlcke 2019-09-24 19:22 ` Leonard Crestez 2019-09-24 19:22 ` Leonard Crestez 2019-09-25 2:17 ` Chanwoo Choi 2019-09-25 2:17 ` Chanwoo Choi 2019-09-25 19:40 ` Leonard Crestez 2019-09-25 19:40 ` Leonard Crestez 2019-09-26 1:08 ` Chanwoo Choi 2019-09-26 1:08 ` Chanwoo Choi 2019-09-25 2:15 ` Chanwoo Choi 2019-09-25 2:15 ` Chanwoo Choi 2019-09-25 16:06 ` Matthias Kaehlcke 2019-09-25 16:06 ` Matthias Kaehlcke 2019-09-25 21:18 ` Leonard Crestez 2019-09-25 21:18 ` Leonard Crestez 2019-09-26 1:12 ` Chanwoo Choi 2019-09-26 1:12 ` Chanwoo Choi 2019-09-26 13:43 ` Leonard Crestez 2019-09-26 13:43 ` Leonard Crestez 2019-09-27 1:49 ` Chanwoo Choi 2019-09-27 1:49 ` Chanwoo Choi 2019-09-30 13:16 ` Leonard Crestez 2019-09-30 13:16 ` Leonard Crestez 2019-09-30 21:42 ` Chanwoo Choi 2019-09-30 21:42 ` Chanwoo Choi 2019-10-01 9:39 ` Leonard Crestez 2019-10-01 9:39 ` Leonard Crestez 2019-10-01 21:55 ` Chanwoo Choi 2019-10-01 21:55 ` Chanwoo Choi 2019-09-26 1:19 ` Chanwoo Choi 2019-09-26 1:19 ` Chanwoo Choi 2019-09-30 12:43 ` Leonard Crestez 2019-09-30 12:43 ` Leonard Crestez 2019-09-30 21:21 ` Chanwoo Choi 2019-09-30 21:21 ` Chanwoo Choi 2019-09-24 10:11 ` [PATCH v8 6/6] PM / devfreq: Use PM QoS for sysfs min/max_freq Leonard Crestez 2019-09-24 10:11 ` Leonard Crestez 2019-09-25 2:41 ` Chanwoo Choi 2019-09-25 2:41 ` Chanwoo Choi 2019-09-25 16:45 ` Matthias Kaehlcke 2019-09-25 16:45 ` Matthias Kaehlcke 2019-09-26 1:25 ` Chanwoo Choi 2019-09-26 1:25 ` Chanwoo Choi 2019-09-26 16:04 ` Matthias Kaehlcke 2019-09-26 16:04 ` Matthias Kaehlcke 2019-09-27 1:58 ` Chanwoo Choi 2019-09-27 1:58 ` Chanwoo Choi 2019-09-25 22:11 ` Leonard Crestez 2019-09-25 22:11 ` Leonard Crestez 2019-09-26 1:26 ` Chanwoo Choi 2019-09-26 1:26 ` Chanwoo Choi 2019-09-25 1:44 ` [PATCH v8 0/6] PM / devfreq: Add dev_pm_qos support Chanwoo Choi 2019-09-25 1:44 ` Chanwoo Choi 2019-09-25 19:37 ` Leonard Crestez 2019-09-25 19:37 ` Leonard Crestez [not found] ` <CGME20190924101139epcas1p4c6799a5de9bdb4e90abb74de1e881388@epcms1p4> 2019-09-25 1:58 ` [PATCH v8 2/6] PM / devfreq: Move more initialization before registration MyungJoo Ham 2019-09-25 1:58 ` MyungJoo Ham 2019-09-25 19:33 ` Leonard Crestez 2019-09-25 19:33 ` 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=398895f3b4f9ca4b03b47b56dfa25fbd58fd2311.1569319738.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.