diff options
| author | Mathieu Poirier <mathieu.poirier@linaro.org> | 2018-02-07 14:47:15 -0700 |
|---|---|---|
| committer | Mathieu Poirier <mathieu.poirier@linaro.org> | 2018-02-13 10:12:15 -0700 |
| commit | ee41d040d0ba28a018a61bc592df266513546b6a (patch) | |
| tree | 0c9abec02ce75d651a0e6a8ed036e4807e2ffb47 | |
| parent | 80a482f617384de277d10bb75d6ec7b59a001ffc (diff) | |
sched/core: Streamlining calls to task_rq_unlock()
Calls to task_rq_unlock() are done several times in function
__sched_setscheduler(). This is fine when only the rq lock needs to be
handled but not so much when other locks come into play.
This patch streamline the release of the rq lock so that only one location
need to be modified when dealing with more than one lock.
No change of functionality is introduced by this patch.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
| -rw-r--r-- | kernel/sched/core.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index bf724c1952ea..f727c3d0064c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4189,8 +4189,8 @@ recheck: * Changing the policy of the stop threads its a very bad idea: */ if (p == rq->stop) { - task_rq_unlock(rq, p, &rf); - return -EINVAL; + retval = -EINVAL; + goto unlock; } /* @@ -4206,8 +4206,8 @@ recheck: goto change; p->sched_reset_on_fork = reset_on_fork; - task_rq_unlock(rq, p, &rf); - return 0; + retval = 0; + goto unlock; } change: @@ -4220,8 +4220,8 @@ change: if (rt_bandwidth_enabled() && rt_policy(policy) && task_group(p)->rt_bandwidth.rt_runtime == 0 && !task_group_is_autogroup(task_group(p))) { - task_rq_unlock(rq, p, &rf); - return -EPERM; + retval = -EPERM; + goto unlock; } #endif #ifdef CONFIG_SMP @@ -4236,8 +4236,8 @@ change: */ if (!cpumask_subset(span, &p->cpus_allowed) || rq->rd->dl_bw.bw == 0) { - task_rq_unlock(rq, p, &rf); - return -EPERM; + retval = -EPERM; + goto unlock; } } #endif @@ -4256,8 +4256,8 @@ change: * is available. */ if ((dl_policy(policy) || dl_task(p)) && sched_dl_overflow(p, policy, attr)) { - task_rq_unlock(rq, p, &rf); - return -EBUSY; + retval = -EBUSY; + goto unlock; } p->sched_reset_on_fork = reset_on_fork; @@ -4313,6 +4313,10 @@ change: preempt_enable(); return 0; + +unlock: + task_rq_unlock(rq, p, &rf); + return retval; } static int _sched_setscheduler(struct task_struct *p, int policy, |