linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Frederic Weisbecker <fweisbec@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Tejun Heo <tj@kernel.org>, Li Zefan <lizf@cn.fujitsu.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Aditya Kali <adityakali@google.com>,
	Oleg Nesterov <oleg@redhat.com>, Tim Hockin <thockin@hockin.org>,
	Tejun Heo <htejun@gmail.com>,
	Containers <containers@lists.linux-foundation.org>,
	Glauber Costa <glommer@gmail.com>,
	Cgroups <cgroups@vger.kernel.org>,
	Daniel J Walsh <dwalsh@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Max Kellermann <mk@cm4all.com>,
	Mandeep Singh Baines <msb@chromium.org>,
	"Kirill A. Shutemov" <kirill@shutemov.name>
Subject: [PATCH 01/10] cgroups: add res_counter_write_u64() API
Date: Wed,  1 Feb 2012 04:37:41 +0100	[thread overview]
Message-ID: <1328067470-5980-2-git-send-email-fweisbec@gmail.com> (raw)
In-Reply-To: <1328067470-5980-1-git-send-email-fweisbec@gmail.com>

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 <fweisbec@gmail.com>
Acked-by: Paul Menage <paul@paulmenage.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Aditya Kali <adityakali@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tim Hockin <thockin@hockin.org>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Containers <containers@lists.linux-foundation.org>
Cc: Glauber Costa <glommer@gmail.com>
Cc: Cgroups <cgroups@vger.kernel.org>
Cc: Daniel J Walsh <dwalsh@redhat.com>
Cc: "Daniel P. Berrange" <berrange@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Max Kellermann <mk@cm4all.com>
Cc: Mandeep Singh Baines <msb@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 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


  reply	other threads:[~2012-02-01  3:38 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-01  3:37 [PATCH 00/10] cgroups: Task counter subsystem v8 Frederic Weisbecker
2012-02-01  3:37 ` Frederic Weisbecker [this message]
2012-02-02 12:33   ` [PATCH 01/10] cgroups: add res_counter_write_u64() API Kirill A. Shutemov
2012-02-02 13:56     ` Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 02/10] cgroups: new resource counter inheritance API Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 03/10] cgroups: ability to stop res charge propagation on bounded ancestor Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 04/10] cgroups: add res counter common ancestor searching Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 05/10] res_counter: allow charge failure pointer to be null Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 06/10] cgroups: pull up res counter charge failure interpretation to caller Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 07/10] cgroups: allow subsystems to cancel a fork Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 08/10] cgroups: Add a task counter subsystem Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 09/10] selftests: Enter each directories before executing selftests Frederic Weisbecker
2012-02-01  3:37 ` [PATCH 10/10] selftests: Add a new task counter selftest Frederic Weisbecker
2012-02-01 16:31 ` [PATCH 00/10] cgroups: Task counter subsystem v8 Tejun Heo
2012-02-01 18:50   ` Frederic Weisbecker
2012-02-01 19:51     ` Andrew Morton
2012-02-02 14:50       ` Frederic Weisbecker
2012-02-16 15:31         ` Frederic Weisbecker
2012-03-01 22:53         ` Daniel Lezcano
2012-03-05  3:21           ` Frederic Weisbecker
2012-03-05 16:26             ` Tejun Heo
2012-03-05 16:27               ` Tejun Heo
2012-03-05 16:48                 ` Frederic Weisbecker
2012-03-05 16:44       ` Rik van Riel
2013-04-01 18:43 ` Tim Hockin
2013-04-01 18:46   ` Tejun Heo
2013-04-01 20:09     ` Tim Hockin
2013-04-01 20:29       ` Tejun Heo
2013-04-01 21:02         ` Tim Hockin
2013-04-01 22:03           ` Tejun Heo
2013-04-01 22:20             ` Tim Hockin
2013-04-01 22:35               ` Tejun Heo
2013-04-01 22:57                 ` Tim Hockin
2013-04-01 23:18                   ` Tejun Heo
2013-04-02  0:07                     ` Tim Hockin
  -- strict thread matches above, loose matches on Subject: below --
2011-10-03 19:07 [PATCH 00/10] cgroups: Task counter subsystem v6 Frederic Weisbecker
2011-10-03 19:07 ` [PATCH 01/10] cgroups: Add res_counter_write_u64() API Frederic Weisbecker
2011-10-04  0:17   ` Kirill A. Shutemov
2011-10-11 13:44     ` Frederic Weisbecker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328067470-5980-2-git-send-email-fweisbec@gmail.com \
    --to=fweisbec@gmail.com \
    --cc=adityakali@google.com \
    --cc=akpm@linux-foundation.org \
    --cc=berrange@redhat.com \
    --cc=cgroups@vger.kernel.org \
    --cc=containers@lists.linux-foundation.org \
    --cc=dwalsh@redhat.com \
    --cc=glommer@gmail.com \
    --cc=hannes@cmpxchg.org \
    --cc=htejun@gmail.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=kirill@shutemov.name \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizf@cn.fujitsu.com \
    --cc=mk@cm4all.com \
    --cc=msb@chromium.org \
    --cc=oleg@redhat.com \
    --cc=thockin@hockin.org \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).