diff for duplicates of <4FE86FD8.6010000@parallels.com> diff --git a/a/2.txt b/N1/2.txt index 5076609..8b13789 100644 --- a/a/2.txt +++ b/N1/2.txt @@ -1,95 +1 @@ -From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001 -From: Suleiman Souhlal <ssouhlal@FreeBSD.org> -Date: Fri, 9 Mar 2012 12:39:08 -0800 -Subject: [PATCH] memcg: Reclaim when more than one page needed. -mem_cgroup_do_charge() was written before slab accounting, and expects -three cases: being called for 1 page, being called for a stock of 32 pages, -or being called for a hugepage. If we call for 2 or 3 pages (and several -slabs used in process creation are such, at least with the debug options I -had), it assumed it's being called for stock and just retried without reclaiming. - -Fix that by passing down a minsize argument in addition to the csize. - -And what to do about that (csize == PAGE_SIZE && ret) retry? If it's -needed at all (and presumably is since it's there, perhaps to handle -races), then it should be extended to more than PAGE_SIZE, yet how far? -And should there be a retry count limit, of what? For now retry up to -COSTLY_ORDER (as page_alloc.c does), stay safe with a cond_resched(), -and make sure not to do it if __GFP_NORETRY. - -[v4: fixed nr pages calculation pointed out by Christoph Lameter ] - -Signed-off-by: Suleiman Souhlal <suleiman@google.com> -Signed-off-by: Glauber Costa <glommer@parallels.com> -Reviewed-by: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> ---- - mm/memcontrol.c | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 9304db2..8e601e8 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -2158,8 +2158,16 @@ enum { - CHARGE_OOM_DIE, /* the current is killed because of OOM */ - }; - -+/* -+ * We need a number that is small enough to be likely to have been -+ * reclaimed even under pressure, but not too big to trigger unnecessary -+ * retries -+ */ -+#define NR_PAGES_TO_RETRY 2 -+ - static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, -- unsigned int nr_pages, bool oom_check) -+ unsigned int nr_pages, unsigned int min_pages, -+ bool oom_check) - { - unsigned long csize = nr_pages * PAGE_SIZE; - struct mem_cgroup *mem_over_limit; -@@ -2182,18 +2190,18 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, - } else - mem_over_limit = mem_cgroup_from_res_counter(fail_res, res); - /* -- * nr_pages can be either a huge page (HPAGE_PMD_NR), a batch -- * of regular pages (CHARGE_BATCH), or a single regular page (1). -- * - * Never reclaim on behalf of optional batching, retry with a - * single page instead. - */ -- if (nr_pages == CHARGE_BATCH) -+ if (nr_pages > min_pages) - return CHARGE_RETRY; - - if (!(gfp_mask & __GFP_WAIT)) - return CHARGE_WOULDBLOCK; - -+ if (gfp_mask & __GFP_NORETRY) -+ return CHARGE_NOMEM; -+ - ret = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags); - if (mem_cgroup_margin(mem_over_limit) >= nr_pages) - return CHARGE_RETRY; -@@ -2206,7 +2214,7 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, - * unlikely to succeed so close to the limit, and we fall back - * to regular pages anyway in case of failure. - */ -- if (nr_pages == 1 && ret) -+ if (nr_pages <= NR_PAGES_TO_RETRY && ret) - return CHARGE_RETRY; - - /* -@@ -2341,7 +2349,8 @@ again: - nr_oom_retries = MEM_CGROUP_RECLAIM_RETRIES; - } - -- ret = mem_cgroup_do_charge(memcg, gfp_mask, batch, oom_check); -+ ret = mem_cgroup_do_charge(memcg, gfp_mask, batch, nr_pages, -+ oom_check); - switch (ret) { - case CHARGE_OK: - break; --- -1.7.10.2 diff --git a/a/content_digest b/N1/content_digest index cead286..2441084 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -73,100 +73,5 @@ "\01:2\0" "fn\00001-memcg-Reclaim-when-more-than-one-page-needed.patch\0" "b\0" - "From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001\n" - "From: Suleiman Souhlal <ssouhlal@FreeBSD.org>\n" - "Date: Fri, 9 Mar 2012 12:39:08 -0800\n" - "Subject: [PATCH] memcg: Reclaim when more than one page needed.\n" - "\n" - "mem_cgroup_do_charge() was written before slab accounting, and expects\n" - "three cases: being called for 1 page, being called for a stock of 32 pages,\n" - "or being called for a hugepage. If we call for 2 or 3 pages (and several\n" - "slabs used in process creation are such, at least with the debug options I\n" - "had), it assumed it's being called for stock and just retried without reclaiming.\n" - "\n" - "Fix that by passing down a minsize argument in addition to the csize.\n" - "\n" - "And what to do about that (csize == PAGE_SIZE && ret) retry? If it's\n" - "needed at all (and presumably is since it's there, perhaps to handle\n" - "races), then it should be extended to more than PAGE_SIZE, yet how far?\n" - "And should there be a retry count limit, of what? For now retry up to\n" - "COSTLY_ORDER (as page_alloc.c does), stay safe with a cond_resched(),\n" - "and make sure not to do it if __GFP_NORETRY.\n" - "\n" - "[v4: fixed nr pages calculation pointed out by Christoph Lameter ]\n" - "\n" - "Signed-off-by: Suleiman Souhlal <suleiman@google.com>\n" - "Signed-off-by: Glauber Costa <glommer@parallels.com>\n" - "Reviewed-by: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>\n" - "---\n" - " mm/memcontrol.c | 23 ++++++++++++++++-------\n" - " 1 file changed, 16 insertions(+), 7 deletions(-)\n" - "\n" - "diff --git a/mm/memcontrol.c b/mm/memcontrol.c\n" - "index 9304db2..8e601e8 100644\n" - "--- a/mm/memcontrol.c\n" - "+++ b/mm/memcontrol.c\n" - "@@ -2158,8 +2158,16 @@ enum {\n" - " \tCHARGE_OOM_DIE,\t\t/* the current is killed because of OOM */\n" - " };\n" - " \n" - "+/*\n" - "+ * We need a number that is small enough to be likely to have been\n" - "+ * reclaimed even under pressure, but not too big to trigger unnecessary \n" - "+ * retries\n" - "+ */\n" - "+#define NR_PAGES_TO_RETRY 2\n" - "+\n" - " static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,\n" - "-\t\t\t\tunsigned int nr_pages, bool oom_check)\n" - "+\t\t\t\tunsigned int nr_pages, unsigned int min_pages,\n" - "+\t\t\t\tbool oom_check)\n" - " {\n" - " \tunsigned long csize = nr_pages * PAGE_SIZE;\n" - " \tstruct mem_cgroup *mem_over_limit;\n" - "@@ -2182,18 +2190,18 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,\n" - " \t} else\n" - " \t\tmem_over_limit = mem_cgroup_from_res_counter(fail_res, res);\n" - " \t/*\n" - "-\t * nr_pages can be either a huge page (HPAGE_PMD_NR), a batch\n" - "-\t * of regular pages (CHARGE_BATCH), or a single regular page (1).\n" - "-\t *\n" - " \t * Never reclaim on behalf of optional batching, retry with a\n" - " \t * single page instead.\n" - " \t */\n" - "-\tif (nr_pages == CHARGE_BATCH)\n" - "+\tif (nr_pages > min_pages)\n" - " \t\treturn CHARGE_RETRY;\n" - " \n" - " \tif (!(gfp_mask & __GFP_WAIT))\n" - " \t\treturn CHARGE_WOULDBLOCK;\n" - " \n" - "+\tif (gfp_mask & __GFP_NORETRY)\n" - "+\t\treturn CHARGE_NOMEM;\n" - "+\n" - " \tret = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags);\n" - " \tif (mem_cgroup_margin(mem_over_limit) >= nr_pages)\n" - " \t\treturn CHARGE_RETRY;\n" - "@@ -2206,7 +2214,7 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,\n" - " \t * unlikely to succeed so close to the limit, and we fall back\n" - " \t * to regular pages anyway in case of failure.\n" - " \t */\n" - "-\tif (nr_pages == 1 && ret)\n" - "+\tif (nr_pages <= NR_PAGES_TO_RETRY && ret)\n" - " \t\treturn CHARGE_RETRY;\n" - " \n" - " \t/*\n" - "@@ -2341,7 +2349,8 @@ again:\n" - " \t\t\tnr_oom_retries = MEM_CGROUP_RECLAIM_RETRIES;\n" - " \t\t}\n" - " \n" - "-\t\tret = mem_cgroup_do_charge(memcg, gfp_mask, batch, oom_check);\n" - "+\t\tret = mem_cgroup_do_charge(memcg, gfp_mask, batch, nr_pages,\n" - "+\t\t oom_check);\n" - " \t\tswitch (ret) {\n" - " \t\tcase CHARGE_OK:\n" - " \t\t\tbreak;\n" - "-- \n" - 1.7.10.2 -1ce6c1f782790fdf498b1bff91f9cf2449501fae4df640305a93e488b17da63a +2a1d76c5b554b3deecba90fb7bcb8adfed9e64d1080270fed2628ed52e070f88
diff --git a/a/2.txt b/N2/2.txt index 5076609..3a53a83 100644 --- a/a/2.txt +++ b/N2/2.txt @@ -1,4 +1,4 @@ -From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001 +>From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001 From: Suleiman Souhlal <ssouhlal@FreeBSD.org> Date: Fri, 9 Mar 2012 12:39:08 -0800 Subject: [PATCH] memcg: Reclaim when more than one page needed. diff --git a/a/content_digest b/N2/content_digest index cead286..abc1863 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,14 +8,14 @@ "Subject\0Re: [PATCH v4 07/25] memcg: Reclaim when more than one page needed.\0" "Date\0Mon, 25 Jun 2012 18:04:08 +0400\0" "To\0Michal Hocko <mhocko@suse.cz>\0" - "Cc\0linux-mm@kvack.org" + "Cc\0<linux-mm@kvack.org>" Pekka Enberg <penberg@kernel.org> Cristoph Lameter <cl@linux.com> David Rientjes <rientjes@google.com> - cgroups@vger.kernel.org - devel@openvz.org - kamezawa.hiroyu@jp.fujitsu.com - linux-kernel@vger.kernel.org + <cgroups@vger.kernel.org> + <devel@openvz.org> + <kamezawa.hiroyu@jp.fujitsu.com> + <linux-kernel@vger.kernel.org> Frederic Weisbecker <fweisbec@gmail.com> " Suleiman Souhlal <suleiman@google.com>\0" "\01:1\0" @@ -73,7 +73,7 @@ "\01:2\0" "fn\00001-memcg-Reclaim-when-more-than-one-page-needed.patch\0" "b\0" - "From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001\n" + ">From 43bb259f5a0e3a73bc76f24d1b42000a95889015 Mon Sep 17 00:00:00 2001\n" "From: Suleiman Souhlal <ssouhlal@FreeBSD.org>\n" "Date: Fri, 9 Mar 2012 12:39:08 -0800\n" "Subject: [PATCH] memcg: Reclaim when more than one page needed.\n" @@ -169,4 +169,4 @@ "-- \n" 1.7.10.2 -1ce6c1f782790fdf498b1bff91f9cf2449501fae4df640305a93e488b17da63a +0cd4205c2041df7d166d2b7e59cc96b447d61f8de07b3a788d0f5dad0021d738
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.