Skip to content

Commit

Permalink
cpufreq: schedutil: irq-work and mutex are only used in slow path
Browse files Browse the repository at this point in the history
Execute the irq-work specific initialization/exit code only when the
fast path isn't available.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Viresh Kumar authored and Rafael J. Wysocki committed Nov 16, 2016
1 parent 02a7b1e commit 21ef572
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions kernel/sched/cpufreq_schedutil.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,12 @@ static struct sugov_policy *sugov_policy_alloc(struct cpufreq_policy *policy)
return NULL;

sg_policy->policy = policy;
init_irq_work(&sg_policy->irq_work, sugov_irq_work);
mutex_init(&sg_policy->work_lock);
raw_spin_lock_init(&sg_policy->update_lock);
return sg_policy;
}

static void sugov_policy_free(struct sugov_policy *sg_policy)
{
mutex_destroy(&sg_policy->work_lock);
kfree(sg_policy);
}

Expand Down Expand Up @@ -432,6 +429,9 @@ static int sugov_kthread_create(struct sugov_policy *sg_policy)

sg_policy->thread = thread;
kthread_bind_mask(thread, policy->related_cpus);
init_irq_work(&sg_policy->irq_work, sugov_irq_work);
mutex_init(&sg_policy->work_lock);

wake_up_process(thread);

return 0;
Expand All @@ -445,6 +445,7 @@ static void sugov_kthread_stop(struct sugov_policy *sg_policy)

kthread_flush_worker(&sg_policy->worker);
kthread_stop(sg_policy->thread);
mutex_destroy(&sg_policy->work_lock);
}

static struct sugov_tunables *sugov_tunables_alloc(struct sugov_policy *sg_policy)
Expand Down Expand Up @@ -611,8 +612,10 @@ static void sugov_stop(struct cpufreq_policy *policy)

synchronize_sched();

irq_work_sync(&sg_policy->irq_work);
kthread_cancel_work_sync(&sg_policy->work);
if (!policy->fast_switch_enabled) {
irq_work_sync(&sg_policy->irq_work);
kthread_cancel_work_sync(&sg_policy->work);
}
}

static void sugov_limits(struct cpufreq_policy *policy)
Expand Down

0 comments on commit 21ef572

Please sign in to comment.