mem: make use of save_restore to simplify code
PATCH 1/1 mem: make use of save_restore to simplify code
--- testcases/kernel/mem/include/mem.h | 1 - testcases/kernel/mem/lib/mem.c | 2 -- testcases/kernel/mem/oom/oom01.c | 17 ++++------------ testcases/kernel/mem/oom/oom02.c | 14 ++++--------- testcases/kernel/mem/oom/oom03.c | 14 ++++--------- testcases/kernel/mem/oom/oom04.c | 14 ++++--------- testcases/kernel/mem/oom/oom05.c | 14 ++++--------- testcases/kernel/mem/tunable/max_map_count.c | 9 ++++----- .../kernel/mem/tunable/min_free_kbytes.c | 8 ++++---- .../kernel/mem/tunable/overcommit_memory.c | 20 +++++-------------- 10 files changed, 33 insertions(+), 80 deletions(-)
testcases/kernel/mem/include/mem.h +0 -1
@@ -42,7 +42,6 @@ static inline void clean_node(unsigned long *array)#define MLOCK 2#define KSM 3 -extern long overcommit;void oom (int testcase,int lite,int retcode,int allow_sigkill);void testoom (int mempolicy,int lite,int retcode,int allow_sigkill);
testcases/kernel/mem/lib/mem.c +0 -2
@@ -27,8 +27,6 @@/* OOM */ -long overcommit =-1 ; -static int alloc_mem (long int length,int testcase) {char *s;
testcases/kernel/mem/oom/oom01.c +4 -13
@@ -49,22 +49,13 @@ static void verify_oom(void)testoom (0 ,0 ,ENOMEM ,1 ); } -static void setup (void ) -{ - overcommit =get_sys_tune ("overcommit_memory" ); -} - -static void cleanup (void ) -{ -if (overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , overcommit,0 ); -} -static struct tst_test test = { .needs_root =1 , .forks_child =1 , .max_runtime =TST_UNLIMITED_RUNTIME , - .setup = setup, - .cleanup = cleanup, .test_all = verify_oom, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {} + }, };
testcases/kernel/mem/oom/oom02.c +4 -10
@@ -56,15 +56,6 @@ static void setup(void) {if (!is_numa (NULL ,NH_MEMS ,2 ))tst_brk (TCONF ,"The case need a NUMA system." ); - - overcommit =get_sys_tune ("overcommit_memory" ); -set_sys_tune ("overcommit_memory" ,1 ,1 ); -} - -static void cleanup (void ) -{ -if (overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , overcommit,0 ); }static struct tst_test test = {
@@ -72,8 +63,11 @@ static struct tst_test test = { .forks_child = 1, .max_runtime = TST_UNLIMITED_RUNTIME, .setup = setup, - .cleanup = cleanup, .test_all = verify_oom, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {} + }, };#else
testcases/kernel/mem/oom/oom03.c +4 -10
@@ -79,27 +79,21 @@ static void verify_oom(void)static void setup (void ) { - overcommit =get_sys_tune ("overcommit_memory" ); -set_sys_tune ("overcommit_memory" ,1 ,1 ); -SAFE_CG_PRINTF (tst_cg,"cgroup.procs" ,"%d" ,getpid ());SAFE_CG_PRINTF (tst_cg,"memory.max" ,"%lu" ,TESTMEM ); } -static void cleanup (void ) -{ -if (overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , overcommit,0 ); -} -static struct tst_test test = { .needs_root =1 , .forks_child =1 , .max_runtime =TST_UNLIMITED_RUNTIME , .setup = setup, - .cleanup = cleanup, .test_all = verify_oom, .needs_cgroup_ctrls = (const char *const []){"memory" ,NULL }, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {} + }, };#else
testcases/kernel/mem/oom/oom04.c +4 -10
@@ -65,9 +65,6 @@ static void setup(void)if (!is_numa (NULL ,NH_MEMS ,1 ))tst_brk (TCONF ,"requires NUMA with at least 1 node" ); - overcommit =get_sys_tune ("overcommit_memory" ); -set_sys_tune ("overcommit_memory" ,1 ,1 ); -/* * Some nodes do not contain memory, so use * get_allowed_nodes(NH_MEMS) to get a memory
@@ -82,20 +79,17 @@ static void setup(void) SAFE_CG_PRINTF(tst_cg, "cgroup.procs", "%d", getpid()); } -static void cleanup (void ) -{ -if (overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , overcommit,0 ); -} -static struct tst_test test = { .needs_root =1 , .forks_child =1 , .max_runtime =TST_UNLIMITED_RUNTIME , .setup = setup, - .cleanup = cleanup, .test_all = verify_oom, .needs_cgroup_ctrls = (const char *const []){"cpuset" ,NULL }, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {} + }, };#else
testcases/kernel/mem/oom/oom05.c +4 -10
@@ -85,9 +85,6 @@ void setup(void)if (!is_numa (NULL ,NH_MEMS ,1 ))tst_brk (TCONF ,"requires NUMA with at least 1 node" ); - overcommit =get_sys_tune ("overcommit_memory" ); -set_sys_tune ("overcommit_memory" ,1 ,1 ); -/* * Some nodes do not contain memory, so use * get_allowed_nodes(NH_MEMS) to get a memory
@@ -104,22 +101,19 @@ void setup(void) SAFE_CG_PRINTF(tst_cg, "memory.max", "%lu", TESTMEM); } -void cleanup (void ) -{ -if (overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , overcommit,0 ); -} -static struct tst_test test = { .needs_root =1 , .forks_child =1 , .max_runtime =TST_UNLIMITED_RUNTIME , .setup = setup, - .cleanup = cleanup, .test_all = verify_oom, .needs_cgroup_ctrls = (const char *const []){"memory" ,"cpuset" ,NULL }, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,"1" ,TST_SR_TBROK }, + {} + }, };#else
testcases/kernel/mem/tunable/max_map_count.c +4 -5
@@ -54,21 +54,16 @@#define MAX_MAP_COUNT 65536Lstatic long old_max_map_count =-1 ; -static long old_overcommit =-1 ;static void setup (void ) {SAFE_ACCESS (PATH_SYSVM "max_map_count" ,F_OK ); old_max_map_count =get_sys_tune ("max_map_count" ); - old_overcommit =get_sys_tune ("overcommit_memory" ); -set_sys_tune ("overcommit_memory" ,0 ,1 ); }static void cleanup (void ) { -if (old_overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , old_overcommit,0 );if (old_max_map_count !=-1 )set_sys_tune ("max_map_count" , old_max_map_count,0 ); }
@@ -213,4 +208,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = max_map_count_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,"0" ,TST_SR_TBROK }, + {} + }, };
testcases/kernel/mem/tunable/min_free_kbytes.c +4 -4
@@ -41,7 +41,6 @@volatile int end;static long default_tune =-1 ; -static long orig_overcommit =-1 ;static unsigned long total_mem;static void test_tune (unsigned long overcommit_policy);
@@ -217,15 +216,12 @@ static void setup(void) total_mem =SAFE_READ_MEMINFO ("MemTotal:" ) +SAFE_READ_MEMINFO ("SwapTotal:" ); default_tune =get_sys_tune ("min_free_kbytes" ); - orig_overcommit =get_sys_tune ("overcommit_memory" ); }static void cleanup (void ) {if (default_tune !=-1 )set_sys_tune ("min_free_kbytes" , default_tune,0 ); -if (orig_overcommit !=-1 ) -set_sys_tune ("overcommit_memory" , orig_overcommit,0 ); }static struct tst_test test = {
@@ -235,4 +231,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = min_free_kbytes_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {} + }, };
testcases/kernel/mem/tunable/overcommit_memory.c +5 -15
@@ -70,7 +70,6 @@#define EXPECT_FAIL 1static char *R_opt; -static long old_overcommit_memory =-1 ;static long old_overcommit_ratio =-1 ;static long overcommit_ratio;static long sum_total;
@@ -90,16 +89,11 @@ static void setup(void)long mem_total, swap_total;struct rlimit lim; -if (access (PATH_SYSVM "overcommit_memory" ,F_OK ) ==-1 || -access (PATH_SYSVM "overcommit_ratio" ,F_OK ) ==-1 ) -tst_brk (TCONF ,"system doesn't support overcommit_memory" ); -if (R_opt) overcommit_ratio =SAFE_STRTOL (R_opt,0 ,LONG_MAX );else overcommit_ratio =DEFAULT_OVER_RATIO ; - old_overcommit_memory =get_sys_tune ("overcommit_memory" ); old_overcommit_ratio =get_sys_tune ("overcommit_ratio" ); mem_total =SAFE_READ_MEMINFO ("MemTotal:" );
@@ -128,14 +122,6 @@ static void setup(void)tst_res (TINFO ,"TotalBatchSize is %ld kB" , total_batch_size); } -static void cleanup (void ) -{ -if (old_overcommit_memory !=-1 ) -set_sys_tune ("overcommit_memory" , old_overcommit_memory,0 ); -if (old_overcommit_ratio !=-1 ) -set_sys_tune ("overcommit_ratio" , old_overcommit_ratio,0 ); -} -static void overcommit_memory_test (void ) {
@@ -269,6 +255,10 @@ static struct tst_test test = { {} }, .setup = setup, - .cleanup = cleanup, .test_all = overcommit_memory_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {"/proc/sys/vm/overcommit_ratio" ,NULL ,TST_SR_TBROK }, + {} + }, };
Signature · 5 lines
2.40.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Li,
very nice cleanup, thanks!
...
Quoted 10 lines
+++
b/testcases/kernel/mem/tunable/overcommit_memory.ctestcases/kernel/mem/tunable/overcommit_memory.c +0
-1@@ -70,7 +70,6 @@#define EXPECT_FAIL 1static char *R_opt; -static long old_overcommit_memory =-1 ;static long old_overcommit_ratio =-1 ;static long overcommit_ratio;static long sum_total;
testcases/kernel/mem/tunable/overcommit_memory.c static void setup(void) · line 95
Quoted 6 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-3@@ -90,16 +89,11 @@ static void setup(void)long mem_total, swap_total;struct rlimit lim; -if (access (PATH_SYSVM "overcommit_memory" ,F_OK ) ==-1 || -access (PATH_SYSVM "overcommit_ratio" ,F_OK ) ==-1 ) -tst_brk (TCONF ,"system doesn't support overcommit_memory" );
Here is used TCONF instead of TBROK.
Quoted 11 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-2-if (R_opt) overcommit_ratio =SAFE_STRTOL (R_opt,0 ,LONG_MAX );else overcommit_ratio =DEFAULT_OVER_RATIO ; - old_overcommit_memory =get_sys_tune ("overcommit_memory" ); old_overcommit_ratio =get_sys_tune ("overcommit_ratio" ); mem_total =SAFE_READ_MEMINFO ("MemTotal:" );
testcases/kernel/mem/tunable/overcommit_memory.c static void setup(void) · line 134
Quoted 7 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-4@@ -128,14 +122,6 @@ static void setup(void)tst_res (TINFO ,"TotalBatchSize is %ld kB" , total_batch_size); } -static void cleanup (void ) -{ -if (old_overcommit_memory !=-1 ) -set_sys_tune ("overcommit_memory" , old_overcommit_memory,0 );
Also third parameter of set_sys_tune() (check) is 0.
Quoted 8 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-4-if (old_overcommit_ratio !=-1 ) -set_sys_tune ("overcommit_ratio" , old_overcommit_ratio,0 ); -} -static void overcommit_memory_test (void ) {
testcases/kernel/mem/tunable/overcommit_memory.c static struct tst_test test = { · line 261
Quoted 8 lines
testcases/kernel/mem/tunable/overcommit_memory.c +3
-1@@ -269,6 +255,10 @@ static struct tst_test test = { {} }, .setup = setup, - .cleanup = cleanup, .test_all = overcommit_memory_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {"/proc/sys/vm/overcommit_ratio" ,NULL ,TST_SR_TBROK },
=> shouldn't be here TST_SR_TCONF instead of TST_SR_TBROK?
I also wonder if testcases/kernel/mem/tunable/max_map_count.c can replace old_max_map_count with .save_restore (with TST_SR_TCONF).
Also testcases/kernel/mem/tunable/min_free_kbytes.c could use .save_restore on panic_on_oom and min_free_kbytes, right?
But these two can be done as a separate effort.
Otherwise LGTM.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 51 lines · Petr Vorel
Hi Li,
very nice cleanup, thanks!
...
Quoted 10 lines
+++
b/testcases/kernel/mem/tunable/overcommit_memory.ctestcases/kernel/mem/tunable/overcommit_memory.c +0
-1@@ -70,7 +70,6 @@#define EXPECT_FAIL 1static char *R_opt; -static long old_overcommit_memory =-1 ;static long old_overcommit_ratio =-1 ;static long overcommit_ratio;static long sum_total;testcases/kernel/mem/tunable/overcommit_memory.c static void setup(void) · line 95
Quoted 6 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-3@@ -90,16 +89,11 @@ static void setup(void)long mem_total, swap_total;struct rlimit lim; -if (access (PATH_SYSVM "overcommit_memory" ,F_OK ) ==-1 || -access (PATH_SYSVM "overcommit_ratio" ,F_OK ) ==-1 ) - tst_brk(TCONF, "system doesn't support
overcommit_memory");Here is used TCONF instead of TBROK.
Quoted 11 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-2-if (R_opt) overcommit_ratio =SAFE_STRTOL (R_opt,0 ,LONG_MAX );else overcommit_ratio =DEFAULT_OVER_RATIO ; - old_overcommit_memory =get_sys_tune ("overcommit_memory" ); old_overcommit_ratio =get_sys_tune ("overcommit_ratio" ); mem_total =SAFE_READ_MEMINFO ("MemTotal:" );testcases/kernel/mem/tunable/overcommit_memory.c static void setup(void) · line 134
Quoted 7 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-4@@ -128,14 +122,6 @@ static void setup(void)tst_res (TINFO ,"TotalBatchSize is %ld kB" , total_batch_size); } -static void cleanup (void ) -{ -if (old_overcommit_memory !=-1 ) - set_sys_tune("overcommit_memory", old_overcommit_memory,0);
Quoted 2 lines
Also third parameter of
set_sys_tune()(check) is 0.
The checks inside set_sys_tuen() can NOT guarantee the "overcommit_memory" knob is exist or not, it only examines if the value was being set correctly, because set_sys_tune has first use SAFE_FILE_PRINTF which will TBROK directly when the knob non-exist.
Quoted 8 lines
Quoted 7 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-4-if (old_overcommit_ratio !=-1 ) -set_sys_tune ("overcommit_ratio" , old_overcommit_ratio,0 ); -} -static void overcommit_memory_test (void ) {
Quoted 10 lines
testcases/kernel/mem/tunable/overcommit_memory.c static struct tst_test test = { · line 261
Quoted 9 lines
testcases/kernel/mem/tunable/overcommit_memory.c +3
-1@@ -269,6 +255,10 @@ static struct tst_test test = { {} }, .setup = setup, - .cleanup = cleanup, .test_all = overcommit_memory_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {"/proc/sys/vm/overcommit_ratio" ,NULL ,TST_SR_TBROK },=> shouldn't be here
TST_SR_TCONFinstead ofTST_SR_TBROK?
It doesn't matter, I indeed consider this before, but after looking through the rest mm tests they all use the function get|set_sys_tune() which checks the knob mandatorily and run smoothly for past many years and nobody ever complains about that.
So I think it's safe to convert this one using TBROK too, it essentially has no difference from other oom-tests. 'overcommit_ratio' and 'overcommit_memory' are quite basic on Linux distribution.
Quoted 4 lines
I also wonder if
testcases/kernel/mem/tunable/max_map_count.ccan replaceold_max_map_countwith .save_restore (withTST_SR_TCONF).
+1
Quoted 4 lines
Also
testcases/kernel/mem/tunable/min_free_kbytes.ccould use .save_restore onpanic_on_oomandmin_free_kbytes, right?
No, 'panic_on_oom' is a different scenario, min_free_kbytes.c test just checks if that was being set to 1, if yes, we have to skip the whole test unconditionally in case of the system occurs panic.
Quoted 3 lines
But these two can be done as a separate effort.
Yes, the rest two suggestions sound good.
Quoted 4 lines
Otherwise LGTM.
Reviewed-by Petr Vorel <[email protected]>
Thanks!
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Li,
...
Quoted 7 lines
Quoted 1 line
Also third parameter of
set_sys_tune()(check) is 0.The checks inside
set_sys_tuen()can NOT guarantee the "overcommit_memory" knob is exist or not, it only examines if the value was being set correctly, becauseset_sys_tunehas first useSAFE_FILE_PRINTFwhich will TBROK directly when the knob non-exist.
Ah, thanks for correcting me.
Quoted 19 lines
Quoted 7 lines
Quoted 6 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-4-if (old_overcommit_ratio !=-1 ) -set_sys_tune ("overcommit_ratio" , old_overcommit_ratio,0 ); -} -static void overcommit_memory_test (void ) {Quoted 10 lines
testcases/kernel/mem/tunable/overcommit_memory.c static struct tst_test test = { · line 261
Quoted 9 lines
testcases/kernel/mem/tunable/overcommit_memory.c +3
-1@@ -269,6 +255,10 @@ static struct tst_test test = { {} }, .setup = setup, - .cleanup = cleanup, .test_all = overcommit_memory_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {"/proc/sys/vm/overcommit_ratio" ,NULL ,TST_SR_TBROK },=> shouldn't be here
TST_SR_TCONFinstead ofTST_SR_TBROK?
Quoted 4 lines
It doesn't matter, I indeed consider this before, but after looking through the rest mm tests they all use the function get|set_sys_tune() which checks the knob mandatorily and run smoothly for past many years and nobody ever complains about that.
+1
Quoted 3 lines
So I think it's safe to convert this one using TBROK too, it essentially has no difference from other oom-tests. '
overcommit_ratio' and 'overcommit_memory' are quite basic on Linux distribution.
+1
=> go ahead and merge.
Quoted 7 lines
Quoted 2 lines
I also wonder if
testcases/kernel/mem/tunable/max_map_count.ccan replaceold_max_map_countwith .save_restore (withTST_SR_TCONF).+1
Quoted 7 lines
Quoted 2 lines
Also
testcases/kernel/mem/tunable/min_free_kbytes.ccould use .save_restore onpanic_on_oomandmin_free_kbytes, right?No, '
panic_on_oom' is a different scenario,min_free_kbytes.ctest just checks if that was being set to 1, if yes, we have to skip the whole test unconditionally in case of the system occurs panic.
+1
Quoted 4 lines
Quoted 1 line
But these two can be done as a separate effort.
Yes, the rest two suggestions sound good.
I see you already post a patch, thx!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 39 lines · Petr Vorel
Hi Li,
...
Quoted 7 lines
Quoted 1 line
Also third parameter of
set_sys_tune()(check) is 0.The checks inside
set_sys_tuen()can NOT guarantee the "overcommit_memory" knob is exist or not, it only examines if the value was being set correctly, becauseset_sys_tunehas first useSAFE_FILE_PRINTFwhich will TBROK directly when the knob non-exist.Ah, thanks for correcting me.
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-2- if (old_overcommit_ratio != -1) - set_sys_tune("overcommit_ratio", old_overcommit_ratio,0);
Quoted 17 lines
Quoted 5 lines
Quoted 4 lines
testcases/kernel/mem/tunable/overcommit_memory.c +0
-2-} -static void overcommit_memory_test (void ) {Quoted 10 lines
testcases/kernel/mem/tunable/overcommit_memory.c static struct tst_test test = { · line 261
Quoted 9 lines
testcases/kernel/mem/tunable/overcommit_memory.c +3
-1@@ -269,6 +255,10 @@ static struct tst_test test = { {} }, .setup = setup, - .cleanup = cleanup, .test_all = overcommit_memory_test, + .save_restore = (const struct tst_path_val []) { + {"/proc/sys/vm/overcommit_memory" ,NULL ,TST_SR_TBROK }, + {"/proc/sys/vm/overcommit_ratio" ,NULL ,TST_SR_TBROK },=> shouldn't be here
TST_SR_TCONFinstead ofTST_SR_TBROK?Quoted 4 lines
It doesn't matter, I indeed consider this before, but after looking through the rest mm tests they all use the function get|set_sys_tune() which checks the knob mandatorily and run smoothly for past many years and nobody ever complains about that.
Quoted 9 lines
+1
Quoted 3 lines
So I think it's safe to convert this one using TBROK too, it essentially has no difference from other oom-tests. '
overcommit_ratio' and 'overcommit_memory' are quite basic on Linux distribution.+1
=> go ahead and merge.
Both pushed, thank you!
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp