* [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 10:05 ` Wanpeng Li
0 siblings, 0 replies; 8+ messages in thread
From: Wanpeng Li @ 2012-07-10 10:05 UTC (permalink / raw)
To: linux-mm
Cc: Andrew Morton, Li Zefan, Tejun Heo, Aneesh Kumar K.V, cgroups,
linux-kernel, Wanpeng Li
From: Wanpeng Li <liwp@linux.vnet.ibm.com>
Against linux-next:
Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
to charge pages, the compound page have less than 3 pages will not
charge to hugetlb cgroup. When alloc_huge_page fails it will call
hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
That means it will uncharge pages even if the compound page have less
than 3 pages. Add huge_page_order check to avoid this incorrectly
uncharge.
Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
---
mm/hugetlb_cgroup.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index b834e8d..2b9e214 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
if (hugetlb_cgroup_disabled() || !h_cg)
return;
+
+ if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
+ return;
res_counter_uncharge(&h_cg->hugepage[idx], csize);
return;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 10:05 ` Wanpeng Li
0 siblings, 0 replies; 8+ messages in thread
From: Wanpeng Li @ 2012-07-10 10:05 UTC (permalink / raw)
To: linux-mm
Cc: Andrew Morton, Li Zefan, Tejun Heo, Aneesh Kumar K.V, cgroups,
linux-kernel, Wanpeng Li
From: Wanpeng Li <liwp@linux.vnet.ibm.com>
Against linux-next:
Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
to charge pages, the compound page have less than 3 pages will not
charge to hugetlb cgroup. When alloc_huge_page fails it will call
hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
That means it will uncharge pages even if the compound page have less
than 3 pages. Add huge_page_order check to avoid this incorrectly
uncharge.
Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
---
mm/hugetlb_cgroup.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index b834e8d..2b9e214 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
if (hugetlb_cgroup_disabled() || !h_cg)
return;
+
+ if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
+ return;
res_counter_uncharge(&h_cg->hugepage[idx], csize);
return;
--
1.7.5.4
--
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>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
2012-07-10 10:05 ` Wanpeng Li
(?)
@ 2012-07-10 13:39 ` Michal Hocko
-1 siblings, 0 replies; 8+ messages in thread
From: Michal Hocko @ 2012-07-10 13:39 UTC (permalink / raw)
To: Wanpeng Li
Cc: linux-mm, Andrew Morton, Li Zefan, Tejun Heo, Aneesh Kumar K.V,
cgroups, linux-kernel
On Tue 10-07-12 18:05:12, Wanpeng Li wrote:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe cgroups" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 13:39 ` Michal Hocko
0 siblings, 0 replies; 8+ messages in thread
From: Michal Hocko @ 2012-07-10 13:39 UTC (permalink / raw)
To: Wanpeng Li
Cc: linux-mm-Bw31MaZKKs3YtjvyW6yDsg, Andrew Morton, Li Zefan,
Tejun Heo, Aneesh Kumar K.V, cgroups-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Tue 10-07-12 18:05:12, Wanpeng Li wrote:
> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe cgroups" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 13:39 ` Michal Hocko
0 siblings, 0 replies; 8+ messages in thread
From: Michal Hocko @ 2012-07-10 13:39 UTC (permalink / raw)
To: Wanpeng Li
Cc: linux-mm, Andrew Morton, Li Zefan, Tejun Heo, Aneesh Kumar K.V,
cgroups, linux-kernel
On Tue 10-07-12 18:05:12, Wanpeng Li wrote:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe cgroups" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
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>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
2012-07-10 10:05 ` Wanpeng Li
(?)
@ 2012-07-10 17:41 ` Aneesh Kumar K.V
-1 siblings, 0 replies; 8+ messages in thread
From: Aneesh Kumar K.V @ 2012-07-10 17:41 UTC (permalink / raw)
To: Wanpeng Li, linux-mm
Cc: Andrew Morton, Li Zefan, Tejun Heo, cgroups, linux-kernel, Wanpeng Li
Wanpeng Li <liwp.linux@gmail.com> writes:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
-aneesh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 17:41 ` Aneesh Kumar K.V
0 siblings, 0 replies; 8+ messages in thread
From: Aneesh Kumar K.V @ 2012-07-10 17:41 UTC (permalink / raw)
To: Wanpeng Li, linux-mm-Bw31MaZKKs3YtjvyW6yDsg
Cc: Andrew Morton, Li Zefan, Tejun Heo,
cgroups-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Wanpeng Li
Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
-aneesh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
@ 2012-07-10 17:41 ` Aneesh Kumar K.V
0 siblings, 0 replies; 8+ messages in thread
From: Aneesh Kumar K.V @ 2012-07-10 17:41 UTC (permalink / raw)
To: Wanpeng Li, linux-mm
Cc: Andrew Morton, Li Zefan, Tejun Heo, cgroups, linux-kernel
Wanpeng Li <liwp.linux@gmail.com> writes:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Against linux-next:
>
> Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup
> to charge pages, the compound page have less than 3 pages will not
> charge to hugetlb cgroup. When alloc_huge_page fails it will call
> hugetlb_cgroup_uncharge_cgroup to uncharge pages, however,
> hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check.
> That means it will uncharge pages even if the compound page have less
> than 3 pages. Add huge_page_order check to avoid this incorrectly
> uncharge.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> mm/hugetlb_cgroup.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> index b834e8d..2b9e214 100644
> --- a/mm/hugetlb_cgroup.c
> +++ b/mm/hugetlb_cgroup.c
> @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
>
> if (hugetlb_cgroup_disabled() || !h_cg)
> return;
> +
> + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER)
> + return;
>
> res_counter_uncharge(&h_cg->hugepage[idx], csize);
> return;
> --
> 1.7.5.4
-aneesh
--
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>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-10 17:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-10 10:05 [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge Wanpeng Li
2012-07-10 10:05 ` Wanpeng Li
2012-07-10 13:39 ` Michal Hocko
2012-07-10 13:39 ` Michal Hocko
2012-07-10 13:39 ` Michal Hocko
2012-07-10 17:41 ` Aneesh Kumar K.V
2012-07-10 17:41 ` Aneesh Kumar K.V
2012-07-10 17:41 ` Aneesh Kumar K.V
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.