From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754015AbdKFSbA (ORCPT ); Mon, 6 Nov 2017 13:31:00 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:37132 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbdKFSa6 (ORCPT ); Mon, 6 Nov 2017 13:30:58 -0500 From: Roman Gushchin To: Tejun Heo CC: , , , Roman Gushchin Subject: [PATCH v2 1/2] cgroup: export list of delegatable control files using sysfs Date: Mon, 6 Nov 2017 13:30:28 -0500 Message-ID: <20171106183029.21297-1-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106173854.GE3252168@devbig577.frc2.facebook.com> References: <20171106173854.GE3252168@devbig577.frc2.facebook.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::2:f826] X-ClientProxiedBy: CY4PR01CA0005.prod.exchangelabs.com (2603:10b6:903:1f::15) To CO1PR15MB1079.namprd15.prod.outlook.com (2a01:111:e400:7b66::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b53717f-ac70-4990-be26-08d525448237 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CO1PR15MB1079; X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;3:M4VhS7W/qbIWWFXUuQ5ojkW035OvINatyv3lyPxhFNnerg5DiG1NqMGvhnE3w/0xKXKcTMr5R7kvxahSEbG+pXUeIzfqkv48gGumBQhif0PPRvMfXPmZi61DVha0wToKWdbALksknUCpr41lo0TOy6P3DxV9sp0ElYsk0G4gngM5tNKFzo8lZbUfmmA7YoHiq7mskqD2fcFTqbMlG1IRvcWxHKiU8QX/3DAC+iNkgMSD6cP862VKsW9LGRQX1Hes;25:ccVXNS/XYq0mfSfpQeifQ1kndmo1cUsY10+kQ+Gym9EfeXmCLlaZokP3mwk1x4c+mJ8TXG4C3s4EcntYBw6AOFFf+GK3nh0X5yjY9Wx06V1+/H1EonEA3YimKfxSlcrzbjbrdyMnQgTBF+aAPi3hhizq4qTyW5+91KB1xZkBa2QqsL7NkCsVmlY+i9Src+LShOQAUI1rNcsT6LG/hcr0Edz4OJ4Y9LU/F6VAJlOW6XdpC5Vt/Hz2DXHTWUb6zQVxg+AGEPFKWx0K76m9+T46gO6Vr7kyFZc8ZmAP/4HXLWm5h4L6jwEwEP3Jrh0PwwJaT/BoaqEbzqvyuvowzw9NaA==;31:oAW1/u0ZWhL/202r+ITPzH+K2R++j7R33hU+HNCFqMAyWTBtBUzbuHQlvJAqnyBfcAvl8oi/6JBEIoTj0tOZTfpjMg5yv6W8iGjj57fGoMkt9yax3Rhln1KGcYhr1y3QwtfPrNPgF1xM6fFxiJbNNuZZnZ67dEdpqj8UHAlsrvhutfv3iCZafS+mHM6XuSQJndFkorR1g5S5Y8XnwhQ0Qu9uovinkIXHKcgnrDATJ4g= X-MS-TrafficTypeDiagnostic: CO1PR15MB1079: X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;20:3ollAo0i/a+FL3JVVudiZp+jSW0s2cJwy/9xipc+OFa5fUwYrBvjN1SZFVBOQX/WyQQP6Y4yVmsmgGg9X7JmIhU6r1XLzucDBz9+s51oKfAnzaeo3SVxfuvgQ1j3aD0aMwWGfw/Fr8tkU3bf98ZwUNHoj3kq7b5N5eErs5yzMqIoiJt8I7kTQyxUdx1/UM5dH2ow8ePugKaYyg1QRSRIV6gHkxr21NC1zm6O5UEnBJZ07JNGrHutmVtxIWpdPJo1NsR5OD2zPAkCcgRmddE2ycUhj05ADgl/daZA3oDn9NIwQlc23Fdaiskx/Z+avTIVcuxKeKmonWLrdObvXAS6B6fq9Z+YH58tTPNycvB9+asWbE+PpsfH2Cc825Asd/OsRLnFrydM2OxnhbZ3hO5gACB9wKvxcR5QQxX5OgA1SvWHdzPvVTShsTyP1ZaBx7B7K0gnVJ7fh4lB7pOOvbnPaJzD9LmHiSHuGLcxDE9UFcFn3VBXtn+woYxcjoAKL578;4:xcmrAInmoq+jjJcpauExfun1xlkMs/G85Ckxt2WsJCFdo+9vuRuUUcODd/J1WqyVohhZjGOy6PvL1/46wdxlonufp0rz52LRoIKb7qmaD27YtedmNhquqtv9vl0nFd8+ie9jM4X0Vz8g4fJjvYyq8aiVRndPecK465+tlE5BPZsfZGkCWN/KKvehtnxyI9Edl6PvMF7+zetun5bjcgRcjlUYPbHvV0kKItEbMZSg/FKDc8QX7XYaQ6UuByV9GPiKy36CfFOKIScfr5P6EW37Hvfs4JKI1CchhXUVDOfk3Soim8wrsHeK5LXIwEs5uvjH X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(11241501159)(6040450)(2401047)(8121501046)(5005006)(3231021)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CO1PR15MB1079;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CO1PR15MB1079; X-Forefront-PRVS: 048396AFA0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(5003940100001)(8936002)(69596002)(6666003)(81156014)(6486002)(6506006)(8676002)(33646002)(2950100002)(50466002)(48376002)(6512007)(5660300001)(53416004)(101416001)(105586002)(106356001)(81166006)(36756003)(6916009)(4326008)(97736004)(53936002)(76176999)(50986999)(189998001)(86362001)(478600001)(68736007)(1076002)(25786009)(47776003)(6116002)(2906002)(50226002)(16586007)(316002)(305945005)(7736002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR15MB1079;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR15MB1079;23:Qt3Y4XKwUnYbalpZgmdQQjftS0NS7qN4/NknI23iA?= =?us-ascii?Q?jXHkbk001xooUSDCQ7Gs4ZDHT5K6ugg2/Qtzedy2v3hD0YUesQnmHX5pVbpo?= =?us-ascii?Q?D5odqn3P+qjHJDXCCubwQUhKY1dymGNJtvQY/SiBaJ0gGBnAikCq/kHBDQib?= =?us-ascii?Q?0XynIyqbSy3SFKC7KY9KDgY9ryYRtAQwimMBudoVt++qagbVaYJGZV+/YBis?= =?us-ascii?Q?Fm33fAOEcclhRlLP1FNKr4pDf7gdDICd98MuTjP/fZO1gMi8R/c2YUMWnVmq?= =?us-ascii?Q?lndS8+H+sRhMhIKyj8c4qYOqcl1SbXbjrsk3AJgmcKoDmQqY0ZjE4XOc0QPy?= =?us-ascii?Q?0PHVjx3y0fGYa9+uTTu9eUemLVGY3tUtQW741+mKivvlQtnwAfxdxpK64q3P?= =?us-ascii?Q?UV6mpGoAq3FdHrwDG9vlUAQPy/kp4EYWevFJqLyTfZ998juLNVOc+cv+jxQ3?= =?us-ascii?Q?A0ZbFB5ZHEcv2J5wm+U0EWxL2r+7JCizP5oOvfL9LlmFTaGJbEpaR51jAlUd?= =?us-ascii?Q?MDnKZVYq+2R7OLWn+nVX466QL3m0OjweXvwINu1CLzuIRIghPTSBTlB3TJbr?= =?us-ascii?Q?HqECL183kkTbDn0XqPMHsLmn/B127onUnenq9vYux8TFcZZ6pnF0tS8/fQKX?= =?us-ascii?Q?0Lte42MxcRK+9bkC1GRPkha5PQtp+w6EL6iSlIWqcGj3EKZSdSemmBX9g1zu?= =?us-ascii?Q?PQFiuMSVhr3Hlqv7tWL+lRcqOEsQs2ulrICvNs94xoTfI30TzIumYw4C4cDB?= =?us-ascii?Q?M4OJcopQ9yBApTr8OREwZAtgAQEoaC3swHdnEjFss8+jluYsoHkeis7OtoL7?= =?us-ascii?Q?E5ntfu7zN72LxeAUxCHL89gjFcXsZIyQbsSiTb8xbwu+0ewGZ4Cl4CUcbvOS?= =?us-ascii?Q?V/0dUibxv9lbZ9iJfJRLFATbU2/DNJua5TBVde2SsOSy7cgykdEul+HRUCbL?= =?us-ascii?Q?0dLmlX3Y5nYKwGPVEw9UGzwbKPoOTQO1vSnBQfFGpt6Z8qoFxI1VKY0H8IVF?= =?us-ascii?Q?66ryhxCn2Ucy18NtDmsna0o62J1etLv8dKnp3+kZnfT6G98fUSspf21mPP79?= =?us-ascii?Q?EAyDd/IL2UrZmFDkGSXdzjQ4E2O?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;6:EecOz5fwyP0lPZAXc/I69phmoCetYhg2CN+DyeckasUvh6+s3VrzStJfpIRlczb/fbaFAzBxoExo7wRB9FQOWSaIOnohb+lSqWDTYAi/RwyOu9UFnrP2JgweeajMei1AH3PHwRKA+6+uc4lIewpDWFkZPimP/XxUTYa7RA6jlnlsy/HDnP7e9t4WA33bx6s/uxBKWaDJD2f8OsKzVql9AoPR4xxIQBwB4JY5Y3a1cqUAFXvnP1eIJChAoenUE54g/1+I+4U+cmqc6NnOo42UeGb7OLsKvznhoKk+pYCjHHcZDZU9ZCtcNIeBN+noIxUDUkAGNVZPLx6pWRj+fteKeYhGqswHkZomb+PVa8JhgWw=;5:8wOn3vOmmqwl/gonAEbD7ktx8XiJucJmVjvTIG8i4sUdsgpGl89Zact6VavvKbNHzBJmr2U+a71Lw1XJ6C374TMbXML/NchkaARxkS4s4FHjqmBrqYHSppNwZCo7ABjzq7UtUHz7KysNK/ty3/a4R90giJ+Xt2kIB98KamCAwZw=;24:icVKZpT/1os1lsJcEifWjbxJb3CEgG7GpOFDKPtxAv5+JPNy+o65vydecuN0dm31m/P5qyBhlqJHByE+vsPOk9wuS7QWt482TlbcRSCZzyE=;7:DWanL29S6JbL/PCha19ysyfWjAHhKfusvTXniy+Xu9w7zZQsJsU9vHoqvuTkD01siOCHEqwltrljRcaQTWW8dNnyNyPZegQV2Tpas+8+s4/ef8eMOGhxQ7CTs4m+YUQe+m9R1fO2jE1Ag91xbNOoeWPnriMh0kFi9TPJepiXXpzr5y53as9riGpG7Cps/90fVeFouZNqRLEmE/R0zgc+Uf6ja60VaY2IplAlS5f8iaomQaT/+Y3Idc17Y6BpzffK SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;20:e3F/3ztGCvn6l/isWwfsSVJdky+jNJrslUxmsdAF24+AX9OIDUdIFJAkAlmuJ/aiQn/80dVXEKW+6aU8lxi8bPWd2I9RbS/th68gdQd88ydQrByqeaYNwruFyVt/hB0htxzi4vBbyCuVYRC1CvNdwG+UU2ymVbA68tOXkoQg12M= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2017 18:30:49.8925 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b53717f-ac70-4990-be26-08d525448237 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB1079 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-06_06:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Delegatable cgroup v2 control files may require special handling (e.g. chowning), and the exact list of such files varies between kernel versions (and likely to be extended in the future). To guarantee correctness of this list and simplify the life of userspace (systemd, first of all), let's export the list via /sys/kernel/cgroup/delegate pseudo-file. Format is siple: each control file name is printed on a new line. Example: $ cat /sys/kernel/cgroup/delegate cgroup.procs cgroup.subtree_control Signed-off-by: Roman Gushchin Cc: Tejun Heo Cc: kernel-team@fb.com --- kernel/cgroup/cgroup.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index d6ed725f36d9..eed92ed624e5 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5832,3 +5832,64 @@ int cgroup_bpf_update(struct cgroup *cgrp, struct bpf_prog *prog, return ret; } #endif /* CONFIG_CGROUP_BPF */ + +#ifdef CONFIG_SYSFS +static ssize_t show_delegatable_files(struct cftype *files, char *buf, + ssize_t size, const char *prefix) +{ + struct cftype *cft; + ssize_t ret = 0; + + for (cft = files; cft && cft->name[0] != '\0'; cft++) { + if (!(cft->flags & CFTYPE_NS_DELEGATABLE)) + continue; + + if (prefix) + ret += snprintf(buf + ret, size - ret, "%s.", prefix); + + ret += snprintf(buf + ret, size - ret, "%s\n", cft->name); + + if (unlikely(ret >= size)) { + WARN_ON(1); + break; + } + } + + return ret; +} + +static ssize_t delegate_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct cgroup_subsys *ss; + int ssid; + ssize_t ret = 0; + + ret = show_delegatable_files(cgroup_base_files, buf, PAGE_SIZE - ret, + NULL); + + for_each_subsys(ss, ssid) + ret += show_delegatable_files(ss->dfl_cftypes, buf + ret, + PAGE_SIZE - ret, + cgroup_subsys_name[ssid]); + + return ret; +} +static struct kobj_attribute cgroup_delegate_attr = __ATTR_RO(delegate); + +static struct attribute *cgroup_sysfs_attrs[] = { + &cgroup_delegate_attr.attr, + NULL, +}; + +static const struct attribute_group cgroup_sysfs_attr_group = { + .attrs = cgroup_sysfs_attrs, + .name = "cgroup", +}; + +static int __init cgroup_sysfs_init(void) +{ + return sysfs_create_group(kernel_kobj, &cgroup_sysfs_attr_group); +} +subsys_initcall(cgroup_sysfs_init); +#endif /* CONFIG_SYSFS */ -- 2.13.6