From: Li Wang <liwang@redhat.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v2] move_pages12: handle errno EBUSY for madvise(..., MADV_SOFT_OFFLINE)
Date: Thu, 25 Jul 2019 11:37:13 +0800 [thread overview]
Message-ID: <20190725033713.8551-1-liwang@redhat.com> (raw)
The test#2 is going to simulate the race condition, where move_pages()
and soft offline are called on a single hugetlb page concurrently. But,
it return EBUSY and report FAIL in soft-offline a moving hugepage as a
result sometimes.
The root cause seems a call to page_huge_active return false, then the
soft offline action will failed to isolate hugepage with EBUSY return as
below call trace:
In Parent:
madvise(..., MADV_SOFT_OFFLINE)
...
soft_offline_page
soft_offline_in_use_page
soft_offline_huge_page
isolate_huge_page
page_huge_active --> return false at here
In Child:
move_pages()
...
do_move_pages
do_move_pages_to_node
add_page_for_migration
isolate_huge_page --> it has already isolated the hugepage
In this patch, I simply regard the returned EBUSY as a normal situation and
mask it in error handler. Because move_pages is calling add_page_for_migration
to isolate hugepage before do migration, so that's very possible to hit the
collision and return EBUSY on the same page.
Error log:
----------
move_pages12.c:235: INFO: Free RAM 8386256 kB
move_pages12.c:253: INFO: Increasing 2048kB hugepages pool on node 0 to 4
move_pages12.c:263: INFO: Increasing 2048kB hugepages pool on node 1 to 6
move_pages12.c:179: INFO: Allocating and freeing 4 hugepages on node 0
move_pages12.c:179: INFO: Allocating and freeing 4 hugepages on node 1
move_pages12.c:169: PASS: Bug not reproduced
move_pages12.c:81: FAIL: madvise failed: SUCCESS
move_pages12.c:81: FAIL: madvise failed: SUCCESS
move_pages12.c:143: BROK: mmap((nil),4194304,3,262178,-1,0) failed: ENOMEM
move_pages12.c:114: FAIL: move_pages failed: EINVAL
Dmesg:
------
[165435.492170] soft offline: 0x61c00 hugepage failed to isolate
[165435.590252] soft offline: 0x61c00 hugepage failed to isolate
[165435.725493] soft offline: 0x61400 hugepage failed to isolate
Other two fixes in this patch:
* use TERRNO(but not TTERRNO) to catch madvise(..., MADV_SOFT_OFFLINE) errno
* go out test when hugepage allocating failed with ENOMEM
Signed-off-by: Li Wang <liwang@redhat.com>
---
Notes:
v1 --> v2
attempt to retry the mmap() on ENOMEM.
.../kernel/syscalls/move_pages/move_pages12.c | 38 ++++++++++++++-----
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/testcases/kernel/syscalls/move_pages/move_pages12.c b/testcases/kernel/syscalls/move_pages/move_pages12.c
index 964b712fb..203402cfb 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages12.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages12.c
@@ -77,8 +77,8 @@ static void *addr;
static int do_soft_offline(int tpgs)
{
if (madvise(addr, tpgs * hpsz, MADV_SOFT_OFFLINE) == -1) {
- if (errno != EINVAL)
- tst_res(TFAIL | TTERRNO, "madvise failed");
+ if (errno != EINVAL && errno != EBUSY)
+ tst_res(TFAIL | TERRNO, "madvise failed");
return errno;
}
return 0;
@@ -121,7 +121,8 @@ static void do_child(int tpgs)
static void do_test(unsigned int n)
{
- int i;
+ int i, ret, retrys;
+ void *ptr;
pid_t cpid = -1;
int status;
unsigned int twenty_percent = (tst_timeout_remaining() / 5);
@@ -135,19 +136,37 @@ static void do_test(unsigned int n)
if (cpid == 0)
do_child(tcases[n].tpages);
- for (i = 0; i < LOOPS; i++) {
- void *ptr;
+ for (i = 0; i < LOOPS; retrys = 0, i++) {
+retry:
+ ptr = mmap(NULL, tcases[n].tpages * hpsz,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);
+ if (ptr == MAP_FAILED) {
+ if (errno == ENOMEM) {
+ if (retrys < LOOPS) {
+ retrys++;
+ usleep(1000);
+ goto retry;
+ }
+
+ if (i > 0) {
+ tst_res(TINFO, "Test run %d times", i);
+ goto out;
+ }
+ }
+
+ tst_brk(TBROK | TERRNO, "Cannot allocate hugepage");
+ }
- ptr = SAFE_MMAP(NULL, tcases[n].tpages * hpsz,
- PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);
if (ptr != addr)
tst_brk(TBROK, "Failed to mmap at desired addr");
memset(addr, 0, tcases[n].tpages * hpsz);
if (tcases[n].offline) {
- if (do_soft_offline(tcases[n].tpages) == EINVAL) {
+ ret = do_soft_offline(tcases[n].tpages);
+
+ if (ret == EINVAL) {
SAFE_KILL(cpid, SIGKILL);
SAFE_WAITPID(cpid, &status, 0);
SAFE_MUNMAP(addr, tcases[n].tpages * hpsz);
@@ -163,6 +182,7 @@ static void do_test(unsigned int n)
break;
}
+out:
SAFE_KILL(cpid, SIGKILL);
SAFE_WAITPID(cpid, &status, 0);
if (!WIFEXITED(status))
--
2.20.1
next reply other threads:[~2019-07-25 3:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 3:37 Li Wang [this message]
2019-07-26 12:12 ` [LTP] [PATCH v2] move_pages12: handle errno EBUSY for madvise(..., MADV_SOFT_OFFLINE) Cyril Hrubis
2019-07-26 13:21 ` Li Wang
2019-07-26 13:31 ` Cyril Hrubis
2019-07-29 4:53 ` 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=20190725033713.8551-1-liwang@redhat.com \
--to=liwang@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.