diff options
| author | Henry Burns <henryburns@google.com> | 2019-07-17 01:26:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 04:23:21 +0200 |
| commit | f1549cb5ab2bd04cb370502b720268f610e21baa (patch) | |
| tree | 333288998589ae40b1bacf7903b828fa83e5f936 /mm | |
| parent | mm/cma.c: fix a typo ("alloc_cma" -> "cma_alloc") in cma_release() comments (diff) | |
| download | linux-f1549cb5ab2bd04cb370502b720268f610e21baa.tar.xz linux-f1549cb5ab2bd04cb370502b720268f610e21baa.zip | |
mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc
One of the gfp flags used to show that a page is movable is
__GFP_HIGHMEM. Currently z3fold_alloc() fails when __GFP_HIGHMEM is
passed. Now that z3fold pages are movable, we allow __GFP_HIGHMEM. We
strip the movability related flags from the call to kmem_cache_alloc()
for our slots since it is a kernel allocation.
[akpm@linux-foundation.org: coding-style fixes]
Link: http://lkml.kernel.org/r/20190712222118.108192-1-henryburns@google.com
Signed-off-by: Henry Burns <henryburns@google.com>
Acked-by: Vitaly Wool <vitalywool@gmail.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/z3fold.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/z3fold.c b/mm/z3fold.c index 304f2883cdb9..e13c6228cd70 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -195,8 +195,10 @@ static void compact_page_work(struct work_struct *w); static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool, gfp_t gfp) { - struct z3fold_buddy_slots *slots = kmem_cache_alloc(pool->c_handle, - gfp); + struct z3fold_buddy_slots *slots; + + slots = kmem_cache_alloc(pool->c_handle, + (gfp & ~(__GFP_HIGHMEM | __GFP_MOVABLE))); if (slots) { memset(slots->slot, 0, sizeof(slots->slot)); @@ -853,7 +855,7 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp, enum buddy bud; bool can_sleep = gfpflags_allow_blocking(gfp); - if (!size || (gfp & __GFP_HIGHMEM)) + if (!size) return -EINVAL; if (size > PAGE_SIZE) |