GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 12:04:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

thp: cleanup khugepaged startup

Browse source 
Few trivial cleanups:

 - no need to call set_recommended_min_free_kbytes() from
   late_initcall() -- start_khugepaged() calls it;

 - no need to call set_recommended_min_free_kbytes() from
   start_khugepaged() if khugepaged is not started;

 - there isn't much point in running start_khugepaged() if we've just
   set transparent_hugepage_flags to zero;

 - start_khugepaged() is misnamed -- it also used to stop the thread;

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.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:56 -07:00 • committed by Linus Torvalds
parent e39155ea11
commit 79553da293
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mm/huge_memory.c
View file

@ -110,10 +110,6 @@ static int set_recommended_min_free_kbytes(void)
int nr_zones = 0; int nr_zones = 0;
unsigned long recommended_min; unsigned long recommended_min;
/* khugepaged thread has stopped to failed to start */
if (!khugepaged_thread)
return 0;
for_each_populated_zone(zone) for_each_populated_zone(zone)
nr_zones++; nr_zones++;
@ -145,9 +141,8 @@ static int set_recommended_min_free_kbytes(void)
setup_per_zone_wmarks(); setup_per_zone_wmarks();
return 0; return 0;
} }
late_initcall(set_recommended_min_free_kbytes);
static int start_khugepaged(void) static int start_stop_khugepaged(void)
{ {
int err = 0; int err = 0;
if (khugepaged_enabled()) { if (khugepaged_enabled()) {
@ -158,6 +153,7 @@ static int start_khugepaged(void)
pr_err("khugepaged: kthread_run(khugepaged) failed\n"); pr_err("khugepaged: kthread_run(khugepaged) failed\n");
err = PTR_ERR(khugepaged_thread); err = PTR_ERR(khugepaged_thread);
khugepaged_thread = NULL; khugepaged_thread = NULL;
goto fail;
} }
if (!list_empty(&khugepaged_scan.mm_head)) if (!list_empty(&khugepaged_scan.mm_head))
@ -168,7 +164,7 @@ static int start_khugepaged(void)
kthread_stop(khugepaged_thread); kthread_stop(khugepaged_thread);
khugepaged_thread = NULL; khugepaged_thread = NULL;
} }
fail:
return err; return err;
} }
@ -302,7 +298,7 @@ static ssize_t enabled_store(struct kobject *kobj,
int err; int err;
mutex_lock(&khugepaged_mutex); mutex_lock(&khugepaged_mutex);
err = start_khugepaged(); err = start_stop_khugepaged();
mutex_unlock(&khugepaged_mutex); mutex_unlock(&khugepaged_mutex);
if (err) if (err)
@ -651,10 +647,12 @@ static int __init hugepage_init(void)
* where the extra memory used could hurt more than TLB overhead * where the extra memory used could hurt more than TLB overhead
* is likely to save. The admin can still enable it through /sys. * is likely to save. The admin can still enable it through /sys.
*/ */
if (totalram_pages < (512 << (20 - PAGE_SHIFT))) if (totalram_pages < (512 << (20 - PAGE_SHIFT))) {
transparent_hugepage_flags = 0; transparent_hugepage_flags = 0;
return 0;
}
err = start_khugepaged(); err = start_stop_khugepaged();
if (err) if (err)
goto err_khugepaged; goto err_khugepaged;