The memcg code does not allow changing memory.use_hierarchy if the
parent cgroup has enabled use_hierarchy. Update documentation to match
the code.
Signed-off-by: Greg Thelen <[email protected]>
---
Documentation/cgroups/memory.txt | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 7781857..b6ed61c 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -485,8 +485,9 @@ The feature can be disabled by
# echo 0 > memory.use_hierarchy
-NOTE1: Enabling/disabling will fail if the cgroup already has other
- cgroups created below it.
+NOTE1: Enabling/disabling will fail if either the cgroup already has other
+ cgroups created below it, or if the parent cgroup has use_hierarchy
+ enabled.
NOTE2: When panic_on_oom is set to "2", the whole system will panic in
case of an OOM event in any cgroup.
--
1.7.3.1
On Wed, 16 Feb 2011 17:51:23 -0800
Greg Thelen <[email protected]> wrote:
> The memcg code does not allow changing memory.use_hierarchy if the
> parent cgroup has enabled use_hierarchy. Update documentation to match
> the code.
>
> Signed-off-by: Greg Thelen <[email protected]>
Thank you,
Acked-by: KAMEZAWA Hiroyuki <[email protected]>
Because I tend to read linux-mm list 1st, I'm glad if you CC linux-mm in
the next time.
> ---
> Documentation/cgroups/memory.txt | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
> index 7781857..b6ed61c 100644
> --- a/Documentation/cgroups/memory.txt
> +++ b/Documentation/cgroups/memory.txt
> @@ -485,8 +485,9 @@ The feature can be disabled by
>
> # echo 0 > memory.use_hierarchy
>
> -NOTE1: Enabling/disabling will fail if the cgroup already has other
> - cgroups created below it.
> +NOTE1: Enabling/disabling will fail if either the cgroup already has other
> + cgroups created below it, or if the parent cgroup has use_hierarchy
> + enabled.
>
> NOTE2: When panic_on_oom is set to "2", the whole system will panic in
> case of an OOM event in any cgroup.
> --
> 1.7.3.1
>
>
(cc correct linux-mm address)
The memcg code does not allow changing memory.use_hierarchy if the
parent cgroup has enabled use_hierarchy. Update documentation to match
the code.
Signed-off-by: Greg Thelen <[email protected]>
---
Documentation/cgroups/memory.txt | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 7781857..b6ed61c 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -485,8 +485,9 @@ The feature can be disabled by
# echo 0 > memory.use_hierarchy
-NOTE1: Enabling/disabling will fail if the cgroup already has other
- cgroups created below it.
+NOTE1: Enabling/disabling will fail if either the cgroup already has other
+ cgroups created below it, or if the parent cgroup has use_hierarchy
+ enabled.
NOTE2: When panic_on_oom is set to "2", the whole system will panic in
case of an OOM event in any cgroup.
On Thu, 17 Feb 2011, KAMEZAWA Hiroyuki wrote:
> On Wed, 16 Feb 2011 17:51:23 -0800
> Greg Thelen <[email protected]> wrote:
>
> > The memcg code does not allow changing memory.use_hierarchy if the
> > parent cgroup has enabled use_hierarchy. Update documentation to match
> > the code.
> >
> > Signed-off-by: Greg Thelen <[email protected]>
>
> Thank you,
> Acked-by: KAMEZAWA Hiroyuki <[email protected]>
Applied, thanks.
>
> Because I tend to read linux-mm list 1st, I'm glad if you CC linux-mm in
> the next time.
>
> > ---
> > Documentation/cgroups/memory.txt | 5 +++--
> > 1 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
> > index 7781857..b6ed61c 100644
> > --- a/Documentation/cgroups/memory.txt
> > +++ b/Documentation/cgroups/memory.txt
> > @@ -485,8 +485,9 @@ The feature can be disabled by
> >
> > # echo 0 > memory.use_hierarchy
> >
> > -NOTE1: Enabling/disabling will fail if the cgroup already has other
> > - cgroups created below it.
> > +NOTE1: Enabling/disabling will fail if either the cgroup already has other
> > + cgroups created below it, or if the parent cgroup has use_hierarchy
> > + enabled.
> >
> > NOTE2: When panic_on_oom is set to "2", the whole system will panic in
> > case of an OOM event in any cgroup.
> > --
> > 1.7.3.1
> >
> >
>
--
Jiri Kosina
SUSE Labs, Novell Inc.