From: Cui Bixuan <cuibixuan@huawei.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2] max_map_count: fix error by using runtime check
Date: Tue, 12 Apr 2016 15:15:58 +0800 [thread overview]
Message-ID: <570CA0AE.6020804@huawei.com> (raw)
In-Reply-To: <20160411170358.GB3466@rei.lan>
There is a error when compile the case to 32bit binary and
run it on 64bit arm kernel, which will wrongly skip one mapping.
Add runtimg check by using the machine from uname(2) to fix it.
Signed-off-by: Cui Bixuan <cuibixuan@huawei.com>
---
testcases/kernel/mem/tunable/max_map_count.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/testcases/kernel/mem/tunable/max_map_count.c b/testcases/kernel/mem/tunable/max_map_count.c
index 295a47b..cc7a4e1 100644
--- a/testcases/kernel/mem/tunable/max_map_count.c
+++ b/testcases/kernel/mem/tunable/max_map_count.c
@@ -59,6 +59,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/utsname.h>
#include "test.h"
#include "mem.h"
@@ -70,6 +71,7 @@ int TST_TOTAL = 1;
static long old_max_map_count;
static long old_overcommit;
+static struct utsname un;
static long count_maps(pid_t pid);
static void max_map_count_test(void);
@@ -104,6 +106,9 @@ void setup(void)
old_max_map_count = get_sys_tune("max_map_count");
old_overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 2, 1);
+
+ if (uname(&un) != 0)
+ tst_brkm(TBROK | TERRNO, NULL, "uname error");
}
void cleanup(void)
@@ -133,6 +138,10 @@ static bool filter_map(const char *line)
if (!strcmp(buf, "[vdso]"))
return true;
#elif defined(__arm__)
+ /* Skip it when run it in aarch64 */
+ if (strcmp(un.machine, "aarch64"))
+ return false;
+
/* Older arm kernels didn't label their vdso maps */
if (!strncmp(line, "ffff0000-ffff1000", 17))
return true;
--
1.8.3.4
next prev parent reply other threads:[~2016-04-12 7:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 11:08 [LTP] max_map_count fail in arm64 system which support lib32 Cui Bixuan
2016-03-22 10:29 ` Cyril Hrubis
2016-03-22 13:49 ` Cui Bixuan
2016-03-22 14:28 ` Cyril Hrubis
2016-03-23 8:53 ` [LTP] [PATCH] max_map_count: fix error by using runtime check Cui Bixuan
2016-03-23 10:22 ` Jan Stancek
2016-03-23 11:59 ` Cui Bixuan
2016-03-31 12:07 ` Cyril Hrubis
2016-04-05 11:47 ` Cui Bixuan
2016-04-11 17:03 ` Cyril Hrubis
2016-04-12 7:15 ` Cui Bixuan [this message]
2016-04-12 13:07 ` [LTP] [PATCH v2] " Cyril Hrubis
2016-03-23 9:00 ` [LTP] max_map_count fail in arm64 system which support lib32 Cui Bixuan
2016-12-16 8:25 ` [LTP] [PATCH] max_map_count: fix a mistake and support it for aarch64_be Cui Bixuan
2016-12-16 10:15 ` [LTP] we can ignore it and discuss the problem at 'Fix wrong checking of aarch64' from the_hoang0709@yahoo.com Cui Bixuan
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=570CA0AE.6020804@huawei.com \
--to=cuibixuan@huawei.com \
--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