cgroup: introduce cgroup.kill
Subsystems (4)
PATCH v2 1/5 cgroup: introduce cgroup.kill
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new CGRP_KILL css set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check in cgroup_post_fork() where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.
There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup /sys/fs/cgroup/delegated
flag to take down cgroups.
A few observations about the semantics:
- If parent and child are in the same cgroup and CLONE_INTO_CGROUP is not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right before cgroup_can_fork() and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check in cgroup_post_fork() whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check as cgroup_post_fork() is performed.
For all other cases CLONE_INTO_CGROUP is required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.
---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrieve cgrp->flags only once and check CGRP_* bits on it.
--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)
include/linux/cgroup-defs.h +3 -0
@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */
kernel/cgroup/cgroup.c +113 -14
166 lines not on this page · raw message
base-commit: 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20210503143922.3093755-1-brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
PATCH v2 2/5 docs/cgroup: add entry for cgroup.kill
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Give a brief overview of the cgroup.kill functionality.
---
/* v2 */
- Roman Gushchin <[email protected]>:
- Drop sentence that mentions combined useage of cgroup.kill and cgroup.freezer.
--- Documentation/admin-guide/cgroup-v2.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/admin-guide/cgroup-v2.rst +15 -0
@@ -949,6 +949,21 @@ All cgroup core files are prefixed with "cgroup." it's possible to delete a frozen (and empty) cgroup, as well as create new sub-cgroups. + cgroup.kill + A write-only single value file which exists in non-root cgroups. + The only allowed value is "1". + + Writing "1" to the file causes the cgroup and all descendant cgroups to + be killed. This means that all processes located in the affected cgroup + tree will be killed via SIGKILL. + + Killing a cgroup tree will deal with concurrent forks appropriately and + is protected against migrations. + + In a threaded cgroup, writing this file fails with EOPNOTSUPP as + killing cgroups is a process directed operation, i.e. it affects + the whole thread-group. + Controllers ===========
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20210503143922.3093755-2-brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Shakeel Butt
Reviewed-byRe: [PATCH v2 2/5] docs/cgroup: add entry for cgroup.kill
Quoted 9 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Give a brief overview of the cgroup.kill functionality.
Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>
PATCH v2 3/5 tests/cgroup: use cgroup.kill in cg_killall()
In reply to a message not in the archiveFrom: Christian Brauner <christian.brauner-GeWIH/[email protected]>
If cgroup.kill file is supported make use of it.
---
/* v2 */
- Roman Gushchin <[email protected]>:
- Fix whitespace.
--- tools/testing/selftests/cgroup/cgroup_util.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/cgroup/cgroup_util.c +4 -0
@@ -252,6 +252,10 @@ int cg_killall(const char *cgroup)char buf[PAGE_SIZE ];char *ptr = buf; +/* If cgroup.kill exists use it. */ +if (!cg_write (cgroup,"cgroup.kill" ,"1" )) +return 0 ; +if (cg_read (cgroup,"cgroup.procs" , buf,sizeof (buf)))return -1 ;
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20210503143922.3093755-3-brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Shakeel Butt
Reviewed-byRe: [PATCH v2 3/5] tests/cgroup: use cgroup.kill in cg_killall()
Quoted 9 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
If cgroup.kill file is supported make use of it.
Cc Tejun Heo <[email protected]>Acked-by Roman Gushchin <[email protected]>
Quoted 13 lines
---
/* v2 */
- Roman Gushchin <[email protected]>:
- Fix whitespace.--- tools/testing/selftests/cgroup/cgroup_util.c | 4 ++++ 1 file changed, 4 insertions(+)tools/testing/selftests/cgroup/cgroup_util.c +0
-0
tools/testing/selftests/cgroup/cgroup_util.c int cg_killall(const char *cgroup) · line 257
Quoted 6 lines
tools/testing/selftests/cgroup/cgroup_util.c +3
-0@@ -252,6 +252,10 @@ int cg_killall(const char *cgroup)char buf[PAGE_SIZE ];char *ptr = buf; +/* If cgroup.kill exists use it. */ +if (!cg_write (cgroup,"cgroup.kill" ,"1" )) +return 0 ;
Now cg_killall will kill all the processes in the tree rooted at cgroup which I think is fine.
Quoted 7 lines
tools/testing/selftests/cgroup/cgroup_util.c +1
-1+if (cg_read (cgroup,"cgroup.procs" , buf,sizeof (buf)))return -1 ; --2.27.0
PATCH v2 4/5 tests/cgroup: move cg_wait_for(), cg_prepare_for_wait()
In reply to a message not in the archiveFrom: Christian Brauner <christian.brauner-GeWIH/[email protected]>
as they will be used by the tests for cgroup killing.
---
/* v2 */
unchanged
--- tools/testing/selftests/cgroup/cgroup_util.c | 47 +++++++++++++++ tools/testing/selftests/cgroup/cgroup_util.h | 2 + tools/testing/selftests/cgroup/test_freezer.c | 57 ------------------- 3 files changed, 49 insertions(+), 57 deletions(-)
tools/testing/selftests/cgroup/cgroup_util.c +47 -0
@@ -5,10 +5,12 @@#include <errno.h> #include <fcntl.h> #include <linux/limits.h> +#include <poll.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/inotify.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h>
@@ -580,3 +582,48 @@ int clone_into_cgroup_run_wait(const char *cgroup) (void )clone_reap (pid,WEXITED );return 0 ; } + +int cg_prepare_for_wait (const char *cgroup) +{ +int fd, ret =-1 ; + + fd =inotify_init1 (0 ); +if (fd ==-1 ) +return fd; + + ret =inotify_add_watch (fd,cg_control (cgroup,"cgroup.events" ), +IN_MODIFY ); +if (ret ==-1 ) { +close (fd); + fd =-1 ; + } + +return fd; +} + +int cg_wait_for (int fd) +{ +int ret =-1 ; +struct pollfd fds = { + .fd = fd, + .events =POLLIN , + }; + +while (true) { + ret =poll (&fds,1 ,10000 ); + +if (ret ==-1 ) { +if (errno ==EINTR ) +continue ; + +break ; + } + +if (ret >0 && fds.revents &POLLIN ) { + ret =0 ; +break ; + } + } + +return ret; +}
tools/testing/selftests/cgroup/cgroup_util.h +2 -0
@@ -54,3 +54,5 @@ extern pid_t clone_into_cgroup(int cgroup_fd);extern int clone_reap (pid_t pid,int options);extern int clone_into_cgroup_run_wait (const char *cgroup);extern int dirfd_open_opath (const char *dir); +extern int cg_prepare_for_wait (const char *cgroup); +extern int cg_wait_for (int fd);
tools/testing/selftests/cgroup/test_freezer.c +0 -57
70 lines not on this page · raw message
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20210503143922.3093755-4-brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Shakeel Butt
Reviewed-byRe: [PATCH v2 4/5] tests/cgroup: move cg_wait_for(), cg_prepare_for_wait()
Quoted 9 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
as they will be used by the tests for cgroup killing.
Cc Tejun Heo <[email protected]>Acked-by Roman Gushchin <[email protected]>
PATCH v2 5/5 tests/cgroup: test cgroup.kill
In reply to a message not in the archiveFrom: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Test that the new cgroup.kill feature works as intended.
---
/* v2 */
- Christian Brauner <christian.brauner-GeWIH/[email protected]>:
- Remove debug logging (It wasn't very helpful in the first place.).
--- tools/testing/selftests/cgroup/.gitignore | 3 +- tools/testing/selftests/cgroup/Makefile | 2 + tools/testing/selftests/cgroup/test_kill.c | 291 +++++++++++++++++++++ 3 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/cgroup/test_kill.c
tools/testing/selftests/cgroup/.gitignore +2 -1
@@ -2,4 +2,5 @@ test_memcontrol test_core test_freezer -test_kmem +test_kmem +test_kill
tools/testing/selftests/cgroup/Makefile +2 -0
@@ -9,6 +9,7 @@ TEST_GEN_PROGS = test_memcontrol TEST_GEN_PROGS += test_kmem TEST_GEN_PROGS += test_core TEST_GEN_PROGS += test_freezer +TEST_GEN_PROGS += test_kill include ../lib.mk
@@ -16,3 +17,4 @@ $(OUTPUT)/test_memcontrol: cgroup_util.c ../clone3/clone3_selftests.h $(OUTPUT)/test_kmem: cgroup_util.c ../clone3/clone3_selftests.h $(OUTPUT)/test_core: cgroup_util.c ../clone3/clone3_selftests.h $(OUTPUT)/test_freezer: cgroup_util.c ../clone3/clone3_selftests.h +$(OUTPUT)/test_kill: cgroup_util.c ../clone3/clone3_selftests.h ../pidfd/pidfd.h
tools/testing/selftests/cgroup/test_kill.c new file +291 -0
291 lines not on this page · raw message
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20210503143922.3093755-5-brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Re: [PATCH v2 5/5] tests/cgroup: test cgroup.kill
Quoted 1 line · Christian Brauner
[...]
Quoted 13 lines
tools/testing/selftests/cgroup/test_kill.c new file +13
-0+ +static int test_cgkill_simple (const char *root) +{ +pid_t pids[100 ]; +int ret =KSFT_FAIL ; +char *cgroup =NULL ; +int i; + + cgroup =cg_name (root,"cg_test_simple" ); +if (!cgroup) + goto cleanup; + +if (cg_create (cgroup))
tools/testing/selftests/cgroup/test_kill.c line 78
Quoted 10 lines
tools/testing/selftests/cgroup/test_kill.c new file +10
-0+ goto cleanup; + +for (i =0 ; i <100 ; i++) + pids[i] =cg_run_nowait (cgroup, child_fn,NULL ); + +if (cg_wait_for_proc_count (cgroup,100 )) + goto cleanup; + +if (cg_write (cgroup,"cgroup.kill" ,"1" )) + goto cleanup;
I don't think the above write to cgroup.kill is correct.
Quoted 21 lines
tools/testing/selftests/cgroup/test_kill.c new file +21
-0+ +if (cg_read_strcmp (cgroup,"cgroup.events" ,"populated 1\n" )) + goto cleanup; + +if (cg_kill_wait (cgroup)) + goto cleanup; + +if (cg_read_strcmp (cgroup,"cgroup.events" ,"populated 0\n" )) + goto cleanup; + + ret =KSFT_PASS ; + +cleanup: +for (i =0 ; i <100 ; i++) +wait_for_pid (pids[i]); + +if (cgroup) +cg_destroy (cgroup); +free (cgroup); +return ret; +}
A message that is not in the archive (sent off-list or not yet received): CALvZod58WX-YpX_eSJzDyYknZiV5GzOe1wnKL8Pk4qMkq+oBQQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH v2 5/5] tests/cgroup: test cgroup.kill
Quoted 20 lines · Shakeel Butt
Quoted 1 line · Christian Brauner
[...]
Quoted 17 lines
tools/testing/selftests/cgroup/test_kill.c new file +17
-0+ +static int test_cgkill_simple (const char *root) +{ +pid_t pids[100 ]; +int ret =KSFT_FAIL ; +char *cgroup =NULL ; +int i; + + cgroup =cg_name (root,"cg_test_simple" ); +if (!cgroup) + goto cleanup; + +if (cg_create (cgroup)) + goto cleanup; + +for (i =0 ; i <100 ; i++) + pids[i] =cg_run_nowait (cgroup, child_fn,NULL );
Quoted 8 lines
tools/testing/selftests/cgroup/test_kill.c line 78
Quoted 6 lines
tools/testing/selftests/cgroup/test_kill.c new file +6
-0+ +if (cg_wait_for_proc_count (cgroup,100 )) + goto cleanup; + +if (cg_write (cgroup,"cgroup.kill" ,"1" )) + goto cleanup;I don't think the above write to cgroup.kill is correct.
Hm, that's a left-over from the port of the similar freezer test. Thanks for spotting this. It never failed because of the number of procs being created and then killed most likely.
Thanks, will remove.
Christian
Shakeel Butt
Reviewed-byQuoted 85 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.
Quoted 5 lines
Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>
Serge E. Hallyn
Reviewed-byQuoted 84 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.
Quoted 5 lines
Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>
Quoted 209 lines
---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +113
-14@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it); +while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 ); + } +css_task_iter_end (&it); + +spin_lock_irq (&css_set_lock); +clear_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); +} + +static void cgroup_kill (struct cgroup *cgrp) +{ +struct cgroup_subsys_state *css; +struct cgroup *dsct; + +lockdep_assert_held (&cgroup_mutex); + +cgroup_for_each_live_descendant_pre (dsct, css, cgrp) +__cgroup_kill (dsct); +} + +static ssize_t cgroup_kill_write (struct kernfs_open_file *of,char *buf, +size_t nbytes,loff_t off) +{ +ssize_t ret =0 ; +int kill; +struct cgroup *cgrp; + + ret =kstrtoint (strstrip (buf),0 , &kill); +if (ret) +return ret; + +if (kill !=1 ) +return -ERANGE ; + + cgrp =cgroup_kn_lock_live (of->kn, false); +if (!cgrp) +return -ENOENT ; + +/* +* Killing is a process directed operation, i.e. the whole thread-group +* is taken down so act like we do for cgroup.procs and only make this +* writable in non-threaded cgroups. +*/ +if (cgroup_is_threaded (cgrp)) + ret = -EOPNOTSUPP ; +else +cgroup_kill (cgrp); + +cgroup_kn_unlock (of->kn); + +return ret ?: nbytes; +} +static int cgroup_file_open (struct kernfs_open_file *of) {struct cftype *cft =of_cft (of);@@ -4846,6 +4920,11 @@ static struct cftype cgroup_base_files[] = { .seq_show = cgroup_freeze_show, .write = cgroup_freeze_write, }, + { + .name = "cgroup.kill", + .flags = CFTYPE_NOT_ON_ROOT, + .write = cgroup_kill_write, + }, { .name = "cpu.stat", .seq_show = cpu_stat_show,@@ -6077,6 +6156,8 @@ void cgroup_post_fork(struct task_struct *child, struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { + unsigned long cgrp_flags = 0; + bool kill = false; struct cgroup_subsys *ss; struct css_set *cset; int i;@@ -6088,6 +6169,11 @@ void cgroup_post_fork(struct task_struct *child,/* init tasks are special, only link regular threads */ if (likely (child->pid)) { +if (kargs->cgrp) + cgrp_flags = kargs->cgrp->flags; +else + cgrp_flags = cset->dfl_cgrp->flags; +WARN_ON_ONCE (!list_empty (&child->cg_list)); cset->nr_tasks++;css_set_move_task (child,NULL , cset, false);@@ -6096,23 +6182,32 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -/* -* If the cgroup has to be frozen, the new task has too. Let's set -* the JOBCTL_TRAP_FREEZE jobctl bit to get the task into the -* frozen state. -*/ -if (unlikely (cgroup_task_freeze (child))) { -spin_lock (&child->sighand->siglock); -WARN_ON_ONCE (child->frozen); - child->jobctl |=JOBCTL_TRAP_FREEZE ; -spin_unlock (&child->sighand->siglock); +if (!(child->flags &PF_KTHREAD )) { +if (test_bit (CGRP_FREEZE , &cgrp_flags)) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +spin_lock (&child->sighand->siglock); +WARN_ON_ONCE (child->frozen); + child->jobctl |=JOBCTL_TRAP_FREEZE ; +spin_unlock (&child->sighand->siglock); + +/* +* Calling cgroup_update_frozen() isn't required here, +* because it will be called anyway a bit later from +* do_freezer_trap(). So we avoid cgroup's transient +* switch from the frozen state and back. +*/ + }/* -* Calling cgroup_update_frozen() isn't required here, -* because it will be called anyway a bit later from -* do_freezer_trap(). So we avoid cgroup's transient switch -* from the frozen state and back. +* If the cgroup is to be killed notice it now and take the +* child down right after we finished preparing it for +* userspace. */ + kill =test_bit (CGRP_KILL , &cgrp_flags); }spin_unlock_irq (&css_set_lock);@@ -6135,6 +6230,10 @@ void cgroup_post_fork(struct task_struct *child,put_css_set (rcset); } +/* Cgroup has to be killed so take down child immediately. */ +if (kill) +send_sig (SIGKILL , child,0 ); +cgroup_css_set_put_fork (kargs); }base-commit:
9f4ad9e425a1d3b6a34617b8ea226d56a119a717Signature · 1 line
2.27.0
Quoted 258 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +95
-10@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it); +while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 ); + } +css_task_iter_end (&it); + +spin_lock_irq (&css_set_lock); +clear_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); +} + +static void cgroup_kill (struct cgroup *cgrp) +{ +struct cgroup_subsys_state *css; +struct cgroup *dsct; + +lockdep_assert_held (&cgroup_mutex); + +cgroup_for_each_live_descendant_pre (dsct, css, cgrp) +__cgroup_kill (dsct); +} + +static ssize_t cgroup_kill_write (struct kernfs_open_file *of,char *buf, +size_t nbytes,loff_t off) +{ +ssize_t ret =0 ; +int kill; +struct cgroup *cgrp; + + ret =kstrtoint (strstrip (buf),0 , &kill); +if (ret) +return ret; + +if (kill !=1 ) +return -ERANGE ; + + cgrp =cgroup_kn_lock_live (of->kn, false); +if (!cgrp) +return -ENOENT ; + +/* +* Killing is a process directed operation, i.e. the whole thread-group +* is taken down so act like we do for cgroup.procs and only make this +* writable in non-threaded cgroups. +*/ +if (cgroup_is_threaded (cgrp)) + ret = -EOPNOTSUPP ; +else +cgroup_kill (cgrp); + +cgroup_kn_unlock (of->kn); + +return ret ?: nbytes; +} +static int cgroup_file_open (struct kernfs_open_file *of) {struct cftype *cft =of_cft (of);@@ -4846,6 +4920,11 @@ static struct cftype cgroup_base_files[] = { .seq_show = cgroup_freeze_show, .write = cgroup_freeze_write, }, + { + .name = "cgroup.kill", + .flags = CFTYPE_NOT_ON_ROOT, + .write = cgroup_kill_write, + }, { .name = "cpu.stat", .seq_show = cpu_stat_show,@@ -6077,6 +6156,8 @@ void cgroup_post_fork(struct task_struct *child, struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { + unsigned long cgrp_flags = 0; + bool kill = false; struct cgroup_subsys *ss; struct css_set *cset; int i;@@ -6088,6 +6169,11 @@ void cgroup_post_fork(struct task_struct *child,/* init tasks are special, only link regular threads */ if (likely (child->pid)) { +if (kargs->cgrp) + cgrp_flags = kargs->cgrp->flags; +else + cgrp_flags = cset->dfl_cgrp->flags; +WARN_ON_ONCE (!list_empty (&child->cg_list)); cset->nr_tasks++;css_set_move_task (child,NULL , cset, false);@@ -6096,23 +6182,32 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -/* -* If the cgroup has to be frozen, the new task has too. Let's set -* the JOBCTL_TRAP_FREEZE jobctl bit to get the task into the -* frozen state. -*/ -if (unlikely (cgroup_task_freeze (child))) { -spin_lock (&child->sighand->siglock); -WARN_ON_ONCE (child->frozen); - child->jobctl |=JOBCTL_TRAP_FREEZE ; -spin_unlock (&child->sighand->siglock); +if (!(child->flags &PF_KTHREAD )) { +if (test_bit (CGRP_FREEZE , &cgrp_flags)) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +spin_lock (&child->sighand->siglock); +WARN_ON_ONCE (child->frozen);
kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6203
Quoted 10 lines
kernel/cgroup/cgroup.c +10
-0+ child->jobctl |=JOBCTL_TRAP_FREEZE ; +spin_unlock (&child->sighand->siglock); + +/* +* Calling cgroup_update_frozen() isn't required here, +* because it will be called anyway a bit later from +* do_freezer_trap(). So we avoid cgroup's transient +* switch from the frozen state and back. +*/ + }
I think this part can be optimized a bit further:
1) we don't need atomic test_bit() here
2) all PF_KTHREAD, CGRP_FREEZE and CGRP_KILL cases are very unlikely
So something like this could work (completely untested):
kernel/cgroup/cgroup.c +11 -8
@@ -6190,13 +6190,15 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -if (!(child->flags &PF_KTHREAD )) { -if (test_bit (CGRP_FREEZE , &cgrp_flags)) { -/* -* If the cgroup has to be frozen, the new task has -* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to -* get the task into the frozen state. -*/ + +if (unlikely (!(child->flags &PF_KTHREAD ) && + cgrp_flags & (CGRP_FREEZE |CGRP_KILL ))) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +if (cgrp_flags &CGRP_FREEZE ) {spin_lock (&child->sighand->siglock);WARN_ON_ONCE (child->frozen); child->jobctl |=JOBCTL_TRAP_FREEZE ;
@@ -6215,7 +6217,8 @@ void cgroup_post_fork(struct task_struct *child,* child down right after we finished preparing it for * userspace. */ - kill =test_bit (CGRP_KILL , &cgrp_flags); +if (cgrp_flags &CGRP_KILL ) + kill = true; }spin_unlock_irq (&css_set_lock);
Quoted 15 lines
kernel/cgroup/cgroup.c +4
-4/* -* Calling cgroup_update_frozen() isn't required here, -* because it will be called anyway a bit later from -* do_freezer_trap(). So we avoid cgroup's transient switch -* from the frozen state and back. +* If the cgroup is to be killed notice it now and take the +* child down right after we finished preparing it for +* userspace. */ + kill =test_bit (CGRP_KILL , &cgrp_flags); }spin_unlock_irq (&css_set_lock);
kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6235
Quoted 6 lines
kernel/cgroup/cgroup.c +3
-0@@ -6135,6 +6230,10 @@ void cgroup_post_fork(struct task_struct *child,put_css_set (rcset); } +/* Cgroup has to be killed so take down child immediately. */ +if (kill) +send_sig (SIGKILL , child,0 );
I think it's better to use do_send_sig_info() here, which skips the check for the signal number, which is obviously valid.
Thanks!
A message that is not in the archive (sent off-list or not yet received): YJLcbOtcv8qWtMRQ-lLJQVQxiE4uLfgCeKHXN1g2O0Ztt9esIQQ4Iyu8u01E@public.gmane.org
Quoted 284 lines · Roman Gushchin
Quoted 258 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +95
-10@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it); +while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 ); + } +css_task_iter_end (&it); + +spin_lock_irq (&css_set_lock); +clear_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); +} + +static void cgroup_kill (struct cgroup *cgrp) +{ +struct cgroup_subsys_state *css; +struct cgroup *dsct; + +lockdep_assert_held (&cgroup_mutex); + +cgroup_for_each_live_descendant_pre (dsct, css, cgrp) +__cgroup_kill (dsct); +} + +static ssize_t cgroup_kill_write (struct kernfs_open_file *of,char *buf, +size_t nbytes,loff_t off) +{ +ssize_t ret =0 ; +int kill; +struct cgroup *cgrp; + + ret =kstrtoint (strstrip (buf),0 , &kill); +if (ret) +return ret; + +if (kill !=1 ) +return -ERANGE ; + + cgrp =cgroup_kn_lock_live (of->kn, false); +if (!cgrp) +return -ENOENT ; + +/* +* Killing is a process directed operation, i.e. the whole thread-group +* is taken down so act like we do for cgroup.procs and only make this +* writable in non-threaded cgroups. +*/ +if (cgroup_is_threaded (cgrp)) + ret = -EOPNOTSUPP ; +else +cgroup_kill (cgrp); + +cgroup_kn_unlock (of->kn); + +return ret ?: nbytes; +} +static int cgroup_file_open (struct kernfs_open_file *of) {struct cftype *cft =of_cft (of);@@ -4846,6 +4920,11 @@ static struct cftype cgroup_base_files[] = { .seq_show = cgroup_freeze_show, .write = cgroup_freeze_write, }, + { + .name = "cgroup.kill", + .flags = CFTYPE_NOT_ON_ROOT, + .write = cgroup_kill_write, + }, { .name = "cpu.stat", .seq_show = cpu_stat_show,@@ -6077,6 +6156,8 @@ void cgroup_post_fork(struct task_struct *child, struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { + unsigned long cgrp_flags = 0; + bool kill = false; struct cgroup_subsys *ss; struct css_set *cset; int i;@@ -6088,6 +6169,11 @@ void cgroup_post_fork(struct task_struct *child,/* init tasks are special, only link regular threads */ if (likely (child->pid)) { +if (kargs->cgrp) + cgrp_flags = kargs->cgrp->flags; +else + cgrp_flags = cset->dfl_cgrp->flags; +WARN_ON_ONCE (!list_empty (&child->cg_list)); cset->nr_tasks++;css_set_move_task (child,NULL , cset, false);@@ -6096,23 +6182,32 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -/* -* If the cgroup has to be frozen, the new task has too. Let's set -* the JOBCTL_TRAP_FREEZE jobctl bit to get the task into the -* frozen state. -*/ -if (unlikely (cgroup_task_freeze (child))) { -spin_lock (&child->sighand->siglock); -WARN_ON_ONCE (child->frozen); - child->jobctl |=JOBCTL_TRAP_FREEZE ; -spin_unlock (&child->sighand->siglock); +if (!(child->flags &PF_KTHREAD )) { +if (test_bit (CGRP_FREEZE , &cgrp_flags)) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +spin_lock (&child->sighand->siglock); +WARN_ON_ONCE (child->frozen);kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6203
Quoted 10 lines
kernel/cgroup/cgroup.c +10
-0+ child->jobctl |=JOBCTL_TRAP_FREEZE ; +spin_unlock (&child->sighand->siglock); + +/* +* Calling cgroup_update_frozen() isn't required here, +* because it will be called anyway a bit later from +* do_freezer_trap(). So we avoid cgroup's transient +* switch from the frozen state and back. +*/ + }I think this part can be optimized a bit further:
1) we don't need atomictest_bit()here
2) allPF_KTHREAD,CGRP_FREEZEandCGRP_KILLcases are very unlikelySo something like this could work (completely untested):
kernel/cgroup/cgroup.c +0
-0@@ -6190,13 +6190,15 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; }
kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6195
Quoted 10 lines
kernel/cgroup/cgroup.c +3
-7-if (!(child->flags &PF_KTHREAD )) { -if (test_bit (CGRP_FREEZE , &cgrp_flags)) { -/* -* If the cgroup has to be frozen, the new task has -* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to -* get the task into the frozen state. -*/ + +if (unlikely (!(child->flags &PF_KTHREAD ) && + cgrp_flags & (CGRP_FREEZE |CGRP_KILL ))) {
The unlikely might make sense.
But hm, I'm not a fan of the CGRP_FREEZE and CGRP_KILL check without test_bit(). That seems a bit ugly. Especially since nowhere in kernel/cgroup.c are these bits checked without test_bit().
Also, this wouldn't work afaict at least not for all values since CGRP_FREEZE and CGRP_KILL aren't flags, they're bits defined in an enum. (In contrast to cgroup_root->flags which are defined as flags _in an enum_.) So it seems they should really be used with test_bit. Otherwise this would probably have to be sm like
if (unlikely(!(child->flags & PF_KTHREAD) &&
(cgrp_flags & (BIT_ULL(CGRP_FREEZE) | BIT_ULL(CGRP_KILL))) {
.
.
.which seems unreadable and makes the rest of cgroup.c for these values inconsistent.
Note that before the check was the same for CGRP_FREEZE it was just hidden in the helper.
I really think we should just leave the test_bit() checks.
Quoted 39 lines
kernel/cgroup/cgroup.c +8
-1+/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +if (cgrp_flags &CGRP_FREEZE ) {spin_lock (&child->sighand->siglock);WARN_ON_ONCE (child->frozen); child->jobctl |=JOBCTL_TRAP_FREEZE ;@@ -6215,7 +6217,8 @@ void cgroup_post_fork(struct task_struct *child,* child down right after we finished preparing it for * userspace. */ - kill =test_bit (CGRP_KILL , &cgrp_flags); +if (cgrp_flags &CGRP_KILL ) + kill = true; }spin_unlock_irq (&css_set_lock);Quoted 20 lines
kernel/cgroup/cgroup.c +4
-4/* -* Calling cgroup_update_frozen() isn't required here, -* because it will be called anyway a bit later from -* do_freezer_trap(). So we avoid cgroup's transient switch -* from the frozen state and back. +* If the cgroup is to be killed notice it now and take the +* child down right after we finished preparing it for +* userspace. */ + kill =test_bit (CGRP_KILL , &cgrp_flags); }spin_unlock_irq (&css_set_lock);@@ -6135,6 +6230,10 @@ void cgroup_post_fork(struct task_struct *child,put_css_set (rcset); }
Quoted 6 lines
kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6235
Quoted 3 lines
kernel/cgroup/cgroup.c +3
-0+/* Cgroup has to be killed so take down child immediately. */ +if (kill) +send_sig (SIGKILL , child,0 );I think it's better to use
do_send_sig_info()here, which skips the check for the signal number, which is obviously valid.
sure/shrug
Roman Gushchin
Acked-byQuoted 314 lines · Christian Brauner
Quoted 284 lines · Roman Gushchin
Quoted 258 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +95
-10@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it); +while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 ); + } +css_task_iter_end (&it); + +spin_lock_irq (&css_set_lock); +clear_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); +} + +static void cgroup_kill (struct cgroup *cgrp) +{ +struct cgroup_subsys_state *css; +struct cgroup *dsct; + +lockdep_assert_held (&cgroup_mutex); + +cgroup_for_each_live_descendant_pre (dsct, css, cgrp) +__cgroup_kill (dsct); +} + +static ssize_t cgroup_kill_write (struct kernfs_open_file *of,char *buf, +size_t nbytes,loff_t off) +{ +ssize_t ret =0 ; +int kill; +struct cgroup *cgrp; + + ret =kstrtoint (strstrip (buf),0 , &kill); +if (ret) +return ret; + +if (kill !=1 ) +return -ERANGE ; + + cgrp =cgroup_kn_lock_live (of->kn, false); +if (!cgrp) +return -ENOENT ; + +/* +* Killing is a process directed operation, i.e. the whole thread-group +* is taken down so act like we do for cgroup.procs and only make this +* writable in non-threaded cgroups. +*/ +if (cgroup_is_threaded (cgrp)) + ret = -EOPNOTSUPP ; +else +cgroup_kill (cgrp); + +cgroup_kn_unlock (of->kn); + +return ret ?: nbytes; +} +static int cgroup_file_open (struct kernfs_open_file *of) {struct cftype *cft =of_cft (of);@@ -4846,6 +4920,11 @@ static struct cftype cgroup_base_files[] = { .seq_show = cgroup_freeze_show, .write = cgroup_freeze_write, }, + { + .name = "cgroup.kill", + .flags = CFTYPE_NOT_ON_ROOT, + .write = cgroup_kill_write, + }, { .name = "cpu.stat", .seq_show = cpu_stat_show,@@ -6077,6 +6156,8 @@ void cgroup_post_fork(struct task_struct *child, struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { + unsigned long cgrp_flags = 0; + bool kill = false; struct cgroup_subsys *ss; struct css_set *cset; int i;@@ -6088,6 +6169,11 @@ void cgroup_post_fork(struct task_struct *child,/* init tasks are special, only link regular threads */ if (likely (child->pid)) { +if (kargs->cgrp) + cgrp_flags = kargs->cgrp->flags; +else + cgrp_flags = cset->dfl_cgrp->flags; +WARN_ON_ONCE (!list_empty (&child->cg_list)); cset->nr_tasks++;css_set_move_task (child,NULL , cset, false);@@ -6096,23 +6182,32 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -/* -* If the cgroup has to be frozen, the new task has too. Let's set -* the JOBCTL_TRAP_FREEZE jobctl bit to get the task into the -* frozen state. -*/ -if (unlikely (cgroup_task_freeze (child))) { -spin_lock (&child->sighand->siglock); -WARN_ON_ONCE (child->frozen); - child->jobctl |=JOBCTL_TRAP_FREEZE ; -spin_unlock (&child->sighand->siglock); +if (!(child->flags &PF_KTHREAD )) { +if (test_bit (CGRP_FREEZE , &cgrp_flags)) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +spin_lock (&child->sighand->siglock); +WARN_ON_ONCE (child->frozen);kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6203
Quoted 10 lines
kernel/cgroup/cgroup.c +10
-0+ child->jobctl |=JOBCTL_TRAP_FREEZE ; +spin_unlock (&child->sighand->siglock); + +/* +* Calling cgroup_update_frozen() isn't required here, +* because it will be called anyway a bit later from +* do_freezer_trap(). So we avoid cgroup's transient +* switch from the frozen state and back. +*/ + }I think this part can be optimized a bit further:
1) we don't need atomictest_bit()here
2) allPF_KTHREAD,CGRP_FREEZEandCGRP_KILLcases are very unlikelySo something like this could work (completely untested):
kernel/cgroup/cgroup.c +0
-0@@ -6190,13 +6190,15 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; }kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6195
Quoted 10 lines
kernel/cgroup/cgroup.c +3
-7-if (!(child->flags &PF_KTHREAD )) { -if (test_bit (CGRP_FREEZE , &cgrp_flags)) { -/* -* If the cgroup has to be frozen, the new task has -* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to -* get the task into the frozen state. -*/ + +if (unlikely (!(child->flags &PF_KTHREAD ) && + cgrp_flags & (CGRP_FREEZE |CGRP_KILL ))) {The unlikely might make sense.
But hm, I'm not a fan of the
CGRP_FREEZEandCGRP_KILLcheck withouttest_bit(). That seems a bit ugly. Especially since nowhere inkernel/cgroup.care these bits checked withouttest_bit().Also, this wouldn't work afaict at least not for all values since
CGRP_FREEZEandCGRP_KILLaren't flags, they're bits defined in an enum. (In contrast tocgroup_root->flagswhich are defined as flags_inanenum_.) So it seems they should really be used withtest_bit. Otherwise this would probably have to be sm likeif (unlikely(!(child->flags &
PF_KTHREAD) &&(cgrp_flags & (BIT_ULL(CGRP_FREEZE) | BIT_ULL(CGRP_KILL))) { . . .
Quoted 5 lines
which seems unreadable and makes the rest of
cgroup.cfor these values inconsistent.
Note that before the check was the same forCGRP_FREEZEit was just hidden in the helper.
I really think we should just leave thetest_bit()checks.
Ok, you're right that it was (hidden) test_bit() here previously, so I can't blame your patch and should blame my original code instead :)
Idk how badly we need to optimize this place and maybe having two checks is a good price for a simpler code. After all, we can optimize it later.
With this said:
Thank you!
Please see below this patch uses the wrong function to send SIGKILL.
Eric
Quoted 137 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +12
-0@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it);
kernel/cgroup/cgroup.c static ssize_t cgroup_freeze_write(struct kernfs_open_file *of, · line 3678
Quoted 10 lines
kernel/cgroup/cgroup.c +10
-0+while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 );
^^^^^^^^
Using send_sig here is wrong. The function send_sig is the interface to send a signal to a single task/thread.
The signal SIGKILL can not be sent to a single task/thread. So it is never makes sense to use send_sig with SIGKILL.
As this all happens in the context of the process writing to the file this can either be:
group_send_sig_info(SIGKILL, SEND_SIG_NOINFO, task, PIDTYPE_TGID);
Which will check that the caller actually has permissions to kill the specified task. Or:
do_send_sig_info(SIGKILL, SEND_SIG_NOINFO, task, PIDTYPE_TGID);
Quoted 136 lines
kernel/cgroup/cgroup.c +87
-14+ } +css_task_iter_end (&it); + +spin_lock_irq (&css_set_lock); +clear_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); +} + +static void cgroup_kill (struct cgroup *cgrp) +{ +struct cgroup_subsys_state *css; +struct cgroup *dsct; + +lockdep_assert_held (&cgroup_mutex); + +cgroup_for_each_live_descendant_pre (dsct, css, cgrp) +__cgroup_kill (dsct); +} + +static ssize_t cgroup_kill_write (struct kernfs_open_file *of,char *buf, +size_t nbytes,loff_t off) +{ +ssize_t ret =0 ; +int kill; +struct cgroup *cgrp; + + ret =kstrtoint (strstrip (buf),0 , &kill); +if (ret) +return ret; + +if (kill !=1 ) +return -ERANGE ; + + cgrp =cgroup_kn_lock_live (of->kn, false); +if (!cgrp) +return -ENOENT ; + +/* +* Killing is a process directed operation, i.e. the whole thread-group +* is taken down so act like we do for cgroup.procs and only make this +* writable in non-threaded cgroups. +*/ +if (cgroup_is_threaded (cgrp)) + ret = -EOPNOTSUPP ; +else +cgroup_kill (cgrp); + +cgroup_kn_unlock (of->kn); + +return ret ?: nbytes; +} +static int cgroup_file_open (struct kernfs_open_file *of) {struct cftype *cft =of_cft (of);@@ -4846,6 +4920,11 @@ static struct cftype cgroup_base_files[] = { .seq_show = cgroup_freeze_show, .write = cgroup_freeze_write, }, + { + .name = "cgroup.kill", + .flags = CFTYPE_NOT_ON_ROOT, + .write = cgroup_kill_write, + }, { .name = "cpu.stat", .seq_show = cpu_stat_show,@@ -6077,6 +6156,8 @@ void cgroup_post_fork(struct task_struct *child, struct kernel_clone_args *kargs) __releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex) { + unsigned long cgrp_flags = 0; + bool kill = false; struct cgroup_subsys *ss; struct css_set *cset; int i;@@ -6088,6 +6169,11 @@ void cgroup_post_fork(struct task_struct *child,/* init tasks are special, only link regular threads */ if (likely (child->pid)) { +if (kargs->cgrp) + cgrp_flags = kargs->cgrp->flags; +else + cgrp_flags = cset->dfl_cgrp->flags; +WARN_ON_ONCE (!list_empty (&child->cg_list)); cset->nr_tasks++;css_set_move_task (child,NULL , cset, false);@@ -6096,23 +6182,32 @@ void cgroup_post_fork(struct task_struct *child, cset =NULL ; } -/* -* If the cgroup has to be frozen, the new task has too. Let's set -* the JOBCTL_TRAP_FREEZE jobctl bit to get the task into the -* frozen state. -*/ -if (unlikely (cgroup_task_freeze (child))) { -spin_lock (&child->sighand->siglock); -WARN_ON_ONCE (child->frozen); - child->jobctl |=JOBCTL_TRAP_FREEZE ; -spin_unlock (&child->sighand->siglock); +if (!(child->flags &PF_KTHREAD )) { +if (test_bit (CGRP_FREEZE , &cgrp_flags)) { +/* +* If the cgroup has to be frozen, the new task has +* too. Let's set the JOBCTL_TRAP_FREEZE jobctl bit to +* get the task into the frozen state. +*/ +spin_lock (&child->sighand->siglock); +WARN_ON_ONCE (child->frozen); + child->jobctl |=JOBCTL_TRAP_FREEZE ; +spin_unlock (&child->sighand->siglock); + +/* +* Calling cgroup_update_frozen() isn't required here, +* because it will be called anyway a bit later from +* do_freezer_trap(). So we avoid cgroup's transient +* switch from the frozen state and back. +*/ + }/* -* Calling cgroup_update_frozen() isn't required here, -* because it will be called anyway a bit later from -* do_freezer_trap(). So we avoid cgroup's transient switch -* from the frozen state and back. +* If the cgroup is to be killed notice it now and take the +* child down right after we finished preparing it for +* userspace. */ + kill =test_bit (CGRP_KILL , &cgrp_flags); }spin_unlock_irq (&css_set_lock);
kernel/cgroup/cgroup.c void cgroup_post_fork(struct task_struct *child, · line 6235
Quoted 6 lines
kernel/cgroup/cgroup.c +3
-0@@ -6135,6 +6230,10 @@ void cgroup_post_fork(struct task_struct *child,put_css_set (rcset); } +/* Cgroup has to be killed so take down child immediately. */ +if (kill) +send_sig (SIGKILL , child,0 );
^^^^^^^^
Using send_sig is wrong here for the same reasons as above.
Is a change to cgroup_post_fork necessary? Fork already has protections against a signal being delivered effectively during fork. Which may be enough in this case.
Quoted 6 lines
kernel/cgroup/cgroup.c +1
-0+cgroup_css_set_put_fork (kargs); }base-commit:
9f4ad9e425a1d3b6a34617b8ea226d56a119a717
A message that is not in the archive (sent off-list or not yet received): m1v97x6niq.fsf-+imSwln9KH6u2/kzUuoCbdi2O/[email protected]
Quoted 165 lines · Eric W. Biederman
Please see below this patch uses the wrong function to send SIGKILL.
Eric
Quoted 137 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container. Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>---
The series can be pulled from
git-OoYKEaZ2EDaWaY/[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/cgroup.kill.v5.14
/* v2 */
- Roman Gushchin <[email protected]>:
- Retrievecgrp->flagsonly once and check CGRP_* bits on it.--- include/linux/cgroup-defs.h | 3 + kernel/cgroup/cgroup.c | 127 ++++++++++++++++++++++++++++++++---- 2 files changed, 116 insertions(+), 14 deletions(-)include/linux/cgroup-defs.h +3
-0@@ -71,6 +71,9 @@ enum {/* Cgroup is frozen. */ CGRP_FROZEN , + +/* Control group has to be killed. */ + CGRP_KILL, };/* cgroup_root->flags */ kernel/cgroup/cgroup.c +12
-0@@ -3654,6 +3654,80 @@ static ssize_t cgroup_freeze_write(struct kernfs_open_file *of,return nbytes; } +static void __cgroup_kill (struct cgroup *cgrp) +{ +struct css_task_iter it; +struct task_struct *task; + +lockdep_assert_held (&cgroup_mutex); + +spin_lock_irq (&css_set_lock); +set_bit (CGRP_KILL , &cgrp->flags); +spin_unlock_irq (&css_set_lock); + +css_task_iter_start (&cgrp->self,CSS_TASK_ITER_PROCS |CSS_TASK_ITER_THREADED , &it);kernel/cgroup/cgroup.c static ssize_t cgroup_freeze_write(struct kernfs_open_file *of, · line 3678
Quoted 10 lines
kernel/cgroup/cgroup.c +10
-0+while ((task =css_task_iter_next (&it))) { +/* Ignore kernel threads here. */ +if (task->flags &PF_KTHREAD ) +continue ; + +/* Skip tasks that are already dying. */ +if (__fatal_signal_pending (task)) +continue ; + +send_sig (SIGKILL , task,0 );^^^^^^^^Using
send_sighere is wrong. The functionsend_sigis the interface to send a signal to a single task/thread.The signal SIGKILL can not be sent to a single task/thread. So it is never makes sense to use
send_sigwith SIGKILL.As this all happens in the context of the process writing to the file this can either be:
Quoted 6 lines
group_send_sig_info(SIGKILL, SEND_SIG_NOINFO, task, PIDTYPE_TGID);Which will check that the caller actually has permissions to kill the specified task. Or:
do_send_sig_info(SIGKILL, SEND_SIG_NOINFO, task, PIDTYPE_TGID);
The result should be the same but yes it's better to be explicit about that. I'll switch to that.
+Michal Hocko
Quoted 40 lines · Christian Brauner
From: Christian Brauner <christian.brauner-GeWIH/[email protected]>
Introduce the cgroup.kill file. It does what it says on the tin and allows a caller to kill a cgroup by writing "1" into cgroup.kill. The file is available in non-root cgroups.
Killing cgroups is a process directed operation, i.e. the whole thread-group is affected. Consequently trying to write to cgroup.kill in threaded cgroups will be rejected and EOPNOTSUPP returned. This behavior aligns with cgroup.procs where reads in threaded-cgroups are rejected with EOPNOTSUPP.
The cgroup.kill file is write-only since killing a cgroup is an event not which makes it different from e.g. freezer where a cgroup transitions between the two states.
As with all new cgroup features cgroup.kill is recursive by default.
Killing a cgroup is protected against concurrent migrations through the cgroup mutex. To protect against forkbombs and to mitigate the effect of racing forks a new
CGRP_KILLcss set lock protected flag is introduced that is set prior to killing a cgroup and unset after the cgroup has been killed. We can then check incgroup_post_fork()where we hold the css set lock already whether the cgroup is currently being killed. If so we send the child a SIGKILL signal immediately taking it down as soon as it returns to userspace. To make the killing of the child semantically clean it is killed after all cgroup attachment operations have been finalized.There are various use-cases of this interface:
- Containers usually have a conservative layout where each container usually has a delegated cgroup. For such layouts there is a 1:1 mapping between container and cgroup. If the container in addition uses a separate pid namespace then killing a container usually becomes a simple kill -9 <container-init-pid> from an ancestor pid namespace. However, there are quite a few scenarios where that isn't true. For example, there are containers that share the cgroup with other processes on purpose that are supposed to be bound to the lifetime of the container but are not in the same pidns of the container.
Quoted 8 lines
Containers that are in a delegated cgroup but share the pid namespace with the host or other containers.
- Service managers such as systemd use cgroups to group and organize processes belonging to a service. They usually rely on a recursive algorithm now to kill a service. With cgroup.kill this becomes a simple write to cgroup.kill.
- Userspace OOM implementations can make good use of this feature to efficiently take down whole cgroups quickly.
Just to further add the motivation for userspace oom-killers. Instead of traversing the tree, opening cgroup.procs and manually killing the processes under memory pressure, the userspace oom-killer can just keep the list of cgroup.kill files open and just write '1' when it decides to trigger the oom-kill.
Michal, what do you think of putting the processes killed through this interface into the oom_reaper_list as well? Will there be any concerns?
Quoted 42 lines
- The kill program can gain a new
kill --cgroup/sys/fs/cgroup/delegated
flag to take down cgroups.A few observations about the semantics:
- If parent and child are in the same cgroup andCLONE_INTO_CGROUPis not specified we are not taking cgroup mutex meaning the cgroup can be killed while a process in that cgroup is forking.
If the kill request happens right beforecgroup_can_fork()and before the parent grabs its siglock the parent is guaranteed to see the pending SIGKILL. In addition we perform another check incgroup_post_fork()whether the cgroup is being killed and is so take down the child (see above). This is robust enough and protects gainst forkbombs. If userspace really really wants to have stricter protection the simple solution would be to grab the write side of the cgroup threadgroup rwsem which will force all ongoing forks to complete before killing starts. We concluded that this is not necessary as the semantics for concurrent forking should simply align with freezer where a similar check ascgroup_post_fork()is performed.For all other cases
CLONE_INTO_CGROUPis required. In this case we will grab the cgroup mutex so the cgroup can't be killed while we fork. Once we're done with the fork and have dropped cgroup mutex we are visible and will be found by any subsequent kill request.
- We obviously don't kill kthreads. This means a cgroup that has a kthread will not become empty after killing and consequently no unpopulated event will be generated. The assumption is that kthreads should be in the root cgroup only anyway so this is not an issue.
- We skip killing tasks that already have pending fatal signals.
- Freezer doesn't care about tasks in different pid namespaces, i.e. if you have two tasks in different pid namespaces the cgroup would still be frozen. The cgroup.kill mechanism consequently behaves the same way, i.e. we kill all processes and ignore in which pid namespace they exist.
- If the caller is located in a cgroup that is killed the caller will obviously be killed as well.Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Tejun Heo <[email protected]>
[...]