Skip to content

Commit 3ee7be9

Browse files
committed
PM: EM: Address RCU-related sparse warnings
The usage of __rcu in the Energy Model code is quite inconsistent which causes the following sparse warnings to trigger: kernel/power/energy_model.c:169:15: warning: incorrect type in assignment (different address spaces) kernel/power/energy_model.c:169:15: expected struct em_perf_table [noderef] __rcu *table kernel/power/energy_model.c:169:15: got struct em_perf_table * kernel/power/energy_model.c:171:9: warning: incorrect type in argument 1 (different address spaces) kernel/power/energy_model.c:171:9: expected struct callback_head *head kernel/power/energy_model.c:171:9: got struct callback_head [noderef] __rcu * kernel/power/energy_model.c:171:9: warning: cast removes address space '__rcu' of expression kernel/power/energy_model.c:182:19: warning: incorrect type in argument 1 (different address spaces) kernel/power/energy_model.c:182:19: expected struct kref *kref kernel/power/energy_model.c:182:19: got struct kref [noderef] __rcu * kernel/power/energy_model.c:200:15: warning: incorrect type in assignment (different address spaces) kernel/power/energy_model.c:200:15: expected struct em_perf_table [noderef] __rcu *table kernel/power/energy_model.c:200:15: got void *[assigned] _res kernel/power/energy_model.c:204:20: warning: incorrect type in argument 1 (different address spaces) kernel/power/energy_model.c:204:20: expected struct kref *kref kernel/power/energy_model.c:204:20: got struct kref [noderef] __rcu * kernel/power/energy_model.c:320:19: warning: incorrect type in argument 1 (different address spaces) kernel/power/energy_model.c:320:19: expected struct kref *kref kernel/power/energy_model.c:320:19: got struct kref [noderef] __rcu * kernel/power/energy_model.c:325:45: warning: incorrect type in argument 2 (different address spaces) kernel/power/energy_model.c:325:45: expected struct em_perf_state *table kernel/power/energy_model.c:325:45: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:425:45: warning: incorrect type in argument 3 (different address spaces) kernel/power/energy_model.c:425:45: expected struct em_perf_state *table kernel/power/energy_model.c:425:45: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:442:15: warning: incorrect type in argument 1 (different address spaces) kernel/power/energy_model.c:442:15: expected void const *objp kernel/power/energy_model.c:442:15: got struct em_perf_table [noderef] __rcu *[assigned] em_table kernel/power/energy_model.c:626:55: warning: incorrect type in argument 2 (different address spaces) kernel/power/energy_model.c:626:55: expected struct em_perf_state *table kernel/power/energy_model.c:626:55: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:681:16: warning: incorrect type in assignment (different address spaces) kernel/power/energy_model.c:681:16: expected struct em_perf_state *new_ps kernel/power/energy_model.c:681:16: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:699:37: warning: incorrect type in argument 2 (different address spaces) kernel/power/energy_model.c:699:37: expected struct em_perf_state *table kernel/power/energy_model.c:699:37: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:733:38: warning: incorrect type in argument 3 (different address spaces) kernel/power/energy_model.c:733:38: expected struct em_perf_state *table kernel/power/energy_model.c:733:38: got struct em_perf_state [noderef] __rcu * kernel/power/energy_model.c:855:53: warning: dereference of noderef expression kernel/power/energy_model.c:864:32: warning: dereference of noderef expression This is because the __rcu annotation for sparse is only applicable to pointers that need rcu_dereference() or equivalent for protection, which basically means pointers assigned with rcu_assign_pointer(). Make all of the above sparse warnings go away by cleaning up the usage of __rcu and using rcu_dereference_protected() where applicable. Cc: All applicable <stable@vger.kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Link: https://patch.msgid.link/5885405.DvuYhMxLoT@rjwysocki.net
1 parent 860a731 commit 3ee7be9

File tree

2 files changed

+26
-25
lines changed

2 files changed

+26
-25
lines changed

include/linux/energy_model.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ struct em_data_callback {
167167
struct em_perf_domain *em_cpu_get(int cpu);
168168
struct em_perf_domain *em_pd_get(struct device *dev);
169169
int em_dev_update_perf_domain(struct device *dev,
170-
struct em_perf_table __rcu *new_table);
170+
struct em_perf_table *new_table);
171171
int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
172172
const struct em_data_callback *cb,
173173
const cpumask_t *cpus, bool microwatts);
174174
void em_dev_unregister_perf_domain(struct device *dev);
175-
struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd);
176-
void em_table_free(struct em_perf_table __rcu *table);
175+
struct em_perf_table *em_table_alloc(struct em_perf_domain *pd);
176+
void em_table_free(struct em_perf_table *table);
177177
int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
178178
int nr_states);
179179
int em_dev_update_chip_binning(struct device *dev);
@@ -373,14 +373,14 @@ static inline int em_pd_nr_perf_states(struct em_perf_domain *pd)
373373
return 0;
374374
}
375375
static inline
376-
struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd)
376+
struct em_perf_table *em_table_alloc(struct em_perf_domain *pd)
377377
{
378378
return NULL;
379379
}
380-
static inline void em_table_free(struct em_perf_table __rcu *table) {}
380+
static inline void em_table_free(struct em_perf_table *table) {}
381381
static inline
382382
int em_dev_update_perf_domain(struct device *dev,
383-
struct em_perf_table __rcu *new_table)
383+
struct em_perf_table *new_table)
384384
{
385385
return -EINVAL;
386386
}

kernel/power/energy_model.c

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,8 @@ static void em_debug_remove_pd(struct device *dev) {}
163163

164164
static void em_release_table_kref(struct kref *kref)
165165
{
166-
struct em_perf_table __rcu *table;
167-
168166
/* It was the last owner of this table so we can free */
169-
table = container_of(kref, struct em_perf_table, kref);
170-
171-
kfree_rcu(table, rcu);
167+
kfree_rcu(container_of(kref, struct em_perf_table, kref), rcu);
172168
}
173169

174170
/**
@@ -177,7 +173,7 @@ static void em_release_table_kref(struct kref *kref)
177173
*
178174
* No return values.
179175
*/
180-
void em_table_free(struct em_perf_table __rcu *table)
176+
void em_table_free(struct em_perf_table *table)
181177
{
182178
kref_put(&table->kref, em_release_table_kref);
183179
}
@@ -190,9 +186,9 @@ void em_table_free(struct em_perf_table __rcu *table)
190186
* has a user.
191187
* Returns allocated table or NULL.
192188
*/
193-
struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd)
189+
struct em_perf_table *em_table_alloc(struct em_perf_domain *pd)
194190
{
195-
struct em_perf_table __rcu *table;
191+
struct em_perf_table *table;
196192
int table_size;
197193

198194
table_size = sizeof(struct em_perf_state) * pd->nr_perf_states;
@@ -300,9 +296,9 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,
300296
* Return 0 on success or an error code on failure.
301297
*/
302298
int em_dev_update_perf_domain(struct device *dev,
303-
struct em_perf_table __rcu *new_table)
299+
struct em_perf_table *new_table)
304300
{
305-
struct em_perf_table __rcu *old_table;
301+
struct em_perf_table *old_table;
306302
struct em_perf_domain *pd;
307303

308304
if (!dev)
@@ -319,7 +315,8 @@ int em_dev_update_perf_domain(struct device *dev,
319315

320316
kref_get(&new_table->kref);
321317

322-
old_table = pd->em_table;
318+
old_table = rcu_dereference_protected(pd->em_table,
319+
lockdep_is_held(&em_pd_mutex));
323320
rcu_assign_pointer(pd->em_table, new_table);
324321

325322
em_cpufreq_update_efficiencies(dev, new_table->state);
@@ -392,7 +389,7 @@ static int em_create_pd(struct device *dev, int nr_states,
392389
const cpumask_t *cpus,
393390
unsigned long flags)
394391
{
395-
struct em_perf_table __rcu *em_table;
392+
struct em_perf_table *em_table;
396393
struct em_perf_domain *pd;
397394
struct device *cpu_dev;
398395
int cpu, ret, num_cpus;
@@ -552,6 +549,7 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
552549
const struct em_data_callback *cb,
553550
const cpumask_t *cpus, bool microwatts)
554551
{
552+
struct em_perf_table *em_table;
555553
unsigned long cap, prev_cap = 0;
556554
unsigned long flags = 0;
557555
int cpu, ret;
@@ -624,7 +622,9 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
624622
dev->em_pd->min_perf_state = 0;
625623
dev->em_pd->max_perf_state = nr_states - 1;
626624

627-
em_cpufreq_update_efficiencies(dev, dev->em_pd->em_table->state);
625+
em_table = rcu_dereference_protected(dev->em_pd->em_table,
626+
lockdep_is_held(&em_pd_mutex));
627+
em_cpufreq_update_efficiencies(dev, em_table->state);
628628

629629
em_debug_create_pd(dev);
630630
dev_info(dev, "EM: created perf domain\n");
@@ -661,17 +661,18 @@ void em_dev_unregister_perf_domain(struct device *dev)
661661
mutex_lock(&em_pd_mutex);
662662
em_debug_remove_pd(dev);
663663

664-
em_table_free(dev->em_pd->em_table);
664+
em_table_free(rcu_dereference_protected(dev->em_pd->em_table,
665+
lockdep_is_held(&em_pd_mutex)));
665666

666667
kfree(dev->em_pd);
667668
dev->em_pd = NULL;
668669
mutex_unlock(&em_pd_mutex);
669670
}
670671
EXPORT_SYMBOL_GPL(em_dev_unregister_perf_domain);
671672

672-
static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd)
673+
static struct em_perf_table *em_table_dup(struct em_perf_domain *pd)
673674
{
674-
struct em_perf_table __rcu *em_table;
675+
struct em_perf_table *em_table;
675676
struct em_perf_state *ps, *new_ps;
676677
int ps_size;
677678

@@ -693,7 +694,7 @@ static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd)
693694
}
694695

695696
static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd,
696-
struct em_perf_table __rcu *em_table)
697+
struct em_perf_table *em_table)
697698
{
698699
int ret;
699700

@@ -723,7 +724,7 @@ static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd,
723724
static void em_adjust_new_capacity(struct device *dev,
724725
struct em_perf_domain *pd)
725726
{
726-
struct em_perf_table __rcu *em_table;
727+
struct em_perf_table *em_table;
727728

728729
em_table = em_table_dup(pd);
729730
if (!em_table) {
@@ -814,7 +815,7 @@ static void em_update_workfn(struct work_struct *work)
814815
*/
815816
int em_dev_update_chip_binning(struct device *dev)
816817
{
817-
struct em_perf_table __rcu *em_table;
818+
struct em_perf_table *em_table;
818819
struct em_perf_domain *pd;
819820
int i, ret;
820821

0 commit comments

Comments
 (0)