diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b048ad8a11af..8d7c246ab864 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4746,16 +4746,8 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio) | |||
4746 | set_load_weight(p); | 4746 | set_load_weight(p); |
4747 | } | 4747 | } |
4748 | 4748 | ||
4749 | /** | 4749 | static int __sched_setscheduler(struct task_struct *p, int policy, |
4750 | * sched_setscheduler - change the scheduling policy and/or RT priority of a thread. | 4750 | struct sched_param *param, bool user) |
4751 | * @p: the task in question. | ||
4752 | * @policy: new policy. | ||
4753 | * @param: structure containing the new RT priority. | ||
4754 | * | ||
4755 | * NOTE that the task may be already dead. | ||
4756 | */ | ||
4757 | int sched_setscheduler(struct task_struct *p, int policy, | ||
4758 | struct sched_param *param) | ||
4759 | { | 4751 | { |
4760 | int retval, oldprio, oldpolicy = -1, on_rq, running; | 4752 | int retval, oldprio, oldpolicy = -1, on_rq, running; |
4761 | unsigned long flags; | 4753 | unsigned long flags; |
@@ -4787,7 +4779,7 @@ recheck: | |||
4787 | /* | 4779 | /* |
4788 | * Allow unprivileged RT tasks to decrease priority: | 4780 | * Allow unprivileged RT tasks to decrease priority: |
4789 | */ | 4781 | */ |
4790 | if (!capable(CAP_SYS_NICE)) { | 4782 | if (user && !capable(CAP_SYS_NICE)) { |
4791 | if (rt_policy(policy)) { | 4783 | if (rt_policy(policy)) { |
4792 | unsigned long rlim_rtprio; | 4784 | unsigned long rlim_rtprio; |
4793 | 4785 | ||
@@ -4823,7 +4815,8 @@ recheck: | |||
4823 | * Do not allow realtime tasks into groups that have no runtime | 4815 | * Do not allow realtime tasks into groups that have no runtime |
4824 | * assigned. | 4816 | * assigned. |
4825 | */ | 4817 | */ |
4826 | if (rt_policy(policy) && task_group(p)->rt_bandwidth.rt_runtime == 0) | 4818 | if (user |
4819 | && rt_policy(policy) && task_group(p)->rt_bandwidth.rt_runtime == 0) | ||
4827 | return -EPERM; | 4820 | return -EPERM; |
4828 | #endif | 4821 | #endif |
4829 | 4822 | ||
@@ -4872,8 +4865,39 @@ recheck: | |||
4872 | 4865 | ||
4873 | return 0; | 4866 | return 0; |
4874 | } | 4867 | } |
4868 | |||
4869 | /** | ||
4870 | * sched_setscheduler - change the scheduling policy and/or RT priority of a thread. | ||
4871 | * @p: the task in question. | ||
4872 | * @policy: new policy. | ||
4873 | * @param: structure containing the new RT priority. | ||
4874 | * | ||
4875 | * NOTE that the task may be already dead. | ||
4876 | */ | ||
4877 | int sched_setscheduler(struct task_struct *p, int policy, | ||
4878 | struct sched_param *param) | ||
4879 | { | ||
4880 | return __sched_setscheduler(p, policy, param, true); | ||
4881 | } | ||
4875 | EXPORT_SYMBOL_GPL(sched_setscheduler); | 4882 | EXPORT_SYMBOL_GPL(sched_setscheduler); |
4876 | 4883 | ||
4884 | /** | ||
4885 | * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace. | ||
4886 | * @p: the task in question. | ||
4887 | * @policy: new policy. | ||
4888 | * @param: structure containing the new RT priority. | ||
4889 | * | ||
4890 | * Just like sched_setscheduler, only don't bother checking if the | ||
4891 | * current context has permission. For example, this is needed in | ||
4892 | * stop_machine(): we create temporary high priority worker threads, | ||
4893 | * but our caller might not have that capability. | ||
4894 | */ | ||
4895 | int sched_setscheduler_nocheck(struct task_struct *p, int policy, | ||
4896 | struct sched_param *param) | ||
4897 | { | ||
4898 | return __sched_setscheduler(p, policy, param, false); | ||
4899 | } | ||
4900 | |||
4877 | static int | 4901 | static int |
4878 | do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param) | 4902 | do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param) |
4879 | { | 4903 | { |