From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 1/2] syscalls/ioctl: ioctl_sg01.c: ioctl_sg01 invoked oom-killer
Date: Wed, 27 Jan 2021 10:50:13 +0100 [thread overview]
Message-ID: <YBE3VUzecdhq7gJQ@yuki.lan> (raw)
In-Reply-To: <2021012716492236006117@chinatelecom.cn>
> Signed-off-by: Xinpeng Liu <liuxp11@chinatelecom.cn>
> ---
> lib/tst_memutils.c | 29 ++++++++++++++++++++++++++---
> 1 file changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
> index dd09db4..21df9a8 100644
> --- a/lib/tst_memutils.c
> +++ b/lib/tst_memutils.c
> @@ -10,14 +10,33 @@
>
> #define TST_NO_DEFAULT_MAIN
> #include "tst_test.h"
> +#include "tst_safe_stdio.h"
>
> #define BLOCKSIZE (16 * 1024 * 1024)
>
> +static unsigned long get_available_ram(void)
> +{
Can we prefix this function with tst_ and make it non-static?
I guess that there may be other tests that may use it later on.
> + char buf[60]; /* actual lines we expect are ~30 chars or less */
> + unsigned long available_kb = 0;
> + FILE *fp;
> +
> + fp = SAFE_FOPEN("/proc/meminfo","r");
> + while (fgets(buf, sizeof(buf), fp)) {
> + if (sscanf(buf, "MemAvailable: %lu %*s\n", &available_kb) == 1){
> + break;
> + }
> + }
> + SAFE_FCLOSE(fp);
Just use FILE_LINES_SCANF() instead.
Also we should fall back to something as 90% of (MemFree + Cached) here
if MemAvailable is not present so that the function returns sensible
number on older kernels as well.
> + return 1024 * available_kb;
Can we just return kilobytes instead?
It will be less likely to overflow if we do all the calculations in
kilobytes instead.
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2021-01-27 9:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 10:24 [LTP] [PATCH 1/2] syscalls/ioctl: ioctl_sg01.c: ioctl_sg01 invoked oom-killer Xinpeng Liu
2021-01-25 10:24 ` [LTP] [PATCH 2/2] syscalls/ioctl: ioctl_sg01.c:TBROK: Test killed! Xinpeng Liu
2021-01-27 4:41 ` Li Wang
2021-01-27 4:27 ` [LTP] [PATCH 1/2] syscalls/ioctl: ioctl_sg01.c: ioctl_sg01 invoked oom-killer Li Wang
2021-01-27 5:42 ` liuxp11
2021-01-27 6:54 ` liuxp11
2021-01-27 7:58 ` Li Wang
2021-01-27 8:05 ` Li Wang
2021-01-27 9:24 ` Cyril Hrubis
2021-01-27 10:03 ` Li Wang
2021-01-27 8:49 ` liuxp11
2021-01-27 9:50 ` Cyril Hrubis [this message]
2021-01-27 9:39 ` Cyril Hrubis
2021-01-27 9:53 ` Martin Doucha
2021-01-27 10:07 ` liuxp11
2021-01-27 10:04 ` liuxp11
2021-01-27 11:28 ` Martin Doucha
2021-01-27 11:41 ` liuxp11
2021-01-27 11:46 ` Martin Doucha
2021-01-27 11:50 ` liuxp11
2021-03-04 7:52 ` Li Wang
2021-03-05 5:52 ` liuxp11
2021-03-05 9:02 ` Li Wang
2021-03-24 9:26 ` liuxp11
2021-04-11 5:01 ` Li Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YBE3VUzecdhq7gJQ@yuki.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox