From: "Huang, Ying" <ying.huang@intel.com>
To: Oscar Salvador <osalvador@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Zi Yan <ziy@nvidia.com>, Yang Shi <shy828301@gmail.com>
Subject: Re: [PATCH -V2 5/7] migrate_pages(): fix failure counting for THP on -ENOSYS
Date: Wed, 13 Jul 2022 16:30:27 +0800 [thread overview]
Message-ID: <87wnch4dp8.fsf@yhuang6-desk2.ccr.corp.intel.com> (raw)
In-Reply-To: <YswW7C5jzQNmeOsL@localhost.localdomain> (Oscar Salvador's message of "Mon, 11 Jul 2022 14:26:20 +0200")
Oscar Salvador <osalvador@suse.de> writes:
> On Mon, Jul 11, 2022 at 04:49:46PM +0800, Huang Ying wrote:
>> If THP or hugetlbfs page migration isn't supported, unmap_and_move()
>> or unmap_and_move_huge_page() will return -ENOSYS. For THP, splitting
>> will be tried, but if splitting doesn't succeed, the THP will be left
>> in "from" list wrongly. If some other pages are retried, the THP
>> migration failure will counted again. This is fixed via moving the
>> failure THP from "from" to "ret_pages".
>>
>> Another issue of the original code is that the unsupported failure
>> processing isn't consistent between THP and hugetlbfs page. Make them
>> consistent in this patch to make the code easier to be understood too.
>>
>> Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
>> Fixes: 5984fabb6e82 ("mm: move_pages: report the number of non-attempted pages")
>> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
>> Cc: Zi Yan <ziy@nvidia.com>
>> Cc: Yang Shi <shy828301@gmail.com>
>> ---
>> mm/migrate.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/mm/migrate.c b/mm/migrate.c
>> index 4bceba143db0..8cce73b7c046 100644
>> --- a/mm/migrate.c
>> +++ b/mm/migrate.c
>> @@ -1192,10 +1192,8 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
>> * tables or check whether the hugepage is pmd-based or not before
>> * kicking migration.
>> */
>> - if (!hugepage_migration_supported(page_hstate(hpage))) {
>> - list_move_tail(&hpage->lru, ret);
>> + if (!hugepage_migration_supported(page_hstate(hpage)))
>> return -ENOSYS;
>> - }
>>
>> if (page_count(hpage) == 1) {
>> /* page was freed from under us. So we are done. */
>> @@ -1392,6 +1390,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
>> * page will be put back
>> * -EAGAIN: stay on the from list
>> * -ENOMEM: stay on the from list
>> + * -ENOSYS: stay on the from list
>> * Other errno: put on ret_pages list then splice to
>> * from list
>> */
>> @@ -1421,6 +1420,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
>> }
>>
>> nr_failed_pages += nr_subpages;
>> + list_move_tail(&page->lru, &ret_pages);
>
> I must be missing something, but migrate_pages() calls unmap_and_move_huge_page()
> with ret being ret_pages, so
>
> list_move_tail(&hpage->lru, ret) == list_move_tail(&page->lru, &ret_pages)
>
> Yet, you say "This is fixed via moving the failure THP from "from" to "ret_pages"".
> /me confused.
To make it consistent between hugetlb page and THP/normal page, I have
revised the unmap_and_move_huge_page() via deleting the list_move_tail()
there for ENOSYS. After that, we move the hugetlb page and THP/normal
page in the same way in migrate_pages().
Best Regards,
Huang, Ying
next prev parent reply other threads:[~2022-07-13 8:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 8:49 [PATCH -V2 0/7] migrate_pages(): fix several bugs in error path Huang Ying
2022-07-11 8:49 ` [PATCH -V2 1/7] migrate: fix syscall move_pages() return value for failure Huang Ying
2022-07-11 11:52 ` Oscar Salvador
2022-07-12 0:59 ` Huang, Ying
2022-07-11 8:49 ` [PATCH -V2 2/7] migrate_pages(): remove unnecessary list_safe_reset_next() Huang Ying
2022-07-11 11:57 ` Oscar Salvador
2022-07-11 8:49 ` [PATCH -V2 3/7] migrate_pages(): fix THP failure counting for -ENOMEM Huang Ying
2022-07-11 12:01 ` Oscar Salvador
2022-07-11 8:49 ` [PATCH -V2 4/7] migrate_pages(): fix failure counting for THP subpages retrying Huang Ying
2022-07-11 12:13 ` Oscar Salvador
2022-07-11 8:49 ` [PATCH -V2 5/7] migrate_pages(): fix failure counting for THP on -ENOSYS Huang Ying
2022-07-11 12:26 ` Oscar Salvador
2022-07-13 8:30 ` Huang, Ying [this message]
2022-07-11 8:49 ` [PATCH -V2 6/7] migrate_pages(): fix failure counting for THP splitting Huang Ying
2022-07-11 12:39 ` Oscar Salvador
2022-07-11 8:49 ` [PATCH -V2 7/7] migrate_pages(): fix failure counting for retry Huang Ying
2022-07-11 12:52 ` Oscar Salvador
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=87wnch4dp8.fsf@yhuang6-desk2.ccr.corp.intel.com \
--to=ying.huang@intel.com \
--cc=akpm@linux-foundation.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=osalvador@suse.de \
--cc=shy828301@gmail.com \
--cc=ziy@nvidia.com \
/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).