From: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
To: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Cc: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>,
Konstantin Khlebnikov
<khlebnikov-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>,
linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [patch 2/2] mm: memcg: clean up mm_match_cgroup() signature
Date: Fri, 5 Oct 2012 13:53:36 -0700 [thread overview]
Message-ID: <20121005135336.1ee7082f.akpm@linux-foundation.org> (raw)
In-Reply-To: <1349374157-20604-3-git-send-email-hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
On Thu, 4 Oct 2012 14:09:17 -0400
Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> wrote:
> It really should return a boolean for match/no match. And since it
> takes a memcg, not a cgroup, fix that parameter name as well.
>
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -84,14 +84,14 @@ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
> extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
>
> static inline
> -int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
> +bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
> {
> - struct mem_cgroup *memcg;
> - int match;
> + struct mem_cgroup *task_memcg;
> + bool match;
>
> rcu_read_lock();
> - memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> - match = memcg && __mem_cgroup_same_or_subtree(cgroup, memcg);
> + task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> + match = task_memcg && __mem_cgroup_same_or_subtree(memcg, task_memcg);
> rcu_read_unlock();
> return match;
> }
This needed massaging after droppage of your [1/2]:
From: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Subject: mm: memcg: clean up mm_match_cgroup() signature
It really should return a boolean for match/no match. And since it
takes a memcg, not a cgroup, fix that parameter name as well.
Signed-off-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Acked-by: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>
---
1 file changed, 7 insertions(+), 7 deletions(-)
index 8686294..7698182 100644
Signed-off-by: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
---
include/linux/memcontrol.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature
+++ a/include/linux/memcontrol.h
@@ -84,13 +84,13 @@ extern struct mem_cgroup *parent_mem_cgr
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
static inline
-int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
- struct mem_cgroup *memcg;
- int match;
+ struct mem_cgroup *task_memcg;
+ bool match;
rcu_read_lock();
- memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
@@ -258,10 +258,10 @@ static inline struct mem_cgroup *try_get
return NULL;
}
-static inline int mm_match_cgroup(struct mm_struct *mm,
+static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
- return 1;
+ return true;
}
static inline int task_in_mem_cgroup(struct task_struct *task,
_
Also,
From: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Subject: mm-memcg-clean-up-mm_match_cgroup-signature-fix
mm_match_cgroup is not a macro
Cc: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Cc: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>
Signed-off-by: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
---
include/linux/memcontrol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix
+++ a/include/linux/memcontrol.h
@@ -90,7 +90,7 @@ bool mm_match_cgroup(const struct mm_str
bool match;
rcu_read_lock();
- task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
_
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Morton <akpm@linux-foundation.org>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>,
Konstantin Khlebnikov <khlebnikov@openvz.org>,
linux-mm@kvack.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [patch 2/2] mm: memcg: clean up mm_match_cgroup() signature
Date: Fri, 5 Oct 2012 13:53:36 -0700 [thread overview]
Message-ID: <20121005135336.1ee7082f.akpm@linux-foundation.org> (raw)
In-Reply-To: <1349374157-20604-3-git-send-email-hannes@cmpxchg.org>
On Thu, 4 Oct 2012 14:09:17 -0400
Johannes Weiner <hannes@cmpxchg.org> wrote:
> It really should return a boolean for match/no match. And since it
> takes a memcg, not a cgroup, fix that parameter name as well.
>
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -84,14 +84,14 @@ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
> extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
>
> static inline
> -int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
> +bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
> {
> - struct mem_cgroup *memcg;
> - int match;
> + struct mem_cgroup *task_memcg;
> + bool match;
>
> rcu_read_lock();
> - memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> - match = memcg && __mem_cgroup_same_or_subtree(cgroup, memcg);
> + task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> + match = task_memcg && __mem_cgroup_same_or_subtree(memcg, task_memcg);
> rcu_read_unlock();
> return match;
> }
This needed massaging after droppage of your [1/2]:
From: Johannes Weiner <hannes@cmpxchg.org>
Subject: mm: memcg: clean up mm_match_cgroup() signature
It really should return a boolean for match/no match. And since it
takes a memcg, not a cgroup, fix that parameter name as well.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
---
1 file changed, 7 insertions(+), 7 deletions(-)
index 8686294..7698182 100644
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memcontrol.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature
+++ a/include/linux/memcontrol.h
@@ -84,13 +84,13 @@ extern struct mem_cgroup *parent_mem_cgr
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
static inline
-int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
- struct mem_cgroup *memcg;
- int match;
+ struct mem_cgroup *task_memcg;
+ bool match;
rcu_read_lock();
- memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
@@ -258,10 +258,10 @@ static inline struct mem_cgroup *try_get
return NULL;
}
-static inline int mm_match_cgroup(struct mm_struct *mm,
+static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
- return 1;
+ return true;
}
static inline int task_in_mem_cgroup(struct task_struct *task,
_
Also,
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memcg-clean-up-mm_match_cgroup-signature-fix
mm_match_cgroup is not a macro
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memcontrol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix
+++ a/include/linux/memcontrol.h
@@ -90,7 +90,7 @@ bool mm_match_cgroup(const struct mm_str
bool match;
rcu_read_lock();
- task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Morton <akpm@linux-foundation.org>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>,
Konstantin Khlebnikov <khlebnikov@openvz.org>,
linux-mm@kvack.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [patch 2/2] mm: memcg: clean up mm_match_cgroup() signature
Date: Fri, 5 Oct 2012 13:53:36 -0700 [thread overview]
Message-ID: <20121005135336.1ee7082f.akpm@linux-foundation.org> (raw)
In-Reply-To: <1349374157-20604-3-git-send-email-hannes@cmpxchg.org>
On Thu, 4 Oct 2012 14:09:17 -0400
Johannes Weiner <hannes@cmpxchg.org> wrote:
> It really should return a boolean for match/no match. And since it
> takes a memcg, not a cgroup, fix that parameter name as well.
>
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -84,14 +84,14 @@ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
> extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
>
> static inline
> -int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
> +bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
> {
> - struct mem_cgroup *memcg;
> - int match;
> + struct mem_cgroup *task_memcg;
> + bool match;
>
> rcu_read_lock();
> - memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> - match = memcg && __mem_cgroup_same_or_subtree(cgroup, memcg);
> + task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
> + match = task_memcg && __mem_cgroup_same_or_subtree(memcg, task_memcg);
> rcu_read_unlock();
> return match;
> }
This needed massaging after droppage of your [1/2]:
From: Johannes Weiner <hannes@cmpxchg.org>
Subject: mm: memcg: clean up mm_match_cgroup() signature
It really should return a boolean for match/no match. And since it
takes a memcg, not a cgroup, fix that parameter name as well.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
---
1 file changed, 7 insertions(+), 7 deletions(-)
index 8686294..7698182 100644
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memcontrol.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature
+++ a/include/linux/memcontrol.h
@@ -84,13 +84,13 @@ extern struct mem_cgroup *parent_mem_cgr
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
static inline
-int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
- struct mem_cgroup *memcg;
- int match;
+ struct mem_cgroup *task_memcg;
+ bool match;
rcu_read_lock();
- memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
@@ -258,10 +258,10 @@ static inline struct mem_cgroup *try_get
return NULL;
}
-static inline int mm_match_cgroup(struct mm_struct *mm,
+static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
- return 1;
+ return true;
}
static inline int task_in_mem_cgroup(struct task_struct *task,
_
Also,
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memcg-clean-up-mm_match_cgroup-signature-fix
mm_match_cgroup is not a macro
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memcontrol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-memcg-clean-up-mm_match_cgroup-signature-fix
+++ a/include/linux/memcontrol.h
@@ -90,7 +90,7 @@ bool mm_match_cgroup(const struct mm_str
bool match;
rcu_read_lock();
- task_memcg = mem_cgroup_from_task(rcu_dereference((mm)->owner));
+ task_memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
match = __mem_cgroup_same_or_subtree(cgroup, task_memcg);
rcu_read_unlock();
return match;
_
next prev parent reply other threads:[~2012-10-05 20:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 18:09 [patch 0/2] memcg fixups that fell through cracks in 3.5 Johannes Weiner
2012-10-04 18:09 ` Johannes Weiner
2012-10-04 18:09 ` Johannes Weiner
2012-10-04 18:09 ` [patch 1/2] mm: memcontrol: handle potential crash when rmap races with task exit Johannes Weiner
2012-10-04 18:09 ` Johannes Weiner
2012-10-04 18:49 ` Michal Hocko
2012-10-04 18:49 ` Michal Hocko
[not found] ` <20121004184958.GG27536-2MMpYkNvuYDjFM9bn6wA6Q@public.gmane.org>
2012-10-04 20:19 ` Johannes Weiner
2012-10-04 20:19 ` Johannes Weiner
2012-10-04 20:19 ` Johannes Weiner
[not found] ` <20121004201908.GA2625-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
2012-10-05 7:05 ` Michal Hocko
2012-10-05 7:05 ` Michal Hocko
2012-10-05 7:05 ` Michal Hocko
2012-10-04 18:09 ` [patch 2/2] mm: memcg: clean up mm_match_cgroup() signature Johannes Weiner
2012-10-04 18:09 ` Johannes Weiner
[not found] ` <1349374157-20604-3-git-send-email-hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
2012-10-05 20:53 ` Andrew Morton [this message]
2012-10-05 20:53 ` Andrew Morton
2012-10-05 20:53 ` Andrew Morton
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=20121005135336.1ee7082f.akpm@linux-foundation.org \
--to=akpm-de/tnxtf+jlsfhdxvbkv3wd2fqjk+8+b@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org \
--cc=khlebnikov-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org \
--cc=mhocko-AlSwsSmVLrQ@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.