OpenVZ Forum: Devel » [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg.

Home » Mailing lists » Devel » [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg.

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH v2 03/11] memcg: change defines to an enum [message #47391 is a reply to message #47389]

Thu, 09 August 2012 13:01

Glauber Costa
Messages: 916
Registered: October 2011

Senior Member

This is just a cleanup patch for clarity of expression. In earlier
submissions, people asked it to be in a separate patch, so here it is.

[ v2: use named enum as type throughout the file as well ]

Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: Michal Hocko <mhocko@suse.cz>
CC: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
mm/memcontrol.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2cef99a..b0e29f4 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -393,9 +393,12 @@ enum charge_type {
};

/* for encoding cft->private value on file */
-#define _MEM (0)
-#define _MEMSWAP (1)
-#define _OOM_TYPE (2)
+enum res_type {
+ _MEM,
+ _MEMSWAP,
+ _OOM_TYPE,
+};
+
#define MEMFILE_PRIVATE(x, val) ((x) << 16 | (val))
#define MEMFILE_TYPE(val) ((val) >> 16 & 0xffff)
#define MEMFILE_ATTR(val) ((val) & 0xffff)
@@ -3983,7 +3986,8 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft,
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
char str[64];
u64 val;
- int type, name, len;
+ int name, len;
+ enum res_type type;

type = MEMFILE_TYPE(cft->private);
name = MEMFILE_ATTR(cft->private);
@@ -4019,7 +4023,8 @@ static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
const char *buffer)
{
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
- int type, name;
+ enum res_type type;
+ int name;
unsigned long long val;
int ret;

@@ -4095,7 +4100,8 @@ out:
static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
{
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
- int type, name;
+ int name;
+ enum res_type type;

type = MEMFILE_TYPE(event);
name = MEMFILE_ATTR(event);
@@ -4423,7 +4429,7 @@ static int mem_cgroup_usage_register_event(struct cgroup *cgrp,
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
struct mem_cgroup_thresholds *thresholds;
struct mem_cgroup_threshold_ary *new;
- int type = MEMFILE_TYPE(cft->private);
+ enum res_type type = MEMFILE_TYPE(cft->private);
u64 threshold, usage;
int i, size, ret;

@@ -4506,7 +4512,7 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
struct mem_cgroup_thresholds *thresholds;
struct mem_cgroup_threshold_ary *new;
- int type = MEMFILE_TYPE(cft->private);
+ enum res_type type = MEMFILE_TYPE(cft->private);
u64 usage;
int i, j, size;

@@ -4584,7 +4590,7 @@ static int mem_cgroup_oom_register_event(struct cgroup *cgrp,
{
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
struct mem_cgroup_eventfd_list *event;
- int type = MEMFILE_TYPE(cft->private);
+ enum res_type type = MEMFILE_TYPE(cft->private);

BUG_ON(type != _OOM_TYPE);
event = kmalloc(sizeof(*event), GFP_KERNEL);
@@ -4609,7 +4615,7 @@ static void mem_cgroup_oom_unregister_event(struct cgroup *cgrp,
{
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
struct mem_cgroup_eventfd_list *ev, *tmp;
- int type = MEMFILE_TYPE(cft->private);
+ enum res_type type = MEMFILE_TYPE(cft->private);

BUG_ON(type != _OOM_TYPE);

--
1.7.11.2

Report message to a moderator

[Message index]

		[PATCH v2 00/11] Request for Inclusion: kmem controller for memcg. By: Glauber Costa on Thu, 09 August 2012 13:01
		[PATCH v2 01/11] memcg: Make it possible to use the stock for more than one page. By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 01/11] memcg: Make it possible to use the stock for more than one page. By: Michal Hocko on Fri, 10 August 2012 15:12
		[PATCH v2 03/11] memcg: change defines to an enum By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 03/11] memcg: change defines to an enum By: Michal Hocko on Fri, 10 August 2012 15:43
		[PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:02
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Mon, 13 August 2012 08:36
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: KAMEZAWA Hiroyuki on Fri, 17 August 2012 02:38
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Tue, 14 August 2012 16:21
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 09:33
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: James Bottomley on Wed, 15 August 2012 11:12
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Wed, 15 August 2012 12:55
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: James Bottomley on Wed, 15 August 2012 13:29
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Wed, 15 August 2012 12:39
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 12:53
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Wed, 15 August 2012 13:02
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 13:04
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Wed, 15 August 2012 13:26
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 13:31
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Wed, 15 August 2012 14:10
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 14:11
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Christoph Lameter on Wed, 15 August 2012 14:47
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 15:11
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Christoph Lameter on Wed, 15 August 2012 15:34
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 15:35
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Christoph Lameter on Wed, 15 August 2012 17:26
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Ying Han on Wed, 15 August 2012 18:11
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Christoph Lameter on Wed, 15 August 2012 18:25
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 19:22
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Ying Han on Wed, 15 August 2012 18:07
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Greg Thelen on Wed, 15 August 2012 15:19
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Christoph Lameter on Wed, 15 August 2012 15:36
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Ying Han on Wed, 15 August 2012 18:01
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Glauber Costa on Wed, 15 August 2012 18:00
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Ying Han on Wed, 15 August 2012 19:50
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Michal Hocko on Thu, 16 August 2012 15:25
		Re: [PATCH v2 04/11] kmem accounting basic infrastructure By: Ying Han on Fri, 17 August 2012 05:58
		[PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Fri, 10 August 2012 15:42
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 16:49
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Fri, 10 August 2012 17:28
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:56
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Fri, 10 August 2012 17:30
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Fri, 10 August 2012 18:52
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Fri, 10 August 2012 18:54
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Glauber Costa on Mon, 13 August 2012 08:05
		Re: [PATCH v2 02/11] memcg: Reclaim when more than one page needed. By: Michal Hocko on Mon, 13 August 2012 13:10
		[PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Greg Thelen on Thu, 09 August 2012 16:33
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Thu, 09 August 2012 16:42
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:33
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Mon, 13 August 2012 08:03
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Mel Gorman on Mon, 13 August 2012 08:57
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Greg Thelen on Fri, 10 August 2012 17:36
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Mon, 13 August 2012 08:02
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Wed, 15 August 2012 09:08
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Mel Gorman on Wed, 15 August 2012 13:22
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Wed, 15 August 2012 13:39
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Glauber Costa on Wed, 15 August 2012 13:51
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Michal Hocko on Wed, 15 August 2012 09:24
		Re: [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg By: Mel Gorman on Tue, 14 August 2012 15:16
		[PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:54
		Re: [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs By: Michal Hocko on Tue, 21 August 2012 09:35
		Re: [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs By: Glauber Costa on Tue, 21 August 2012 09:40
		Re: [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs By: Michal Hocko on Tue, 21 August 2012 10:57
		[PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:51
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Mon, 13 August 2012 08:01
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Fri, 17 August 2012 09:00
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Fri, 17 August 2012 09:15
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Fri, 17 August 2012 09:35
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Fri, 17 August 2012 10:07
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Fri, 17 August 2012 10:35
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Fri, 17 August 2012 10:36
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Tue, 21 August 2012 07:54
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Tue, 21 August 2012 08:35
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Tue, 21 August 2012 09:17
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Tue, 21 August 2012 09:22
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Michal Hocko on Tue, 21 August 2012 10:00
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Tue, 21 August 2012 10:01
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Greg Thelen on Wed, 22 August 2012 01:09
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Wed, 22 August 2012 08:22
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Greg Thelen on Wed, 22 August 2012 23:23
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Thu, 23 August 2012 07:55
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Greg Thelen on Fri, 24 August 2012 05:06
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Fri, 24 August 2012 05:23
		Re: [PATCH v2 09/11] memcg: propagate kmem limiting information to children By: Glauber Costa on Fri, 17 August 2012 10:39
		[PATCH v2 08/11] memcg: disable kmem code when not in use. By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 08/11] memcg: disable kmem code when not in use. By: Michal Hocko on Fri, 17 August 2012 07:02
		Re: [PATCH v2 08/11] memcg: disable kmem code when not in use. By: Glauber Costa on Fri, 17 August 2012 07:01
		Re: [PATCH v2 08/11] memcg: disable kmem code when not in use. By: Michal Hocko on Fri, 17 August 2012 08:04
		[PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:27
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Mon, 13 August 2012 08:28
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Tue, 14 August 2012 18:58
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 09:18
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Wed, 15 August 2012 16:38
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 17:00
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Wed, 15 August 2012 17:12
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 19:31
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Thu, 16 August 2012 03:37
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Thu, 16 August 2012 07:47
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: KAMEZAWA Hiroyuki on Mon, 20 August 2012 13:36
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Mon, 20 August 2012 15:29
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: KAMEZAWA Hiroyuki on Fri, 17 August 2012 02:36
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Fri, 17 August 2012 07:04
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Tue, 14 August 2012 11:00
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Sat, 11 August 2012 05:11
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Mon, 13 August 2012 08:07
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Mon, 13 August 2012 09:59
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Mon, 13 August 2012 21:21
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Michal Hocko on Tue, 14 August 2012 17:25
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 09:42
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 10:44
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Michal Hocko on Wed, 15 August 2012 13:09
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 14:01
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Michal Hocko on Wed, 15 August 2012 14:23
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 15 August 2012 14:27
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Michal Hocko on Thu, 16 August 2012 09:53
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Thu, 16 August 2012 09:57
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Michal Hocko on Thu, 16 August 2012 15:05
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Thu, 16 August 2012 15:22
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Tue, 21 August 2012 21:50
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Wed, 22 August 2012 08:35
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Greg Thelen on Thu, 23 August 2012 00:07
		Re: [PATCH v2 06/11] memcg: kmem controller infrastructure By: Glauber Costa on Thu, 23 August 2012 07:51
		[PATCH v2 10/11] memcg: allow a memcg with kmem charges to be destructed. By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 10/11] memcg: allow a memcg with kmem charges to be destructed. By: Michal Hocko on Tue, 21 August 2012 08:22
		Re: [PATCH v2 10/11] memcg: allow a memcg with kmem charges to be destructed. By: Glauber Costa on Wed, 22 August 2012 08:36
		[PATCH v2 05/11] Add a __GFP_KMEMCG flag By: Glauber Costa on Thu, 09 August 2012 13:01
		Re: [PATCH v2 05/11] Add a __GFP_KMEMCG flag By: KAMEZAWA Hiroyuki on Fri, 10 August 2012 17:07
		Re: [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg. By: Ying Han on Fri, 17 August 2012 21:37
		Re: [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg. By: Glauber Costa on Mon, 20 August 2012 07:51

Previous Topic:	[PATCH v3] SUNRPC: protect service sockets lists during per-net shutdown
Next Topic:	New here (CentOS 6.3 + Gentoo + ReiserFS)

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Thu Aug 21 23:18:00 GMT 2025

Total time taken to generate the page: 0.05955 seconds