From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frederic Weisbecker Subject: [PATCH 01/10] cgroups: add res_counter_write_u64() API Date: Wed, 1 Feb 2012 04:37:41 +0100 Message-ID: <1328067470-5980-2-git-send-email-fweisbec@gmail.com> References: <1328067470-5980-1-git-send-email-fweisbec@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=rnKdXJ8PqJnNjHSXtzit8RR25N3CIAXA48lfHShyzrE=; b=OoiMXnFooZSu05yxua5qbpjAxcGx+v/Eyx0VKfIFENrivpaK5PQsqQHdeS9fcDAQ8S xetliDCfRwowivsTDs1Gk1+i7vh7j1nYwyroYSpB/76dRnX03Ip/3WeSjCTwmLpFAPoH 5i32+T4aTkgjIY2n6DlqlIVdi9++OQbI1AtOE= In-Reply-To: <1328067470-5980-1-git-send-email-fweisbec-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Andrew Morton , Tejun Heo , Li Zefan Cc: Aditya Kali , Glauber Costa , Tejun Heo , "Daniel P. Berrange" , Max Kellermann , Tim Hockin , Frederic Weisbecker , Containers , Daniel J Walsh , Oleg Nesterov , LKML , Johannes Weiner , Cgroups , Mandeep Singh Baines Extend the resource counter API with a mirror of res_counter_read_u64() to make it handy to update a resource counter value from a cgroup subsystem u64 value file. [kirill-oKw7cIdHH8eLwutG50LtGA@public.gmane.org: Separate 32 bits and 64 bits versions] Signed-off-by: Frederic Weisbecker Acked-by: Paul Menage Cc: Li Zefan Cc: Johannes Weiner Cc: Aditya Kali Cc: Oleg Nesterov Cc: Tim Hockin Cc: Tejun Heo Cc: Containers Cc: Glauber Costa Cc: Cgroups Cc: Daniel J Walsh Cc: "Daniel P. Berrange" Cc: KAMEZAWA Hiroyuki Cc: Max Kellermann Cc: Mandeep Singh Baines Signed-off-by: Andrew Morton Signed-off-by: Kirill A. Shutemov --- include/linux/res_counter.h | 2 ++ kernel/res_counter.c | 31 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index c9d625c..1b3fe05 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -82,6 +82,8 @@ int res_counter_memparse_write_strategy(const char *buf, int res_counter_write(struct res_counter *counter, int member, const char *buffer, write_strategy_fn write_strategy); +void res_counter_write_u64(struct res_counter *counter, int member, u64 val); + /* * the field descriptors. one for each member of res_counter */ diff --git a/kernel/res_counter.c b/kernel/res_counter.c index 6d269cc..c46465c 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -167,12 +167,32 @@ int res_counter_memparse_write_strategy(const char *buf, return 0; } +#if BITS_PER_LONG == 32 +void res_counter_write_u64(struct res_counter *counter, int member, u64 val) +{ + unsigned long long *target; + unsigned long flags; + + spin_lock_irqsave(&counter->lock, flags); + target = res_counter_member(counter, member); + *target = val; + spin_unlock_irqrestore(&counter->lock, flags); +} +#else +void res_counter_write_u64(struct res_counter *counter, int member, u64 val) +{ + unsigned long long *target; + + target = res_counter_member(counter, member); + *target = val; +} +#endif + int res_counter_write(struct res_counter *counter, int member, const char *buf, write_strategy_fn write_strategy) { char *end; - unsigned long flags; - unsigned long long tmp, *val; + unsigned long long tmp; if (write_strategy) { if (write_strategy(buf, &tmp)) @@ -182,9 +202,8 @@ int res_counter_write(struct res_counter *counter, int member, if (*end != '\0') return -EINVAL; } - spin_lock_irqsave(&counter->lock, flags); - val = res_counter_member(counter, member); - *val = tmp; - spin_unlock_irqrestore(&counter->lock, flags); + + res_counter_write_u64(counter, member, tmp); + return 0; } -- 1.7.5.4