From patchwork Wed Oct 5 00:21:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 77272 Delivered-To: patches@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2498800qgf; Tue, 4 Oct 2016 17:21:20 -0700 (PDT) X-Received: by 10.98.68.8 with SMTP id r8mr11133335pfa.0.1475626880452; Tue, 04 Oct 2016 17:21:20 -0700 (PDT) Return-Path: Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com. [2607:f8b0:400e:c03::234]) by mx.google.com with ESMTPS id kf6si5388753pab.85.2016.10.04.17.21.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Oct 2016 17:21:20 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::234 as permitted sender) client-ip=2607:f8b0:400e:c03::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pa0-x234.google.com with SMTP id rz1so22925769pab.1 for ; Tue, 04 Oct 2016 17:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=fUQ0GjMEQVYvJMvhpRm4pLlrvJk9OmLwMIkbO0C341E=; b=T4QXomIVNfc+UTQ3SNEwHJt5AmSbbLDI3ipxufD3tJEB46qwiAI13ZF6uxbCFrEVtL cbbcJjY5yDoBoeyO5s7DLaCFefDPgL3Jgqu38sz8l8hYMzR93lD0SISFxI9G9zYDwHbg zL9rNkJhKLR2hRN5jmpOEfWfaIXFamB4hFYdo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fUQ0GjMEQVYvJMvhpRm4pLlrvJk9OmLwMIkbO0C341E=; b=k/iBZ23Rjwoqec8iULy5kh8YZ+y50rIGLJ29Cn1f4W6SV/cbYNVb6Q6stAVHo7JQJT s+quHk6B4pPe6I/5h0wF1SmB5Vt0ltRfYoN1uR4drXKDFvW0C/Ju3212oZOlRQgDsMTU wvRFK6E4hzkPGZTE6n6k1ahB0h2BA6QqGF0R8LSkXCFLzpqsYDeXft8zdvUciZnHCBy4 T/C9HtWTOE7iyJzJ2WJ8wHz1jtMbQ6Ay1aXGcsKLFBtaBxMNLTauKCFi68gwD6SLxMY8 efYEgdqEuxtktL81c1iw0TdeCcREQ3NpZNrgi7IB4PINN4tIevwSi/dLBvT115mpyPTo BeeQ== X-Gm-Message-State: AA6/9Rk0CAqQFXYKhMVGBHzimt/3lL6YhjSWpJyPSE7YU6PaqWROAYBYlFEX3FiiGmU9lIztcDc= X-Received: by 10.66.193.199 with SMTP id hq7mr9192156pac.70.1475626879528; Tue, 04 Oct 2016 17:21:19 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id r77sm57870976pfg.16.2016.10.04.17.21.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Oct 2016 17:21:18 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Tejun Heo , Li Zefan , Jonathan Corbet , cgroups@vger.kernel.org, Android Kernel Team , Rom Lemarchand , Colin Cross , Dmitry Shmidt , Todd Kjos , Christian Poetzsch , Amit Pundir , "Serge E. Hallyn" Subject: [RFC][PATCH] cgroup: Add new capability to allow a process to migrate other tasks between cgroups Date: Tue, 4 Oct 2016 17:21:14 -0700 Message-Id: <1475626874-22949-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 This patch adds CAP_GROUP_MIGRATE_TASK and logic to allows a process to migrate other tasks between cgroups. In Android (where this feature originated), the ActivityManager tracks various application states (TOP_APP, FOREGROUND, BACKGROUND, SYSTEM, etc), and then as applications change states, the SchedPolicy logic will migrate the application tasks between different cgroups used to control the different application states (for example, there is a background cpuset cgroup which can limit background tasks to stay on one low-power cpu, and the bg_non_interactive cpuctrl cgroup can then further limit those background tasks to a small percentage of that one cpu's cpu time). However, for security reasons, Android doesn't want to make the system_server (the process that runs the ActivityManager and SchedPolicy logic), run as root. So in the Android common.git kernel, they have some logic to allow cgroups to loosen their permissions so CAP_SYS_NICE tasks can migrate other tasks between cgroups. The approach taken there overloads CAP_SYS_NICE a bit much, and is maybe more complicated then needed. So this patch, as suggested by Tejun, simply adds a new process capability flag (CAP_CGROUP_MIGRATE_TASK), and uses it when checking if a task can migrate other tasks between cgroups. I've tested this with AOSP master (though its a bit hacked in as I still need to properly get the selinux bits aware of the new capability bit) with selinux set to permissive and it seems to be working well. Thouhts and feedback would be appreciated! Cc: Tejun Heo Cc: Li Zefan Cc: Jonathan Corbet Cc: cgroups@vger.kernel.org Cc: Android Kernel Team Cc: Rom Lemarchand Cc: Colin Cross Cc: Dmitry Shmidt Cc: Todd Kjos Cc: Christian Poetzsch Cc: Amit Pundir Cc: Serge E. Hallyn Signed-off-by: John Stultz --- include/uapi/linux/capability.h | 5 ++++- kernel/cgroup.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index 49bc062..e199ea0 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h @@ -349,8 +349,11 @@ struct vfs_cap_data { #define CAP_AUDIT_READ 37 +/* Allow migrating tasks between cgroups */ -#define CAP_LAST_CAP CAP_AUDIT_READ +#define CAP_CGROUP_MIGRATE_TASK 38 + +#define CAP_LAST_CAP CAP_CGROUP_MIGRATE_TASK #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 9ba28310..a318956 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2847,7 +2847,8 @@ static int cgroup_procs_write_permission(struct task_struct *task, */ if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && !uid_eq(cred->euid, tcred->uid) && - !uid_eq(cred->euid, tcred->suid)) + !uid_eq(cred->euid, tcred->suid) && + !ns_capable(tcred->user_ns, CAP_CGROUP_MIGRATE_TASK)) ret = -EACCES; if (!ret && cgroup_on_dfl(dst_cgrp)) {