Skip to contentSkip to conversation

cpufreq_ondemand.c: don't use _WORK_NAR

PATCH Superseded Oleg Nesterov 2 participants 2 messages Feb 18, 2007 – Feb 19, 2007 CPU frequency scaling framework

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 cpufreq_ondemand.c: don't use _WORK_NAR

Looks like dbs_timer() is very careful wrt per_cpu(cpu_dbs_info), and it doesn't need the help of WORK_STRUCT_NOAUTOREL.

drivers/cpufreq/cpufreq_ondemand.c renamed from drivers/cpufreq/cpufreq_ondemand.c~2_cpufreq +1 -4
@@ -432,9 +432,6 @@ static void do_dbs_timer(struct work_str
 	/* We want all CPUs to do sampling nearly on same jiffy */
 	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 
-	/* Permit rescheduling of this work item */
-	work_release(work);
-
 	delay -= jiffies % delay;
 
 	if (lock_policy_rwsem_write(cpu) < 0)
@@ -473,7 +470,7 @@ static inline void dbs_timer_init(struct
 	dbs_info->enable = 1;
 	ondemand_powersave_bias_init();
 	dbs_info->sample_type = DBS_NORMAL_SAMPLE;
-	INIT_DELAYED_WORK_NAR(&dbs_info->work, do_dbs_timer);
+	INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);
 	queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
 	                      delay);
 }
Acked-by on v1 2/3
#1 lore raw
Quoted 2 lines · Oleg Nesterov

Looks like dbs_timer() is very careful wrt per_cpu(cpu_dbs_info), and it doesn't need the help of WORK_STRUCT_NOAUTOREL.

Actually, I think my problem with this was dbs_info->sample_type, but reading it again, I'm not sure that it's actually a problem as the work function will probably not ever be executing on two or more CPUs simultaneously because of the deferral time involved.

So, your patch is probably fair enough. Certainly, deletion isn't a problem.