[LTP] [PATCH v2] lib/mem.c: handle the case oom0{3, 5} exit with 'EAGAIN' situation
Li Wang
liwang@redhat.com
Wed Sep 16 11:55:32 CEST 2015
v1 --> v2
1. limited the number of loops
2. added the usleep(300) to wait resource freed
Sometimes oom0{3,5} failed as the following results:
oom05 0 TINFO : start OOM testing for mlocked pages.
oom05 0 TINFO : expected victim is 3371.
oom05 0 TINFO : thread (3fff788ff1c0), allocating 3221225472 bytes.
...
oom05 5 TFAIL : mem.c:153: victim unexpectedly ended with retcode: 11, expected: 12
In the OOM test, that tries to consume all memory. But the test doesn't retry to mlock, it simply
exits with errno returned by mlock. At the moment testcase is expecting either ENOMEM or getting
killed by kernel.
Here do retry the function if mlock() fail with 'EAGAIN' errno.
Signed-off-by: Li Wang <liwang@redhat.com>
---
testcases/kernel/mem/lib/mem.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c
index 8fe4bf0..b8a55e2 100644
--- a/testcases/kernel/mem/lib/mem.c
+++ b/testcases/kernel/mem/lib/mem.c
@@ -30,6 +30,7 @@ static int alloc_mem(long int length, int testcase)
{
char *s;
long i, pagesz = getpagesize();
+ int loop = 10;
tst_resm(TINFO, "thread (%lx), allocating %ld bytes.",
(unsigned long) pthread_self(), length);
@@ -39,8 +40,15 @@ static int alloc_mem(long int length, int testcase)
if (s == MAP_FAILED)
return errno;
- if (testcase == MLOCK && mlock(s, length) == -1)
- return errno;
+ if (testcase == MLOCK) {
+ while (mlock(s, length) == -1 && loop > 0) {
+ if (EAGAIN != errno)
+ return errno;
+ usleep(300);
+ loop--;
+ }
+ }
+
#ifdef HAVE_MADV_MERGEABLE
if (testcase == KSM && madvise(s, length, MADV_MERGEABLE) == -1)
return errno;
--
1.8.3.1
More information about the Ltp
mailing list