Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225022

[PATCH] mm: memcontrol: fix order calculation in try_charge()

Show all headers | View raw

Since commit <6539cc05386> (mm: memcontrol: fold mem_cgroup_do_charge()),
the order to pass to mem_cgroup_oom() is calculated by passing the number
of pages to get_order() instead of the expected  size in bytes. AFAICT,
it only affects the value displayed in the oom warning message.
This patch fix this.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
---
 mm/memcontrol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1742a2d..91bf094 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2032,7 +2032,8 @@ retry:
 
 	mem_cgroup_events(mem_over_limit, MEMCG_OOM, 1);
 
-	mem_cgroup_oom(mem_over_limit, gfp_mask, get_order(nr_pages));
+	mem_cgroup_oom(mem_over_limit, gfp_mask,
+		       get_order(nr_pages * PAGE_SIZE));
 nomem:
 	if (!(gfp_mask & __GFP_NOFAIL))
 		return -ENOMEM;
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mm: memcontrol: fix order calculation in try_charge() "Jerome Marchand" <jmarchan@redhat.com> - 2015-09-15 14:10 +0200
  Re: [PATCH] mm: memcontrol: fix order calculation in try_charge() Michal Hocko <mhocko@kernel.org> - 2015-09-15 16:00 +0200
    Re: [PATCH] mm: memcontrol: fix order calculation in try_charge() Michal Hocko <mhocko@kernel.org> - 2015-09-17 15:10 +0200
  Re: [PATCH] mm: memcontrol: fix order calculation in try_charge() Johannes Weiner <hannes@cmpxchg.org> - 2015-09-18 09:50 +0200

csiph-web