History

cgroup: Use separate src/dst nodes when preloading css_sets for migration

Each cset (css_set) is pinned by its tasks. When we're moving tasks around across csets for a migration, we need to hold the source and destination csets to ensure that they don't go away while we're moving tasks about. This is done by linking cset->mg_preload_node on either the mgctx->preloaded_src_csets or mgctx->preloaded_dst_csets list. Using the same cset->mg_preload_node for both the src and dst lists was deemed okay as a cset can't be both the source and destination at the same time. Unfortunately, this overloading becomes problematic when multiple tasks are involved in a migration and some of them are identity noop migrations while others are actually moving across cgroups. For example, this can happen with the following sequence on cgroup1: #1> mkdir -p /sys/fs/cgroup/misc/a/b #2> echo $$ > /sys/fs/cgroup/misc/a/cgroup.procs #3> RUN_A_COMMAND_WHICH_CREATES_MULTIPLE_THREADS & #4> PID=$! #5> echo $PID > /sys/fs/cgroup/misc/a/b/tasks #6> echo $PID > /sys/fs/cgroup/misc/a/cgroup.procs the process including the group leader back into a. In this final migration, non-leader threads would be doing identity migration while the group leader is doing an actual one. After #3, let's say the whole process was in cset A, and that after #4, the leader moves to cset B. Then, during #6, the following happens: 1. cgroup_migrate_add_src() is called on B for the leader. 2. cgroup_migrate_add_src() is called on A for the other threads. 3. cgroup_migrate_prepare_dst() is called. It scans the src list. 4. It notices that B wants to migrate to A, so it tries to A to the dst list but realizes that its ->mg_preload_node is already busy. 5. and then it notices A wants to migrate to A as it's an identity migration, it culls it by list_del_init()'ing its ->mg_preload_node and putting references accordingly. 6. The rest of migration takes place with B on the src list but nothing on the dst list. This means that A isn't held while migration is in progress. If all tasks leave A before the migration finishes and the incoming task pins it, the cset will be destroyed leading to use-after-free. This is caused by overloading cset->mg_preload_node for both src and dst preload lists. We wanted to exclude the cset from the src list but ended up inadvertently excluding it from the dst list too. This patch fixes the issue by separating out cset->mg_preload_node into ->mg_src_preload_node and ->mg_dst_preload_node, so that the src and dst preloadings don't interfere with each other.

Tejun Heo committed 4 years ago

Commit 07fd5b61 parent 48a23ec2 files · +25 −15Browse files

Unified · Split

2 files
  1. include/linux/cgroup-defs.h +2 −1
  2. kernel/cgroup/cgroup.c +23 −14
include/linux/cgroup-defs.h+2−1
@@ -264,7 +264,8 @@ struct css_set { · 263 unmodified lines
264264 * List of csets participating in the on-going migration either as
265265 * source or destination. Protected by cgroup_mutex.
266266 */
267− struct list_head mg_preload_node;
267+ struct list_head mg_src_preload_node;
268+ struct list_head mg_dst_preload_node;
268269 struct list_head mg_node;
269270
270271 /*
kernel/cgroup/cgroup.c+23−14
@@ -765,7 +765,8 @@ struct css_set init_css_set = { · 764 unmodified lines
765765 .task_iters = LIST_HEAD_INIT(init_css_set.task_iters),
766766 .threaded_csets = LIST_HEAD_INIT(init_css_set.threaded_csets),
767767 .cgrp_links = LIST_HEAD_INIT(init_css_set.cgrp_links),
768− .mg_preload_node = LIST_HEAD_INIT(init_css_set.mg_preload_node),
768+ .mg_src_preload_node = LIST_HEAD_INIT(init_css_set.mg_src_preload_node),
769+ .mg_dst_preload_node = LIST_HEAD_INIT(init_css_set.mg_dst_preload_node),
769770 .mg_node = LIST_HEAD_INIT(init_css_set.mg_node),
770771
771772 /*
@@ -1240,7 +1241,8 @@ static struct css_set *find_css_set(struct css_set *old_cset, · 468 unmodified lines
12401241 INIT_LIST_HEAD(&cset->threaded_csets);
12411242 INIT_HLIST_NODE(&cset->hlist);
12421243 INIT_LIST_HEAD(&cset->cgrp_links);
1243− INIT_LIST_HEAD(&cset->mg_preload_node);
1244+ INIT_LIST_HEAD(&cset->mg_src_preload_node);
1245+ INIT_LIST_HEAD(&cset->mg_dst_preload_node);
12441246 INIT_LIST_HEAD(&cset->mg_node);
12451247
12461248 /* Copy the set of subsystem state objects generated in
@@ -2597,21 +2599,27 @@ int cgroup_migrate_vet_dst(struct cgroup *dst_cgrp) · 1350 unmodified lines
25972599 */
25982600 void cgroup_migrate_finish(struct cgroup_mgctx *mgctx)
25992601 {
2600− LIST_HEAD(preloaded);
26012602 struct css_set *cset, *tmp_cset;
26022603
26032604 lockdep_assert_held(&cgroup_mutex);
26042605
26052606 spin_lock_irq(&css_set_lock);
26062607
2607− list_splice_tail_init(&mgctx->preloaded_src_csets, &preloaded);
2608− list_splice_tail_init(&mgctx->preloaded_dst_csets, &preloaded);
2608+ list_for_each_entry_safe(cset, tmp_cset, &mgctx->preloaded_src_csets,
2609+ mg_src_preload_node) {
2610+ cset->mg_src_cgrp = NULL;
2611+ cset->mg_dst_cgrp = NULL;
2612+ cset->mg_dst_cset = NULL;
2613+ list_del_init(&cset->mg_src_preload_node);
2614+ put_css_set_locked(cset);
2615+ }
26092616
2610− list_for_each_entry_safe(cset, tmp_cset, &preloaded, mg_preload_node) {
2617+ list_for_each_entry_safe(cset, tmp_cset, &mgctx->preloaded_dst_csets,
2618+ mg_dst_preload_node) {
26112619 cset->mg_src_cgrp = NULL;
26122620 cset->mg_dst_cgrp = NULL;
26132621 cset->mg_dst_cset = NULL;
2614− list_del_init(&cset->mg_preload_node);
2622+ list_del_init(&cset->mg_dst_preload_node);
26152623 put_css_set_locked(cset);
26162624 }
26172625
@@ -2651,7 +2659,7 @@ void cgroup_migrate_add_src(struct css_set *src_cset, · 33 unmodified lines
26512659 if (src_cset->dead)
26522660 return;
26532661
2654− if (!list_empty(&src_cset->mg_preload_node))
2662+ if (!list_empty(&src_cset->mg_src_preload_node))
26552663 return;
26562664
26572665 src_cgrp = cset_cgroup_from_root(src_cset, dst_cgrp->root);
@@ -2664,7 +2672,7 @@ void cgroup_migrate_add_src(struct css_set *src_cset, · 6 unmodified lines
26642672 src_cset->mg_src_cgrp = src_cgrp;
26652673 src_cset->mg_dst_cgrp = dst_cgrp;
26662674 get_css_set(src_cset);
2667− list_add_tail(&src_cset->mg_preload_node, &mgctx->preloaded_src_csets);
2675+ list_add_tail(&src_cset->mg_src_preload_node, &mgctx->preloaded_src_csets);
26682676 }
26692677
26702678 /**
@@ -2689,7 +2697,7 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx) · 18 unmodified lines
26892697
26902698 /* look up the dst cset for each src cset and link it to src */
26912699 list_for_each_entry_safe(src_cset, tmp_cset, &mgctx->preloaded_src_csets,
2692− mg_preload_node) {
2700+ mg_src_preload_node) {
26932701 struct css_set *dst_cset;
26942702 struct cgroup_subsys *ss;
26952703 int ssid;
@@ -2708,7 +2716,7 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx) · 12 unmodified lines
27082716 if (src_cset == dst_cset) {
27092717 src_cset->mg_src_cgrp = NULL;
27102718 src_cset->mg_dst_cgrp = NULL;
2711− list_del_init(&src_cset->mg_preload_node);
2719+ list_del_init(&src_cset->mg_src_preload_node);
27122720 put_css_set(src_cset);
27132721 put_css_set(dst_cset);
27142722 continue;
@@ -2716,8 +2724,8 @@ int cgroup_migrate_prepare_dst(struct cgroup_mgctx *mgctx) · 1 unmodified line
27162724
27172725 src_cset->mg_dst_cset = dst_cset;
27182726
2719− if (list_empty(&dst_cset->mg_preload_node))
2720− list_add_tail(&dst_cset->mg_preload_node,
2727+ if (list_empty(&dst_cset->mg_dst_preload_node))
2728+ list_add_tail(&dst_cset->mg_dst_preload_node,
27212729 &mgctx->preloaded_dst_csets);
27222730 else
27232731 put_css_set(dst_cset);
@@ -2963,7 +2971,8 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) · 239 unmodified lines
29632971 goto out_finish;
29642972
29652973 spin_lock_irq(&css_set_lock);
2966− list_for_each_entry(src_cset, &mgctx.preloaded_src_csets, mg_preload_node) {
2974+ list_for_each_entry(src_cset, &mgctx.preloaded_src_csets,
2975+ mg_src_preload_node) {
29672976 struct task_struct *task, *ntask;
29682977
29692978 /* all tasks in src_csets need to be migrated */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t