From: Viresh Kumar <viresh.kumar@linaro.org>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
kernel test robot <oliver.sang@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 2/3] cpufreq: Panic if policy is active in cpufreq_policy_free()
Date: Fri, 27 May 2022 09:23:34 +0530 [thread overview]
Message-ID: <426bf6edc80b2e944d459fa7b8dffbe8b73bb3d9.1653623526.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <8c3d50faf8811e86136fb3f9c459e43fc3c50bc0.1653565641.git.viresh.kumar@linaro.org>
With the new design in place, to avoid potential races show() and
store() callbacks check if the policy is active or not before proceeding
any further. And in order to guarantee that cpufreq_policy_free() must
be called after clearing the policy->cpus mask, i.e. by marking it
inactive.
Lets make sure we don't get a bug around this later and catch this early
by putting a BUG_ON() within cpufreq_policy_free().
Also update cpufreq_online() a bit to make sure we clear the cpus mask
for each error case before calling cpufreq_policy_free().
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
V2: Update cpufreq_online() and changelog.
drivers/cpufreq/cpufreq.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index e24aa5d4bca5..0f8245731783 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1284,6 +1284,12 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy)
unsigned long flags;
int cpu;
+ /*
+ * The callers must ensure the policy is inactive by now, to avoid any
+ * races with show()/store() callbacks.
+ */
+ BUG_ON(!policy_is_inactive(policy));
+
/* Remove policy from list */
write_lock_irqsave(&cpufreq_driver_lock, flags);
list_del(&policy->policy_list);
@@ -1538,8 +1544,6 @@ static int cpufreq_online(unsigned int cpu)
for_each_cpu(j, policy->real_cpus)
remove_cpu_dev_symlink(policy, j, get_cpu_device(j));
- cpumask_clear(policy->cpus);
-
out_offline_policy:
if (cpufreq_driver->offline)
cpufreq_driver->offline(policy);
@@ -1549,6 +1553,7 @@ static int cpufreq_online(unsigned int cpu)
cpufreq_driver->exit(policy);
out_free_policy:
+ cpumask_clear(policy->cpus);
up_write(&policy->rwsem);
cpufreq_policy_free(policy);
--
2.31.1.272.g89b43f80a514
next prev parent reply other threads:[~2022-05-27 3:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 11:51 [PATCH 0/3] cpufreq: Minor cleanups Viresh Kumar
2022-05-26 11:51 ` [PATCH 1/3] cpufreq: Optimize cpufreq_show_cpus() Viresh Kumar
2022-05-26 11:51 ` [PATCH 2/3] cpufreq: Panic if policy is active in cpufreq_policy_free() Viresh Kumar
2022-05-27 3:13 ` [cpufreq] a6cb305191: kernel_BUG_at_drivers/cpufreq/cpufreq.c kernel test robot
2022-05-27 3:13 ` kernel test robot
2022-05-27 3:54 ` Viresh Kumar
2022-05-27 3:54 ` Viresh Kumar
2022-05-27 3:53 ` Viresh Kumar [this message]
2022-06-14 13:59 ` [PATCH V2 2/3] cpufreq: Panic if policy is active in cpufreq_policy_free() Rafael J. Wysocki
2022-06-15 4:59 ` Viresh Kumar
2022-07-06 13:49 ` Rafael J. Wysocki
2022-07-06 15:23 ` Viresh Kumar
2022-07-06 15:34 ` Rafael J. Wysocki
2022-05-26 11:51 ` [PATCH 3/3] cpufreq: Drop unnecessary cpus locking from store() Viresh Kumar
2022-06-14 13:51 ` Rafael J. Wysocki
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=426bf6edc80b2e944d459fa7b8dffbe8b73bb3d9.1653623526.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=oliver.sang@intel.com \
--cc=rafael@kernel.org \
--cc=vincent.guittot@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: link
Be 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.