diff for duplicates of <20131204015218.GA19709@lge.com> diff --git a/a/1.txt b/N1/1.txt index 985216b..8288ed7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Tue, Dec 03, 2013 at 04:59:10PM -0800, Andrew Morton wrote: -> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> wrote: +> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote: > > > Buffer allocation has a very crude indefinite loop around waking the > > flusher threads and performing global NOFS direct reclaim because it @@ -89,50 +89,3 @@ Following patch would fix this problem. Thanks. -------------------8<------------------------ -From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001 -From: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org> -Date: Wed, 4 Dec 2013 10:36:11 +0900 -Subject: [PATCH] slub: fix high order page allocation problem with - __GFP_NOFAIL - -SLUB already try to allocate high order page with clearing __GFP_NOFAIL. -But, when allocating shadow page for kmemcheck, it missed clearing -the flag. This trigger WARN_ON_ONCE() reported by Christian Casteyde. - -https://bugzilla.kernel.org/show_bug.cgi?id=65991 - -This patch fix this situation by using same allocation flag as original -allocation. - -Reported-by: Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org> -Signed-off-by: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org> - -diff --git a/mm/slub.c b/mm/slub.c -index 545a170..3dd28b1 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -1335,11 +1335,12 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) - page = alloc_slab_page(alloc_gfp, node, oo); - if (unlikely(!page)) { - oo = s->min; -+ alloc_gfp = flags; - /* - * Allocation may have failed due to fragmentation. - * Try a lower order alloc if possible - */ -- page = alloc_slab_page(flags, node, oo); -+ page = alloc_slab_page(alloc_gfp, node, oo); - - if (page) - stat(s, ORDER_FALLBACK); -@@ -1349,7 +1350,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) - && !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) { - int pages = 1 << oo_order(oo); - -- kmemcheck_alloc_shadow(page, oo_order(oo), flags, node); -+ kmemcheck_alloc_shadow(page, oo_order(oo), alloc_gfp, node); - - /* - * Objects from caches that have a constructor don't get --- -1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index 63692df..77c554a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,23 @@ "ref\01381265890-11333-1-git-send-email-hannes@cmpxchg.org\0" "ref\01381265890-11333-2-git-send-email-hannes@cmpxchg.org\0" "ref\020131203165910.54d6b4724a1f3e329af52ac6@linux-foundation.org\0" - "ref\020131203165910.54d6b4724a1f3e329af52ac6-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org\0" - "From\0Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\0" + "From\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" "Subject\0Re: [patch 2/2] fs: buffer: move allocation failure loop into the allocator\0" "Date\0Wed, 4 Dec 2013 10:52:18 +0900\0" - "To\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>\0" - "Cc\0Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>" - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - azurIt <azurit-Rm0zKEqwvD4@public.gmane.org> - linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org> - Pekka Enberg <penberg-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - " Christoph Lameter <cl-vYTEC60ixJUAvxtiuMwx3w@public.gmane.org>\0" + "To\0Andrew Morton <akpm@linux-foundation.org>\0" + "Cc\0Johannes Weiner <hannes@cmpxchg.org>" + Michal Hocko <mhocko@suse.cz> + azurIt <azurit@pobox.sk> + linux-mm@kvack.org + cgroups@vger.kernel.org + linux-kernel@vger.kernel.org + Christian Casteyde <casteyde.christian@free.fr> + Pekka Enberg <penberg@kernel.org> + " Christoph Lameter <cl@linux.com>\0" "\00:1\0" "b\0" "On Tue, Dec 03, 2013 at 04:59:10PM -0800, Andrew Morton wrote:\n" - "> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> wrote:\n" + "> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:\n" "> \n" "> > Buffer allocation has a very crude indefinite loop around waking the\n" "> > flusher threads and performing global NOFS direct reclaim because it\n" @@ -107,53 +106,6 @@ "\n" "Thanks.\n" "\n" - "-------------------8<------------------------\n" - "From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001\n" - "From: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\n" - "Date: Wed, 4 Dec 2013 10:36:11 +0900\n" - "Subject: [PATCH] slub: fix high order page allocation problem with\n" - " __GFP_NOFAIL\n" - "\n" - "SLUB already try to allocate high order page with clearing __GFP_NOFAIL.\n" - "But, when allocating shadow page for kmemcheck, it missed clearing\n" - "the flag. This trigger WARN_ON_ONCE() reported by Christian Casteyde.\n" - "\n" - "https://bugzilla.kernel.org/show_bug.cgi?id=65991\n" - "\n" - "This patch fix this situation by using same allocation flag as original\n" - "allocation.\n" - "\n" - "Reported-by: Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org>\n" - "Signed-off-by: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\n" - "\n" - "diff --git a/mm/slub.c b/mm/slub.c\n" - "index 545a170..3dd28b1 100644\n" - "--- a/mm/slub.c\n" - "+++ b/mm/slub.c\n" - "@@ -1335,11 +1335,12 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)\n" - " \tpage = alloc_slab_page(alloc_gfp, node, oo);\n" - " \tif (unlikely(!page)) {\n" - " \t\too = s->min;\n" - "+\t\talloc_gfp = flags;\n" - " \t\t/*\n" - " \t\t * Allocation may have failed due to fragmentation.\n" - " \t\t * Try a lower order alloc if possible\n" - " \t\t */\n" - "-\t\tpage = alloc_slab_page(flags, node, oo);\n" - "+\t\tpage = alloc_slab_page(alloc_gfp, node, oo);\n" - " \n" - " \t\tif (page)\n" - " \t\t\tstat(s, ORDER_FALLBACK);\n" - "@@ -1349,7 +1350,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)\n" - " \t\t&& !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) {\n" - " \t\tint pages = 1 << oo_order(oo);\n" - " \n" - "-\t\tkmemcheck_alloc_shadow(page, oo_order(oo), flags, node);\n" - "+\t\tkmemcheck_alloc_shadow(page, oo_order(oo), alloc_gfp, node);\n" - " \n" - " \t\t/*\n" - " \t\t * Objects from caches that have a constructor don't get\n" - "-- \n" - 1.7.9.5 + -------------------8<------------------------ -151b03f608d579663f5123a57715b6f354229d7c28fdc5193fd02ccd456d3337 +6eb4b3d023d45e9c33e2c7c57c6b805e4edab65ee54fcc3880fde3d27f81db58
diff --git a/a/1.txt b/N2/1.txt index 985216b..cca1783 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ On Tue, Dec 03, 2013 at 04:59:10PM -0800, Andrew Morton wrote: -> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> wrote: +> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote: > > > Buffer allocation has a very crude indefinite loop around waking the > > flusher threads and performing global NOFS direct reclaim because it @@ -89,8 +89,8 @@ Following patch would fix this problem. Thanks. -------------------8<------------------------ -From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001 -From: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org> +>From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001 +From: Joonsoo Kim <iamjoonsoo.kim@lge.com> Date: Wed, 4 Dec 2013 10:36:11 +0900 Subject: [PATCH] slub: fix high order page allocation problem with __GFP_NOFAIL @@ -104,8 +104,8 @@ https://bugzilla.kernel.org/show_bug.cgi?id=65991 This patch fix this situation by using same allocation flag as original allocation. -Reported-by: Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org> -Signed-off-by: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org> +Reported-by: Christian Casteyde <casteyde.christian@free.fr> +Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> diff --git a/mm/slub.c b/mm/slub.c index 545a170..3dd28b1 100644 diff --git a/a/content_digest b/N2/content_digest index 63692df..c5d1682 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,23 @@ "ref\01381265890-11333-1-git-send-email-hannes@cmpxchg.org\0" "ref\01381265890-11333-2-git-send-email-hannes@cmpxchg.org\0" "ref\020131203165910.54d6b4724a1f3e329af52ac6@linux-foundation.org\0" - "ref\020131203165910.54d6b4724a1f3e329af52ac6-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org\0" - "From\0Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\0" + "From\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" "Subject\0Re: [patch 2/2] fs: buffer: move allocation failure loop into the allocator\0" "Date\0Wed, 4 Dec 2013 10:52:18 +0900\0" - "To\0Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>\0" - "Cc\0Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>" - Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org> - azurIt <azurit-Rm0zKEqwvD4@public.gmane.org> - linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org - cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org> - Pekka Enberg <penberg-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - " Christoph Lameter <cl-vYTEC60ixJUAvxtiuMwx3w@public.gmane.org>\0" + "To\0Andrew Morton <akpm@linux-foundation.org>\0" + "Cc\0Johannes Weiner <hannes@cmpxchg.org>" + Michal Hocko <mhocko@suse.cz> + azurIt <azurit@pobox.sk> + linux-mm@kvack.org + cgroups@vger.kernel.org + linux-kernel@vger.kernel.org + Christian Casteyde <casteyde.christian@free.fr> + Pekka Enberg <penberg@kernel.org> + " Christoph Lameter <cl@linux.com>\0" "\00:1\0" "b\0" "On Tue, Dec 03, 2013 at 04:59:10PM -0800, Andrew Morton wrote:\n" - "> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> wrote:\n" + "> On Tue, 8 Oct 2013 16:58:10 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:\n" "> \n" "> > Buffer allocation has a very crude indefinite loop around waking the\n" "> > flusher threads and performing global NOFS direct reclaim because it\n" @@ -108,8 +107,8 @@ "Thanks.\n" "\n" "-------------------8<------------------------\n" - "From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001\n" - "From: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\n" + ">From 7f21232d1eeffccdbd0f6d79c04d297cf95a713e Mon Sep 17 00:00:00 2001\n" + "From: Joonsoo Kim <iamjoonsoo.kim@lge.com>\n" "Date: Wed, 4 Dec 2013 10:36:11 +0900\n" "Subject: [PATCH] slub: fix high order page allocation problem with\n" " __GFP_NOFAIL\n" @@ -123,8 +122,8 @@ "This patch fix this situation by using same allocation flag as original\n" "allocation.\n" "\n" - "Reported-by: Christian Casteyde <casteyde.christian-GANU6spQydw@public.gmane.org>\n" - "Signed-off-by: Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>\n" + "Reported-by: Christian Casteyde <casteyde.christian@free.fr>\n" + "Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>\n" "\n" "diff --git a/mm/slub.c b/mm/slub.c\n" "index 545a170..3dd28b1 100644\n" @@ -156,4 +155,4 @@ "-- \n" 1.7.9.5 -151b03f608d579663f5123a57715b6f354229d7c28fdc5193fd02ccd456d3337 +1d95bf1e9bad33560fb4b67dd11a35e1d24e7bbde971ef84da1a174881cb596c
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.