From f39d0b496aa4e13cbcf23bdf3c22d356bd783b9e Mon Sep 17 00:00:00 2001 From: Andres Oportus Date: Mon, 27 Mar 2017 16:05:46 +0100 Subject: sched: tune: Unconditionally allow attach in commit ac087abe1358 ("Merge android-msm-8998-4.4-common into android-msm-muskie-4.4"), .allow_attach = subsys_cgroup_allow_attach, was dropped in the merge. This patch brings back allow_attach, but with the marlin-3.18 behavior of allowing all cgroup changes rather than the subsys_cgroup_allow_attach behavior of requiring SYS_CAP_NICE. Bug: 36592053 Change-Id: Iaa51597b49a955fd5709ca504e968ea19a9ca8f5 Signed-off-by: Andres Oportus Signed-off-by: Andrew Chant --- kernel/sched/tune.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/sched/tune.c b/kernel/sched/tune.c index 99b580d2395a..62d7a0f93cef 100644 --- a/kernel/sched/tune.c +++ b/kernel/sched/tune.c @@ -518,6 +518,13 @@ void schedtune_enqueue_task(struct task_struct *p, int cpu) raw_spin_unlock_irqrestore(&bg->lock, irq_flags); } +int schedtune_allow_attach(struct cgroup_subsys_state *css, + struct cgroup_taskset *tset) +{ + /* We always allows tasks to be moved between existing CGroups */ + return 0; +} + int schedtune_can_attach(struct cgroup_taskset *tset) { struct task_struct *task; @@ -533,7 +540,6 @@ int schedtune_can_attach(struct cgroup_taskset *tset) if (!unlikely(schedtune_initialized)) return 0; - cgroup_taskset_for_each(task, css, tset) { /* @@ -901,6 +907,7 @@ schedtune_css_free(struct cgroup_subsys_state *css) struct cgroup_subsys schedtune_cgrp_subsys = { .css_alloc = schedtune_css_alloc, .css_free = schedtune_css_free, + .allow_attach = schedtune_allow_attach, .can_attach = schedtune_can_attach, .cancel_attach = schedtune_cancel_attach, .legacy_cftypes = files, -- cgit v1.2.3