linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Huang Ying <ying.huang@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Huang Ying <ying.huang@intel.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	Zi Yan <ziy@nvidia.com>, Yang Shi <shy828301@gmail.com>
Subject: [PATCH 2/7] migrate_pages(): remove unnecessary list_safe_reset_next()
Date: Fri, 24 Jun 2022 10:53:04 +0800	[thread overview]
Message-ID: <20220624025309.1033400-3-ying.huang@intel.com> (raw)
In-Reply-To: <20220624025309.1033400-1-ying.huang@intel.com>

Before commit b5bade978e9b ("mm: migrate: fix the return value of
migrate_pages()"), the tail pages of THP will be put in the "from"
list directly.  So one of the loop cursors (page2) needs to be reset,
as is done in try_split_thp() via list_safe_reset_next().  But after
the commit, the tail pages of THP will be put in a dedicated
list (thp_split_pages).  That is, the "from" list will not be changed
during splitting.  So, it's unnecessary to call list_safe_reset_next()
anymore.

This is a code cleanup, no functionality changes are expected.

Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Yang Shi <shy828301@gmail.com>
---
 mm/migrate.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index a271554be7a1..82444e7df9f1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1300,16 +1300,13 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 	return rc;
 }
 
-static inline int try_split_thp(struct page *page, struct page **page2,
-				struct list_head *from)
+static inline int try_split_thp(struct page *page, struct list_head *split_pages)
 {
-	int rc = 0;
+	int rc;
 
 	lock_page(page);
-	rc = split_huge_page_to_list(page, from);
+	rc = split_huge_page_to_list(page, split_pages);
 	unlock_page(page);
-	if (!rc)
-		list_safe_reset_next(page, *page2, lru);
 
 	return rc;
 }
@@ -1413,7 +1410,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
 				/* THP migration is unsupported */
 				if (is_thp) {
 					nr_thp_failed++;
-					if (!try_split_thp(page, &page2, &thp_split_pages)) {
+					if (!try_split_thp(page, &thp_split_pages)) {
 						nr_thp_split++;
 						goto retry;
 					}
@@ -1432,7 +1429,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
 				 */
 				if (is_thp && !nosplit) {
 					nr_thp_failed++;
-					if (!try_split_thp(page, &page2, &thp_split_pages)) {
+					if (!try_split_thp(page, &thp_split_pages)) {
 						nr_thp_split++;
 						goto retry;
 					}
-- 
2.30.2



  parent reply	other threads:[~2022-06-24  2:53 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24  2:53 [PATCH 0/7] migrate_pages(): fix several bugs in error path Huang Ying
2022-06-24  2:53 ` [PATCH 1/7] migrate: fix syscall move_pages() return value for failure Huang Ying
2022-06-24  2:53 ` Huang Ying [this message]
2022-06-24  9:22   ` [PATCH 2/7] migrate_pages(): remove unnecessary list_safe_reset_next() Baolin Wang
2022-06-24  2:53 ` [PATCH 3/7] migrate_pages(): fix THP failure counting for -ENOMEM Huang Ying
2022-06-24  9:36   ` Baolin Wang
2022-06-24  2:53 ` [PATCH 4/7] migrate_pages(): fix failure counting for THP subpages retrying Huang Ying
2022-06-24  9:45   ` Baolin Wang
2022-06-27  1:46     ` Huang, Ying
2022-06-27  3:59       ` Baolin Wang
2022-06-27  4:23         ` Huang, Ying
2022-06-27  5:56           ` Baolin Wang
2022-06-24  2:53 ` [PATCH 5/7] migrate_pages(): fix failure counting for THP on -ENOSYS Huang Ying
2022-06-24  9:51   ` Baolin Wang
2022-06-24 10:11 ` [PATCH 0/7] migrate_pages(): fix several bugs in error path Baolin Wang
2022-06-27  2:30   ` Huang, Ying
2022-06-27  2:24 ` [PATCH 6/7] migrate_pages(): fix failure counting for THP splitting Huang Ying
2022-06-27  4:24   ` Baolin Wang
2022-06-27  2:25 ` [PATCH 7/7] migrate_pages(): fix failure counting for retry Huang Ying
2022-06-27  4:29   ` Baolin Wang
2022-06-27  6:21     ` Huang, Ying

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=20220624025309.1033400-3-ying.huang@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=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).