From: Zi Yan <zi.yan@sent.com>
To: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Zi Yan <zi.yan@cs.rutgers.edu>
Subject: [RFC PATCH 1/4] mm: madvise: read loop's step size beforehand in madvise_inject_error(), prepare for THP support.
Date: Mon, 14 Aug 2017 21:52:13 -0400 [thread overview]
Message-ID: <20170815015216.31827-2-zi.yan@sent.com> (raw)
In-Reply-To: <20170815015216.31827-1-zi.yan@sent.com>
From: Zi Yan <zi.yan@cs.rutgers.edu>
The loop in madvise_inject_error() reads its step size from a page
after it is soft-offlined. It works because the page is:
1) a hugetlb page: the page size does not change;
2) a base page: the page size does not change;
3) a THP: soft-offline always splits THPs, thus, it is OK to use
PAGE_SIZE as step size.
It will be a problem when soft-offline supports THP migrations.
When a THP is migrated without split during soft-offlining, the THP
is split after migration, thus, before and after soft-offlining page
sizes do not match. This causes a THP to be unnecessarily soft-lined,
at most, 511 times, wasting free space.
Signed-off-by: Zi Yan <zi.yan@cs.rutgers.edu>
---
mm/madvise.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/mm/madvise.c b/mm/madvise.c
index 47d8d8a25eae..49f6774db259 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -612,19 +612,22 @@ static long madvise_remove(struct vm_area_struct *vma,
static int madvise_inject_error(int behavior,
unsigned long start, unsigned long end)
{
- struct page *page;
+ struct page *page = NULL;
+ unsigned long page_size = PAGE_SIZE;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
- for (; start < end; start += PAGE_SIZE <<
- compound_order(compound_head(page))) {
+ for (; start < end; start += page_size) {
int ret;
ret = get_user_pages_fast(start, 1, 0, &page);
if (ret != 1)
return ret;
+ page_size = (PAGE_SIZE << compound_order(compound_head(page))) -
+ (PAGE_SIZE * (page - compound_head(page)));
+
if (PageHWPoison(page)) {
put_page(page);
continue;
@@ -637,6 +640,12 @@ static int madvise_inject_error(int behavior,
ret = soft_offline_page(page, MF_COUNT_INCREASED);
if (ret)
return ret;
+ /*
+ * Non hugetlb pages either have PAGE_SIZE
+ * or are split into PAGE_SIZE
+ */
+ if (!PageHuge(page))
+ page_size = PAGE_SIZE;
continue;
}
pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n",
@@ -645,6 +654,12 @@ static int madvise_inject_error(int behavior,
ret = memory_failure(page_to_pfn(page), 0, MF_COUNT_INCREASED);
if (ret)
return ret;
+ /*
+ * Non hugetlb pages either have PAGE_SIZE
+ * or are split into PAGE_SIZE
+ */
+ if (!PageHuge(page))
+ page_size = PAGE_SIZE;
}
return 0;
}
--
2.13.2
next prev parent reply other threads:[~2017-08-15 1:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 1:52 [RFC PATCH 0/4] mm: hwpoison: soft-offline support for thp migration Zi Yan
2017-08-15 1:52 ` Zi Yan [this message]
2017-08-23 7:49 ` [RFC PATCH 1/4] mm: madvise: read loop's step size beforehand in madvise_inject_error(), prepare for THP support Naoya Horiguchi
2017-08-23 14:20 ` Zi Yan
2017-08-24 4:26 ` Naoya Horiguchi
2017-08-24 14:26 ` Zi Yan
2017-08-15 1:52 ` [RFC PATCH 2/4] mm: soft-offline: Change soft_offline_page() interface to tell if the page is split or not Zi Yan
2017-08-15 1:52 ` [RFC PATCH 3/4] mm: soft-offline: retry to split and soft-offline the raw error if the original THP offlining fails Zi Yan
2017-08-24 7:31 ` Naoya Horiguchi
2017-08-15 1:52 ` [RFC PATCH 4/4] mm: hwpoison: soft offline supports thp migration Zi Yan
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=20170815015216.31827-2-zi.yan@sent.com \
--to=zi.yan@sent.com \
--cc=gregkh@linuxfoundation.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=zi.yan@cs.rutgers.edu \
/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;
as well as URLs for NNTP newsgroup(s).