[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111004013245.GB7361@shutemov.name>
Date: Tue, 4 Oct 2011 04:32:45 +0300
From: "Kirill A. Shutemov" <kirill@...temov.name>
To: Frederic Weisbecker <fweisbec@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
Paul Menage <paul@...lmenage.org>,
Li Zefan <lizf@...fujitsu.com>,
Johannes Weiner <hannes@...xchg.org>,
Aditya Kali <adityakali@...gle.com>,
Oleg Nesterov <oleg@...hat.com>,
Kay Sievers <kay.sievers@...y.org>,
Tim Hockin <thockin@...kin.org>, Tejun Heo <tj@...nel.org>,
Containers <containers@...ts.linux-foundation.org>
Subject: Re: [PATCH 08/10] cgroups: Pull up res counter charge failure
interpretation to caller
On Mon, Oct 03, 2011 at 09:07:10PM +0200, Frederic Weisbecker wrote:
> res_counter_charge() always returns -ENOMEM when the limit is reached
> and the charge thus can't happen.
>
> However it's up to the caller to interpret this failure and return
> the appropriate error value. The task counter subsystem will need
> to report the user that a fork() has been cancelled because of some
> limit reached, not because we are too short on memory.
>
> Fix this by returning -1 when res_counter_charge() fails.
>
> Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
Acked-by: Kirill A. Shutemov <kirill@...temov.name>
> Cc: Paul Menage <paul@...lmenage.org>
> Cc: Li Zefan <lizf@...fujitsu.com>
> Cc: Johannes Weiner <hannes@...xchg.org>
> Cc: Aditya Kali <adityakali@...gle.com>
> Cc: Oleg Nesterov <oleg@...hat.com>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Kay Sievers <kay.sievers@...y.org>
> Cc: Tim Hockin <thockin@...kin.org>
> Cc: Tejun Heo <tj@...nel.org>
> Cc: Kirill A. Shutemov <kirill@...temov.name>
> Cc: Containers <containers@...ts.linux-foundation.org>
> ---
> Documentation/cgroups/resource_counter.txt | 2 ++
> kernel/res_counter.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/cgroups/resource_counter.txt b/Documentation/cgroups/resource_counter.txt
> index a2cd05b..24ec61c 100644
> --- a/Documentation/cgroups/resource_counter.txt
> +++ b/Documentation/cgroups/resource_counter.txt
> @@ -76,6 +76,8 @@ to work with it.
> limit_fail_at parameter is set to the particular res_counter element
> where the charging failed.
>
> + It returns 0 on success and -1 on failure.
> +
> d. int res_counter_charge_locked
> (struct res_counter *rc, unsigned long val)
>
> diff --git a/kernel/res_counter.c b/kernel/res_counter.c
> index 6b36823..b814d6c 100644
> --- a/kernel/res_counter.c
> +++ b/kernel/res_counter.c
> @@ -26,7 +26,7 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val)
> {
> if (counter->usage + val > counter->limit) {
> counter->failcnt++;
> - return -ENOMEM;
> + return -1;
> }
>
> counter->usage += val;
> --
> 1.7.5.4
>
--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists