Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1225022 > unrolled thread
| Started by | "Jerome Marchand" <jmarchan@redhat.com> |
|---|---|
| First post | 2015-09-15 14:10 +0200 |
| Last post | 2015-09-18 09:50 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[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
| From | "Jerome Marchand" <jmarchan@redhat.com> |
|---|---|
| Date | 2015-09-15 14:10 +0200 |
| Subject | [PATCH] mm: memcontrol: fix order calculation in try_charge() |
| Message-ID | <q8XdD-4lR-9@gated-at.bofh.it> |
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/
[toc] | [next] | [standalone]
| From | Michal Hocko <mhocko@kernel.org> |
|---|---|
| Date | 2015-09-15 16:00 +0200 |
| Message-ID | <q8YW5-6Co-11@gated-at.bofh.it> |
| In reply to | #1225022 |
On Tue 15-09-15 14:05:57, Jerome Marchand wrote: > 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. We haven't noticed that just because the OOM is enabled only for page faults of order-0 (single page) and get_order work just fine. Thanks for noticing this. If we ever start triggering OOM on different orders this would be broken. > Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Btw. a quick git grep shows that at least gart_iommu_init is using number of pages as well. I haven't checked it does that intentionally, though. Thanks! > --- > 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 -- Michal Hocko SUSE Labs -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Michal Hocko <mhocko@kernel.org> |
|---|---|
| Date | 2015-09-17 15:10 +0200 |
| Message-ID | <q9H6P-4rU-11@gated-at.bofh.it> |
| In reply to | #1225128 |
[CC Andrew - the patch was posted here http://lkml.kernel.org/r/1442318757-7141-1-git-send-email-jmarchan%40redhat.com] On Tue 15-09-15 15:56:23, Michal Hocko wrote: > On Tue 15-09-15 14:05:57, Jerome Marchand wrote: > > 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. > > We haven't noticed that just because the OOM is enabled only for page > faults of order-0 (single page) and get_order work just fine. Thanks for > noticing this. If we ever start triggering OOM on different orders this > would be broken. > > > Signed-off-by: Jerome Marchand <jmarchan@redhat.com> > > Acked-by: Michal Hocko <mhocko@suse.com> > > Btw. a quick git grep shows that at least gart_iommu_init is using > number of pages as well. I haven't checked it does that intentionally, > though. > > Thanks! > > > --- > > 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 > > -- > Michal Hocko > SUSE Labs -- Michal Hocko SUSE Labs -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Johannes Weiner <hannes@cmpxchg.org> |
|---|---|
| Date | 2015-09-18 09:50 +0200 |
| Message-ID | <q9YAH-4B2-31@gated-at.bofh.it> |
| In reply to | #1225022 |
On Tue, Sep 15, 2015 at 02:05:57PM +0200, Jerome Marchand wrote: > 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> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Thanks, Jerome. One minor thing: > @@ -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)); fls(nr_pages)? get_order() is basically fls(x / PAGE_SIZE). -- 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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web