[LTP] [PATCH-v2] getrusage03: check available memory and move initial allocation out test loop
Jan Stancek
jstancek@redhat.com
Mon Apr 18 11:11:06 CEST 2016
----- Original Message -----
> From: "Julio Cruz" <jcsistemas2001@gmail.com>
> To: "julio cruz" <julio.cruz@smartmatic.com>, ltp@lists.linux.it, "Jan Stancek" <jstancek@redhat.com>
> Cc: "Julio Cruz" <jcsistemas2001@gmail.com>
> Sent: Thursday, 7 April, 2016 12:01:41 PM
> Subject: [LTP] [PATCH-v2] getrusage03: check available memory and move initial allocation out test loop
>
> From: Julio Cruz <julio.cruz@smartmatic.com>
>
> This patch check the available memory before to perform the
> different test cases. If the memory is not enough (according with
> each test case), the test finish as TCONF.
> This could be usefull when you are testing on embedded devices
> with RAM memory limitation (i.e. 512MB)
> This patch no changed the test case procedure and is still valid
> for non-embedded devices. It just verify the available memory.
> The patch also solve an issue with the initial allocation moving
> the call 'consume' before the test loop.
>
> The patch was tested with different board configurations (512MB and 1GB)
> including various DEFAULT_ALLOC_MB constants
>
> checkpatch.pl return total: 0 errors, 0 warnings, 129 lines checked
>
> Signed-off-by: Julio Cruz <jcsistemas2001@gmail.com>
>
> ---
> testcases/kernel/syscalls/getrusage/getrusage03.c | 56
> +++++++++++++++++------
> 1 file changed, 41 insertions(+), 15 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/getrusage/getrusage03.c
> b/testcases/kernel/syscalls/getrusage/getrusage03.c
> index 54cdc83..f3d048f 100644
> --- a/testcases/kernel/syscalls/getrusage/getrusage03.c
> +++ b/testcases/kernel/syscalls/getrusage/getrusage03.c
> @@ -45,7 +45,8 @@
> char *TCID = "getrusage03";
> int TST_TOTAL = 1;
>
> -#define DELTA_MAX 10240
> +#define DELTA_MAX 10240
> +#define DEFAULT_ALLOC_MB 100
>
> static struct rusage ru;
> static long maxrss_init;
> @@ -65,6 +66,14 @@ static void consume(int mega);
> static void setup(void);
> static void cleanup(void);
>
> +unsigned long get_available_memory_mb(void)
> +{
> + unsigned long long ps, pn;
> + ps = sysconf(_SC_PAGESIZE);
> + pn = sysconf(_SC_AVPHYS_PAGES);
> + return (ps / 1024) * pn / 1024;
> +}
Hi,
sorry for late response.
I'm thinking we should replace this with MemFree+Cached or MemAvailable
(if present) from /proc/meminfo because _SC_AVPHYS_PAGES is hitting TCONF
even on my laptop with 8GB RAM:
$ ./getrusage03
getrusage03 0 TINFO : Available mem: 474 MB
getrusage03 0 TINFO : allocate 100 MB
getrusage03 0 TINFO : initial.self = 103016
getrusage03 0 TINFO : Testcase #01: fork inherit
getrusage03 0 TINFO : child.self = 102544
getrusage03 1 TPASS : initial.self ~= child.self
getrusage03 0 TINFO : Testcase #02: fork inherit cont.
getrusage03 0 TINFO : initial.children = 102856
getrusage03 2 TPASS : initial.children ~= 100MB
getrusage03 0 TINFO : child.children = 0
getrusage03 3 TPASS : child.children == 0
getrusage03 0 TINFO : Testcase #03: fork + malloc
getrusage03 0 TINFO : initial.self = 103264
getrusage03 0 TINFO : child allocate +50MB
getrusage03 0 TINFO : child.self = 153700
getrusage03 4 TPASS : initial.self + 50MB ~= child.self
getrusage03 0 TINFO : Testcase #04: grandchild maxrss
getrusage03 5 TCONF : getrusage03.c:206: Not enough memory
getrusage03 6 TCONF : getrusage03.c:206: Remaining cases not appropriate for configuration
$ free -m
total used free shared buff/cache available
Mem: 7524 3921 479 926 3123 2236
Swap: 8191 1140 7051
We should probably move read_meminfo() from kernel/mem/lib/mem.c to lib/ somewhere,
maybe with a new parameter that would allow us to skip TBROK.
> +
> int main(int argc, char *argv[])
> {
> int lc;
> @@ -73,12 +82,16 @@ int main(int argc, char *argv[])
>
> setup();
>
> + tst_resm(TINFO, "Available memory: %ldMB\n", get_available_memory_mb());
%lu
> + if (get_available_memory_mb() < DEFAULT_ALLOC_MB)
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
Newline is not necessary.
Regards,
Jan
> +
> + tst_resm(TINFO, "allocate %dMB", DEFAULT_ALLOC_MB);
> + consume(DEFAULT_ALLOC_MB);
> +
> for (lc = 0; TEST_LOOPING(lc); lc++) {
> tst_count = 0;
>
> - tst_resm(TINFO, "allocate 100MB");
> - consume(100);
> -
> inherit_fork();
> inherit_fork2();
> fork_malloc();
> @@ -95,11 +108,13 @@ int main(int argc, char *argv[])
> * expect: initial.self ~= child.self */
> static void inherit_fork(void)
> {
> - tst_resm(TINFO, "Testcase #01: fork inherit");
> -
> SAFE_GETRUSAGE(cleanup, RUSAGE_SELF, &ru);
> tst_resm(TINFO, "initial.self = %ld", ru.ru_maxrss);
>
> + tst_resm(TINFO, "Testcase #01: fork inherit");
> + if (get_available_memory_mb() < DEFAULT_ALLOC_MB)
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
> +
> switch (pid = fork()) {
> case -1:
> tst_brkm(TBROK | TERRNO, cleanup, "fork #1");
> @@ -119,17 +134,19 @@ static void inherit_fork(void)
> }
>
> /* Testcase #02: fork inherit (cont.)
> - * expect: initial.children ~= 100MB, child.children = 0 */
> + * expect: initial.children ~= DEFAULT_ALLOC_MB, child.children = 0 */
> static void inherit_fork2(void)
> {
> - tst_resm(TINFO, "Testcase #02: fork inherit(cont.)");
> + tst_resm(TINFO, "Testcase #02: fork inherit cont.");
> + if (get_available_memory_mb() < DEFAULT_ALLOC_MB)
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_CHILDREN, &ru);
> tst_resm(TINFO, "initial.children = %ld", ru.ru_maxrss);
> if (is_in_delta(ru.ru_maxrss - 102400))
> - tst_resm(TPASS, "initial.children ~= 100MB");
> + tst_resm(TPASS, "initial.children ~= %dMB", DEFAULT_ALLOC_MB);
> else
> - tst_resm(TFAIL, "initial.children !~= 100MB");
> + tst_resm(TFAIL, "initial.children !~= %dMB", DEFAULT_ALLOC_MB);
>
> switch (pid = fork()) {
> case -1:
> @@ -152,7 +169,9 @@ static void inherit_fork2(void)
> * expect: initial.self + 50MB ~= child.self */
> static void fork_malloc(void)
> {
> - tst_resm(TINFO, "Testcase #03: fork + malloc");
> + tst_resm(TINFO, "Testcase #03: fork + malloc");
> + if (get_available_memory_mb() < (DEFAULT_ALLOC_MB+50))
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_SELF, &ru);
> tst_resm(TINFO, "initial.self = %ld", ru.ru_maxrss);
> @@ -181,7 +200,10 @@ static void fork_malloc(void)
> * expect: post_wait.children ~= 300MB */
> static void grandchild_maxrss(void)
> {
> - tst_resm(TINFO, "Testcase #04: grandchild maxrss");
> + tst_resm(TINFO, "Testcase #04: grandchild maxrss");
> + if (get_available_memory_mb() <= (DEFAULT_ALLOC_MB+300))
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
> +
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_CHILDREN, &ru);
> tst_resm(TINFO, "initial.children = %ld", ru.ru_maxrss);
> @@ -215,7 +237,9 @@ static void grandchild_maxrss(void)
> * expect: initial ~= pre_wait, post_wait ~= 400MB */
> static void zombie(void)
> {
> - tst_resm(TINFO, "Testcase #05: zombie");
> + tst_resm(TINFO, "Testcase #05: zombie");
> + if (get_available_memory_mb() <= (DEFAULT_ALLOC_MB+400))
> + tst_brkm(TCONF, cleanup, "Not enough memory\n");
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_CHILDREN, &ru);
> tst_resm(TINFO, "initial.children = %ld", ru.ru_maxrss);
> @@ -258,7 +282,9 @@ static void zombie(void)
> * expect: initial ~= after_zombie */
> static void sig_ign(void)
> {
> - tst_resm(TINFO, "Testcase #06: SIG_IGN");
> + tst_resm(TINFO, "Testcase #06: SIG_IGN");
> + if (get_available_memory_mb() <= (DEFAULT_ALLOC_MB+500))
> + tst_brkm(TCONF, cleanup, "Not enough memory to run test case");
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_CHILDREN, &ru);
> tst_resm(TINFO, "initial.children = %ld", ru.ru_maxrss);
> @@ -294,7 +320,7 @@ static void exec_without_fork(void)
> char str_maxrss_self[BUFSIZ], str_maxrss_child[BUFSIZ];
> long maxrss_self, maxrss_child;
>
> - tst_resm(TINFO, "Testcase #07: exec without fork");
> + tst_resm(TINFO, "Testcase #07: exec without fork");
>
> SAFE_GETRUSAGE(cleanup, RUSAGE_SELF, &ru);
> maxrss_self = ru.ru_maxrss;
> --
> 1.9.1
>
>
More information about the ltp
mailing list