redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

z3fold: fix sheduling while atomic

Browse source 
kmem_cache_alloc() may be called from z3fold_alloc() in atomic context, so
we need to pass correct gfp flags to avoid "scheduling while atomic" bug.

Link: http://lkml.kernel.org/r/20190523153245.119dfeed55927e8755250ddd@gmail.com
Fixes: 7c2b8baa61 ("mm/z3fold.c: add structure for buddy handles")
Signed-off-by: Vitaly Wool <vitaly.vul@sony.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vitaly Wool 2019-05-31 22:30:39 -07:00 committed by Linus Torvalds
parent ef7a77c6de
commit bb9f6f63f3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mm/z3fold.c
View file

@ -190,10 +190,11 @@ static int size_to_chunks(size_t size)
static void compact_page_work(struct work_struct *w); static void compact_page_work(struct work_struct *w);
static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool) 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, struct z3fold_buddy_slots *slots = kmem_cache_alloc(pool->c_handle,
GFP_KERNEL); gfp);
if (slots) { if (slots) {
memset(slots->slot, 0, sizeof(slots->slot)); memset(slots->slot, 0, sizeof(slots->slot));
@ -295,10 +296,10 @@ static void z3fold_unregister_migration(struct z3fold_pool *pool)
/* Initializes the z3fold header of a newly allocated z3fold page */ /* Initializes the z3fold header of a newly allocated z3fold page */
static struct z3fold_header *init_z3fold_page(struct page *page, static struct z3fold_header *init_z3fold_page(struct page *page,
struct z3fold_pool *pool) struct z3fold_pool *pool, gfp_t gfp)
{ {
struct z3fold_header *zhdr = page_address(page); struct z3fold_header *zhdr = page_address(page);
struct z3fold_buddy_slots *slots = alloc_slots(pool); struct z3fold_buddy_slots *slots = alloc_slots(pool, gfp);
if (!slots) if (!slots)
return NULL; return NULL;
@ -912,7 +913,7 @@ retry:
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
zhdr = init_z3fold_page(page, pool); zhdr = init_z3fold_page(page, pool, gfp);
if (!zhdr) { if (!zhdr) {
__free_page(page); __free_page(page);
return -ENOMEM; return -ENOMEM;