From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <mike.kravetz@oracle.com>, <shy828301@gmail.com>,
<willy@infradead.org>, <ying.huang@intel.com>, <ziy@nvidia.com>,
<minchan@kernel.org>, <apopple@nvidia.com>,
<ave.hansen@linux.intel.com>, <o451686892@gmail.com>,
<almasrymina@google.com>, <jhubbard@nvidia.com>,
<rcampbell@nvidia.com>, <peterx@redhat.com>,
<naoya.horiguchi@nec.com>, <mhocko@suse.com>, <riel@redhat.com>,
<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<linmiaohe@huawei.com>
Subject: [PATCH 09/16] mm/migration: remove some duplicated codes in migrate_pages
Date: Fri, 4 Mar 2022 17:34:02 +0800 [thread overview]
Message-ID: <20220304093409.25829-10-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220304093409.25829-1-linmiaohe@huawei.com>
Remove the duplicated codes in migrate_pages to simplify the code. Minor
readability improvement. No functional change intended.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/migrate.c | 36 ++++++++++++------------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index abb0c6715e1f..cb970d201147 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1414,14 +1414,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
nr_thp_split++;
goto retry;
}
-
- nr_failed_pages += nr_subpages;
- break;
- }
-
/* Hugetlb migration is unsupported */
- if (!no_subpage_counting)
+ } else if (!no_subpage_counting) {
nr_failed++;
+ }
+
nr_failed_pages += nr_subpages;
break;
case -ENOMEM:
@@ -1436,28 +1433,22 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
nr_thp_split++;
goto retry;
}
-
- nr_failed_pages += nr_subpages;
- goto out;
+ } else if (!no_subpage_counting) {
+ nr_failed++;
}
- if (!no_subpage_counting)
- nr_failed++;
nr_failed_pages += nr_subpages;
goto out;
case -EAGAIN:
- if (is_thp) {
+ if (is_thp)
thp_retry++;
- break;
- }
- retry++;
+ else
+ retry++;
break;
case MIGRATEPAGE_SUCCESS:
nr_succeeded += nr_subpages;
- if (is_thp) {
+ if (is_thp)
nr_thp_succeeded++;
- break;
- }
break;
default:
/*
@@ -1466,14 +1457,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
* removed from migration page list and not
* retried in the next outer loop.
*/
- if (is_thp) {
+ if (is_thp)
nr_thp_failed++;
- nr_failed_pages += nr_subpages;
- break;
- }
-
- if (!no_subpage_counting)
+ else if (!no_subpage_counting)
nr_failed++;
+
nr_failed_pages += nr_subpages;
break;
}
--
2.23.0
next prev parent reply other threads:[~2022-03-04 9:35 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 9:33 [PATCH 00/16] A few cleanup and fixup patches for migration Miaohe Lin
2022-03-04 9:33 ` [PATCH 01/16] mm/migration: remove unneeded local variable mapping_locked Miaohe Lin
2022-03-04 13:48 ` Muchun Song
2022-03-07 2:00 ` Huang, Ying
2022-03-08 11:41 ` Miaohe Lin
2022-03-04 9:33 ` [PATCH 02/16] mm/migration: remove unneeded out label Miaohe Lin
2022-03-04 12:12 ` Muchun Song
2022-03-07 2:03 ` Huang, Ying
2022-03-08 11:44 ` Miaohe Lin
2022-03-04 9:33 ` [PATCH 03/16] mm/migration: remove unneeded local variable page_lru Miaohe Lin
2022-03-07 10:58 ` Alistair Popple
2022-03-08 11:29 ` Miaohe Lin
2022-03-04 9:33 ` [PATCH 04/16] mm/migration: reduce the rcu lock duration Miaohe Lin
2022-03-04 12:16 ` Muchun Song
2022-03-07 2:32 ` Huang, Ying
2022-03-08 12:09 ` Miaohe Lin
2022-03-09 1:02 ` Huang, Ying
2022-03-09 8:28 ` Miaohe Lin
2022-03-04 9:33 ` [PATCH 05/16] mm/migration: fix the confusing PageTransHuge check Miaohe Lin
2022-03-04 12:20 ` Muchun Song
2022-03-04 9:33 ` [PATCH 06/16] mm/migration: use helper function vma_lookup() in add_page_for_migration Miaohe Lin
2022-03-04 9:34 ` [PATCH 07/16] mm/migration: use helper macro min_t in do_pages_stat Miaohe Lin
2022-03-04 13:51 ` Muchun Song
2022-03-07 1:14 ` Andrew Morton
2022-03-07 11:51 ` Miaohe Lin
2022-03-04 9:34 ` [PATCH 08/16] mm/migration: avoid unneeded nodemask_t initialization Miaohe Lin
2022-03-04 13:57 ` Muchun Song
2022-03-07 2:31 ` Baolin Wang
2022-03-04 9:34 ` Miaohe Lin [this message]
2022-03-04 15:16 ` [PATCH 09/16] mm/migration: remove some duplicated codes in migrate_pages Zi Yan
2022-03-07 1:44 ` Baolin Wang
2022-03-04 9:34 ` [PATCH 10/16] mm/migration: remove PG_writeback handle in folio_migrate_flags Miaohe Lin
2022-03-07 1:21 ` Andrew Morton
2022-03-07 12:44 ` Miaohe Lin
2022-03-04 9:34 ` [PATCH 11/16] mm/migration: remove unneeded lock page and PageMovable check Miaohe Lin
2022-03-04 9:34 ` [PATCH 12/16] mm/migration: fix potential page refcounts leak in migrate_pages Miaohe Lin
2022-03-04 15:21 ` Zi Yan
2022-03-07 1:57 ` Baolin Wang
2022-03-07 5:02 ` Huang, Ying
2022-03-07 6:00 ` Baolin Wang
2022-03-07 12:03 ` Miaohe Lin
2022-03-07 12:01 ` Miaohe Lin
2022-03-07 5:01 ` Huang, Ying
2022-03-07 12:11 ` Miaohe Lin
2022-03-04 9:34 ` [PATCH 13/16] mm/migration: return errno when isolate_huge_page failed Miaohe Lin
2022-03-05 2:23 ` Muchun Song
2022-03-07 11:46 ` Miaohe Lin
2022-03-07 2:14 ` Baolin Wang
2022-03-07 12:20 ` Miaohe Lin
2022-03-08 1:32 ` Baolin Wang
2022-03-08 6:34 ` Miaohe Lin
2022-03-07 5:07 ` Huang, Ying
2022-03-08 12:12 ` Miaohe Lin
2022-03-09 1:00 ` Huang, Ying
2022-03-09 8:29 ` Miaohe Lin
2022-03-04 9:34 ` [PATCH 14/16] mm/migration: fix potential invalid node access for reclaim-based migration Miaohe Lin
2022-03-07 2:25 ` Baolin Wang
2022-03-07 5:14 ` Huang, Ying
2022-03-07 7:04 ` Baolin Wang
2022-03-08 11:46 ` Miaohe Lin
2022-03-07 5:14 ` Huang, Ying
2022-03-04 9:34 ` [PATCH 15/16] mm/migration: fix possible do_pages_stat_array racing with memory offline Miaohe Lin
2022-03-07 5:21 ` Huang, Ying
2022-03-07 7:01 ` Muchun Song
2022-03-07 7:42 ` Huang, Ying
2022-03-08 11:33 ` Miaohe Lin
2022-03-04 9:34 ` [PATCH 16/16] mm/migration: fix potential pte_unmap on an not mapped pte Miaohe Lin
2022-03-07 5:37 ` Huang, Ying
2022-03-08 12:19 ` Miaohe Lin
2022-03-09 0:56 ` Huang, Ying
2022-03-09 8:48 ` Miaohe Lin
2022-03-07 7:35 ` Alistair Popple
2022-03-08 11:55 ` Miaohe Lin
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=20220304093409.25829-10-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=almasrymina@google.com \
--cc=apopple@nvidia.com \
--cc=ave.hansen@linux.intel.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=minchan@kernel.org \
--cc=naoya.horiguchi@nec.com \
--cc=o451686892@gmail.com \
--cc=peterx@redhat.com \
--cc=rcampbell@nvidia.com \
--cc=riel@redhat.com \
--cc=shy828301@gmail.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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).