The patch titled
Subject: mm: restrict gfp mask in mpage_alloc
has been removed from the -mm tree. Its filename was
mm-memcg-use-consistent-gfp-flags-during-readahead-fix.patch
This patch was dropped because it was folded into mm-memcg-use-consistent-gfp-flags-during-readahead.patch
------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxxx>
Subject: mm: restrict gfp mask in mpage_alloc
Sergey has reported that we might hit BUG_ON in new_slab() because
unrestricted gfp mask used for the readahead purposes contains
incompatible flags (__GFP_HIGHMEM in his case):
[ 429.191962] gfp: 2
[ 429.192634] ------------[ cut here ]------------
[ 429.193281] kernel BUG at mm/slub.c:1616!
[...]
[ 429.217369] [<ffffffff811ca221>] bio_alloc_bioset+0xbd/0x1b1
[ 429.218013] [<ffffffff81148078>] mpage_alloc+0x28/0x7b
[ 429.218650] [<ffffffff8114856a>] do_mpage_readpage+0x43d/0x545
[ 429.219282] [<ffffffff81148767>] mpage_readpages+0xf5/0x152
Make sure that mpage_alloc always restricts the mask to GFP_KERNEL subset.
This is what was done before "mm, memcg: use consistent gfp flags during
readahead" explicitly by mapping_gfp_constraint(mapping, GFP_KERNEL) in
mpage_readpages.
Link: http://lkml.kernel.org/r/20160610074223.GC32285@xxxxxxxxxxxxxx
Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/mpage.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/mpage.c~mm-memcg-use-consistent-gfp-flags-during-readahead-fix fs/mpage.c
--- a/fs/mpage.c~mm-memcg-use-consistent-gfp-flags-during-readahead-fix
+++ a/fs/mpage.c
@@ -71,6 +71,8 @@ mpage_alloc(struct block_device *bdev,
{
struct bio *bio;
+ /* Restrict the given (page cache) mask for slab allocations */
+ gfp_flags &= GFP_KERNEL;
bio = bio_alloc(gfp_flags, nr_vecs);
if (bio == NULL && (current->flags & PF_MEMALLOC)) {
_
Patches currently in -mm which might be from mhocko@xxxxxxxx are
arm-get-rid-of-superfluous-__gfp_repeat.patch
slab-make-gfp_slab_bug_mask-information-more-human-readable.patch
slab-do-not-panic-on-invalid-gfp_mask.patch
mm-oom_reaper-make-sure-that-mmput_async-is-called-only-when-memory-was-reaped.patch
mm-memcg-use-consistent-gfp-flags-during-readahead.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
