From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755810Ab2BADiG (ORCPT ); Tue, 31 Jan 2012 22:38:06 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:60762 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531Ab2BADiC (ORCPT ); Tue, 31 Jan 2012 22:38:02 -0500 From: Frederic Weisbecker To: Andrew Morton , Tejun Heo , Li Zefan Cc: LKML , Frederic Weisbecker , Johannes Weiner , Aditya Kali , Oleg Nesterov , Tim Hockin , Tejun Heo , Containers , Glauber Costa , Cgroups , Daniel J Walsh , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Max Kellermann , Mandeep Singh Baines , "Kirill A. Shutemov" 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> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1328067470-5980-1-git-send-email-fweisbec@gmail.com> References: <1328067470-5980-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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@shutemov.name: 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