hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

z3fold: fix memory leak in kmem cache 

Currently there is a leak in init_z3fold_page() -- it allocates handles
from kmem cache even for headless pages, but then they are never used and
never freed, so eventually kmem cache may get exhausted.  This patch
provides a fix for that.

Link: http://lkml.kernel.org/r/20190917185352.44cf285d3ebd9e64548de5de@gmail.com
Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
Reported-by: Markus Linnala <markus.linnala@gmail.com>
Tested-by: Markus Linnala <markus.linnala@gmail.com>
Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Henry Burns <henrywolfeburns@gmail.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.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-09-23 15:36:51 -07:00 committed by Linus Torvalds
parent b57a775f51
commit 63398413c0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mm/z3fold.c
View File

@ -295,14 +295,11 @@ 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, bool headless,
struct z3fold_pool *pool, gfp_t gfp) 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, gfp); struct z3fold_buddy_slots *slots;
if (!slots)
return NULL;
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->lru);
clear_bit(PAGE_HEADLESS, &page->private); clear_bit(PAGE_HEADLESS, &page->private);
@ -310,6 +307,12 @@ static struct z3fold_header *init_z3fold_page(struct page *page,
clear_bit(NEEDS_COMPACTING, &page->private); clear_bit(NEEDS_COMPACTING, &page->private);
clear_bit(PAGE_STALE, &page->private); clear_bit(PAGE_STALE, &page->private);
clear_bit(PAGE_CLAIMED, &page->private); clear_bit(PAGE_CLAIMED, &page->private);
if (headless)
return zhdr;
slots = alloc_slots(pool, gfp);
if (!slots)
return NULL;
spin_lock_init(&zhdr->page_lock); spin_lock_init(&zhdr->page_lock);
kref_init(&zhdr->refcount); kref_init(&zhdr->refcount);
@ -930,7 +933,7 @@ retry:
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
zhdr = init_z3fold_page(page, pool, gfp); zhdr = init_z3fold_page(page, bud == HEADLESS, pool, gfp);
if (!zhdr) { if (!zhdr) {
__free_page(page); __free_page(page);
return -ENOMEM; return -ENOMEM;