GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

thp: handle errors in hugepage_init() properly

Browse source 
We miss error-handling in few cases hugepage_init(). Let's fix that.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kirill A. Shutemov 2015-04-15 16:14:20 -07:00 • committed by Linus Torvalds
parent bdfedb76f4
commit 65ebb64f4d
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mm/huge_memory.c
View file

@ -67,6 +67,7 @@ static unsigned int khugepaged_max_ptes_none __read_mostly = HPAGE_PMD_NR-1;
static int khugepaged(void *none); static int khugepaged(void *none);
static int khugepaged_slab_init(void); static int khugepaged_slab_init(void);
static void khugepaged_slab_exit(void);
#define MM_SLOTS_HASH_BITS 10 #define MM_SLOTS_HASH_BITS 10
static __read_mostly DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS); static __read_mostly DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS);
@ -634,13 +635,15 @@ static int __init hugepage_init(void)
err = hugepage_init_sysfs(&hugepage_kobj); err = hugepage_init_sysfs(&hugepage_kobj);
if (err) if (err)
return err; goto err_sysfs;
err = khugepaged_slab_init(); err = khugepaged_slab_init();
if (err) if (err)
goto out; goto err_slab;
register_shrinker(&huge_zero_page_shrinker); err = register_shrinker(&huge_zero_page_shrinker);
if (err)
goto err_hzp_shrinker;
/* /*
* By default disable transparent hugepages on smaller systems, * By default disable transparent hugepages on smaller systems,
@ -650,11 +653,18 @@ static int __init hugepage_init(void)
if (totalram_pages < (512 << (20 - PAGE_SHIFT))) if (totalram_pages < (512 << (20 - PAGE_SHIFT)))
transparent_hugepage_flags = 0; transparent_hugepage_flags = 0;
start_khugepaged(); err = start_khugepaged();
if (err)
goto err_khugepaged;
return 0; return 0;
out: err_khugepaged:
unregister_shrinker(&huge_zero_page_shrinker);
err_hzp_shrinker:
khugepaged_slab_exit();
err_slab:
hugepage_exit_sysfs(hugepage_kobj); hugepage_exit_sysfs(hugepage_kobj);
err_sysfs:
return err; return err;
} }
subsys_initcall(hugepage_init); subsys_initcall(hugepage_init);
@ -1974,6 +1984,11 @@ static int __init khugepaged_slab_init(void)
return 0; return 0;
} }
static void __init khugepaged_slab_exit(void)
{
kmem_cache_destroy(mm_slot_cache);
}
static inline struct mm_slot *alloc_mm_slot(void) static inline struct mm_slot *alloc_mm_slot(void)
{ {
if (!mm_slot_cache) /* initialization failed */ if (!mm_slot_cache) /* initialization failed */