mm/khugepaged: replace mutex_lock/mutex_unlock usage with guard macro
Subsystems (2)
PATCH 1/1 mm/khugepaged: replace mutex_lock/mutex_unlock usage with guard macro
Currently, khugepaged locks the khugepaged_mutex in two functions:start_stop_khugepaged and khugepaged_min_free_kbytes_update. Remove mutex_lock/mutex_unlock usage in these functions and replace it with the guard macro. This makes the code more readable (removing a goto statement) and makes it harder to introduce bugs in the future.
No functional changes introduced.
--- mm/khugepaged.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
mm/khugepaged.c +3 -6
@@ -3113,7 +3113,7 @@ int start_stop_khugepaged(void) {int err =0 ; -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled ()) {if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL,
@@ -3122,7 +3122,7 @@ int start_stop_khugepaged(void)pr_err ("khugepaged: kthread_run(khugepaged) failed\n" ); err =PTR_ERR (khugepaged_thread); khugepaged_thread =NULL ; - goto fail; +return err; }if (!list_empty (&khugepaged_scan.mm_head))
@@ -3132,17 +3132,14 @@ int start_stop_khugepaged(void) khugepaged_thread =NULL ; }set_recommended_min_free_kbytes (); -fail: -mutex_unlock (&khugepaged_mutex);return err; }void khugepaged_min_free_kbytes_update (void ) { -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled () && khugepaged_thread)set_recommended_min_free_kbytes (); -mutex_unlock (&khugepaged_mutex); }bool current_is_khugepaged (void )
Signature · 1 line
2.55.0
Quoted 9 lines · Jakov Novak
Currently, khugepaged locks the
khugepaged_mutexin two functions:start_stop_khugepagedandkhugepaged_min_free_kbytes_update. Remove mutex_lock/mutex_unlock usage in these functions and replace it with the guard macro. This makes the code more readable (removing a goto statement) and makes it harder to introduce bugs in the future.
No functional changes introduced.Signed-off-by Jakov Novak <[email protected]>---
Thanks.
Quoted 44 lines
mm/khugepaged.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mm/khugepaged.c +3
-6@@ -3113,7 +3113,7 @@ int start_stop_khugepaged(void) {int err =0 ; -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled ()) {if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL,@@ -3122,7 +3122,7 @@ int start_stop_khugepaged(void)pr_err ("khugepaged: kthread_run(khugepaged) failed\n" ); err =PTR_ERR (khugepaged_thread); khugepaged_thread =NULL ; - goto fail; +return err; }if (!list_empty (&khugepaged_scan.mm_head))@@ -3132,17 +3132,14 @@ int start_stop_khugepaged(void) khugepaged_thread =NULL ; }set_recommended_min_free_kbytes (); -fail: -mutex_unlock (&khugepaged_mutex);return err; }void khugepaged_min_free_kbytes_update (void ) { -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled () && khugepaged_thread)set_recommended_min_free_kbytes (); -mutex_unlock (&khugepaged_mutex); }bool current_is_khugepaged (void )
Quoted 8 lines · Jakov Novak
Currently, khugepaged locks the
khugepaged_mutexin two functions:start_stop_khugepagedandkhugepaged_min_free_kbytes_update. Remove mutex_lock/mutex_unlock usage in these functions and replace it with the guard macro. This makes the code more readable (removing a goto statement) and makes it harder to introduce bugs in the future.
No functional changes introduced.Signed-off-by Jakov Novak <[email protected]>
Various nits below, with them addressed feel free to add:
To the respin.
mm/khugepaged.c int start_stop_khugepaged(void) · line 3113
Quoted 10 lines
--- mm/khugepaged.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mm/khugepaged.c +0
-0@@ -3113,7 +3113,7 @@ int start_stop_khugepaged(void) {
Please add
#include <linux/cleanup.h>
To the #include's up top.
You might get away with not doing it locally because of recursive header includes but be better to be explicit.
mm/khugepaged.c int start_stop_khugepaged(void)
Quoted 8 lines
mm/khugepaged.c +1
-1int err =0 ; -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled ()) {if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL,@@ -3122,7 +3122,7 @@ int start_stop_khugepaged(void)
if (IS_ERR(khugepaged_thread)) {Can we move the 'int err' declaration to here then? And not initialise it as it gets assigned below.
Quoted 9 lines
mm/khugepaged.c +1
-1pr_err ("khugepaged: kthread_run(khugepaged) failed\n" ); err =PTR_ERR (khugepaged_thread); khugepaged_thread =NULL ; - goto fail; +return err; }if (!list_empty (&khugepaged_scan.mm_head))
mm/khugepaged.c int start_stop_khugepaged(void) · line 3135
Quoted 6 lines
mm/khugepaged.c +0
-2@@ -3132,17 +3132,14 @@ int start_stop_khugepaged(void) khugepaged_thread =NULL ; }set_recommended_min_free_kbytes (); -fail: -mutex_unlock (&khugepaged_mutex);return err;
Let's make this return 0 now.
mm/khugepaged.c int start_stop_khugepaged(void) · line 3145
Quoted 9 lines
mm/khugepaged.c +1
-2}void khugepaged_min_free_kbytes_update (void ) { -mutex_lock (&khugepaged_mutex); +guard (mutex)(&khugepaged_mutex);if (hugepage_enabled () && khugepaged_thread)set_recommended_min_free_kbytes (); -mutex_unlock (&khugepaged_mutex);
Nice and simple!
Quoted 6 lines
mm/khugepaged.c +0
-1}bool current_is_khugepaged (void ) --2.55.0
Cheers, Lorenzo