diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 12:34:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 12:34:26 -0400 |
| commit | 80958c28d85f0ee5981d4a4a15cc7f4927ef5da8 (patch) | |
| tree | b0de25a375ee80087acead6cb791671b50a4eb47 | |
| parent | 1255aed5a913b44566888bbe63dd57c96327a89b (diff) | |
| download | longterm-queue-4.18-80958c28d85f0ee5981d4a4a15cc7f4927ef5da8.tar.gz | |
cgroup: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch b/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch index 9145c69..153dd45 100644 --- a/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch +++ b/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch @@ -1,4 +1,4 @@ -From 4dcabece4c3a9f9522127be12cc12cc120399b2f Mon Sep 17 00:00:00 2001 +From 59e7564cfc91a1afe6220559bb230d4b043c1ceb Mon Sep 17 00:00:00 2001 From: Roman Gushchin <guro@fb.com> Date: Fri, 19 Apr 2019 10:03:03 -0700 Subject: [PATCH] cgroup: protect cgroup->nr_(dying_)descendants by @@ -26,10 +26,10 @@ Signed-off-by: Tejun Heo <tj@kernel.org> Cc: kernel-team@fb.com diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h -index 1c70803e9f77..7d57890cec67 100644 +index c2ef1c58624a..4b486a6fe952 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h -@@ -349,6 +349,11 @@ struct cgroup { +@@ -346,6 +346,11 @@ struct cgroup { * Dying cgroups are cgroups which were deleted by a user, * but are still existing because someone else is holding a reference. * max_descendants is a maximum allowed number of descent cgroups. @@ -42,10 +42,10 @@ index 1c70803e9f77..7d57890cec67 100644 int nr_descendants; int nr_dying_descendants; diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 3008ea684aa0..786ceef2f222 100644 +index 7deb7a26aa76..97ca037a60a7 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -4811,9 +4811,11 @@ static void css_release_work_fn(struct work_struct *work) +@@ -4654,9 +4654,11 @@ static void css_release_work_fn(struct work_struct *work) if (cgroup_on_dfl(cgrp)) cgroup_rstat_flush(cgrp); @@ -57,9 +57,9 @@ index 3008ea684aa0..786ceef2f222 100644 cgroup_idr_remove(&cgrp->root->cgroup_idr, cgrp->id); cgrp->id = -1; -@@ -5031,12 +5033,14 @@ static struct cgroup *cgroup_create(struct cgroup *parent) +@@ -4869,12 +4871,14 @@ static struct cgroup *cgroup_create(struct cgroup *parent) if (ret) - goto out_psi_free; + goto out_idr_free; + spin_lock_irq(&css_set_lock); for (tcgrp = cgrp; tcgrp; tcgrp = cgroup_parent(tcgrp)) { @@ -72,7 +72,7 @@ index 3008ea684aa0..786ceef2f222 100644 if (notify_on_release(parent)) set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags); -@@ -5321,10 +5325,12 @@ static int cgroup_destroy_locked(struct cgroup *cgrp) +@@ -5157,10 +5161,12 @@ static int cgroup_destroy_locked(struct cgroup *cgrp) if (parent && cgroup_is_threaded(cgrp)) parent->nr_threaded_children--; |