Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0F9CC64EC7 for ; Wed, 1 Mar 2023 11:07:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44AE56B0071; Wed, 1 Mar 2023 06:07:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FA5D6B0072; Wed, 1 Mar 2023 06:07:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C1236B0073; Wed, 1 Mar 2023 06:07:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 190336B0071 for ; Wed, 1 Mar 2023 06:07:34 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BBE2F415D6 for ; Wed, 1 Mar 2023 11:07:33 +0000 (UTC) X-FDA: 80520053586.03.C6D9E3F Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 32D0716002B for ; Wed, 1 Mar 2023 11:07:30 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677668851; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mGOQnp9VH3Ax0cDRNUXcZIr4r1d4P/I2118AXPXX81g=; b=VO3Ub2rx9F8NeFJYWuEIJUCLwPfi6plVnbO8hyxSwAPtjuchDTH66g38R0MWgCibKmhC1F DUAtBtUG7OPH/w9jdHmVZ3K250DTCizwE6FMKtAEiFIzyNFUCIxkQSyKQxUbzkdy7DZwpJ rduGrSl1DkWREPaf9m0SQUwje4bsi9M= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677668851; a=rsa-sha256; cv=none; b=didJu5RKzbEugOFq+d6XviSA3FQlyN18GCahOovfSnyDMNsIsJwHJA7rynUZ1XOdF5wCTa 4Rqb+baE3+fLPtPvi97QgbD/R7BtQ70Rv8MowMqc7SBrC1z+crYtqIYXa5Q0vzW7f92+Uv jmlnUZDp2SSI/dH52ag9VvUFdbtimLI= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0Vct0REy_1677668846; Received: from 30.97.48.59(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vct0REy_1677668846) by smtp.aliyun-inc.com; Wed, 01 Mar 2023 19:07:26 +0800 Message-ID: Date: Wed, 1 Mar 2023 19:07:32 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH 2/3] migrate_pages: move split folios processing out of migrate_pages_batch() To: "Huang, Ying" Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Hugh Dickins , "Xu, Pengfei" , Christoph Hellwig , Stefan Roesch , Tejun Heo , Xin Hao , Zi Yan , Yang Shi , Matthew Wilcox , Mike Kravetz References: <20230224141145.96814-1-ying.huang@intel.com> <20230224141145.96814-3-ying.huang@intel.com> <87v8jl9dx5.fsf@yhuang6-desk2.ccr.corp.intel.com> From: Baolin Wang In-Reply-To: <87v8jl9dx5.fsf@yhuang6-desk2.ccr.corp.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 32D0716002B X-Stat-Signature: 8j4pmnhf6sa18o8c7s5k8ig6hjwjffjd X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677668850-753830 X-HE-Meta: U2FsdGVkX18/e8ZJ6Uiq2MgdadmqaOG25GMIcRAEMOPGqvXahNFWeNqEt3bpbZNyzGFXgCOV3O0Ilq/P3bi947r1jWotnnKzTLU3X2jTM6tloKM6tB8nBlw7i/UF3krTceddFotb2Ev0qutVY2itB6mOTlu8j7+WGxwYlsN8B44r0WybJ5IL/rq20a2XFB0GlMCcGAJDz8QOKunIbvIIZpwvZrWtbq1isaNnu0ep0lkWoaU9k62g5VDHnZLmoY95S08LNPUR6I8mRDVx1B9yvpU8S9acLHH3Bbl9JonNeL504GyTPn28PiJlBz9moPe2gu5M2rLbCs5OV9QLrk6MSgypAxLKcoIhFjS1xMWrakFCmy7i5BOIDgWD2yCFNP+W05wndsrxh2n7nf5Ipow1yEPXU3O+7krYr76KnjLaAiPqwK5xwk6vsgxyqZQtMGIonrZ4LAJO2VlZw1GFq4UJNM5eV1ylgNbjtvWnhKVrs64dXzVZ8j7Ufwi5Gx7r8M1smABt0h81fY/JBrnQd4c773jyibapfWnc0xStrQWTlqojOPxOIak3OQSBf8RYBILC8TFDYpxE5NJqitwlTTS4dRz4t+W74HCJeA1TUBsjZtdrPhEVxbfOs2gzv4Kz1LOMrdaVS+S3SpjCLXCWIO5CfpJl8D5UokKq909Pl1Zn6O67dwbhvGOAfANOF0WeAgFOhA44KBQeTpBXxkvh8cptw0CoYj5KRUPAbC1IClzDMSkb1lGupl7yjuJqt8FZ2xfAbtDcvb440ylZgB27n3AHmCgtDV1Rl6zt5p9lkiuyzZvzu/ZEJ2q2wnwuHTB7B9wxmKVZRyCKBhjEJC1FW6J/FZ1qMgvIMTNuiTxSqKIUgoh0g2c+TyFjS9Uj1H6yRZwYqs/xPBSpVFBe3agMAa6bFosNIsBVb4v3b1NULLVZMrZ7B8qLW6tbegDRXJcWPjAUPEKLXqumhMWMKcWGYxn O5tZ1Zbv EGzIwjzOPn/tLfhXhkDfEbT+WjRb13DBFW+0OC/naKiSP/JoRy9SBtQQhI8kabVuj1M57Wg8FsZEAwmwfLNWrwA9TP2X3jfqjne4qRr47vhaj3rhrrv8WNRxK6uvlxfT0wYmS1M/Fj1qWq9O6cAW6cKi09N2nUm4iWsbfG37/zKuqfxF/kBjwysamyNw7BC+kjzsLQj9p+b7DZ+8oKMlaoVmtQbgyQRQl8Hhpx0K61MkS/swm/90hyjU5MMP8bqir4vc+TahQ7AFtucAZQt5y+4AbhdkmM1WHzTdMI6ySdWwMgAa5eHhrjsUEpGvmq+bjZLvDnAoq3EWmzA4Omx8H9RoGtq8p8tXKxZh1CjbMfAR1SvcZxK/tLuQqYEIzcyezKhtwN0LNfdp/tRi+jc5tTUUODkZmKhISol3h X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 3/1/2023 2:35 PM, Huang, Ying wrote: > Baolin Wang writes: > >> On 2/24/2023 10:11 PM, Huang Ying wrote: >>> To simplify the code logic and reduce the line number. >>> Signed-off-by: "Huang, Ying" >>> Cc: Hugh Dickins >>> Cc: "Xu, Pengfei" >>> Cc: Christoph Hellwig >>> Cc: Stefan Roesch >>> Cc: Tejun Heo >>> Cc: Xin Hao >>> Cc: Zi Yan >>> Cc: Yang Shi >>> Cc: Baolin Wang >>> Cc: Matthew Wilcox >>> Cc: Mike Kravetz >>> --- >>> mm/migrate.c | 76 ++++++++++++++++++---------------------------------- >>> 1 file changed, 26 insertions(+), 50 deletions(-) >>> diff --git a/mm/migrate.c b/mm/migrate.c >>> index 7ac37dbbf307..91198b487e49 100644 >>> --- a/mm/migrate.c >>> +++ b/mm/migrate.c >>> @@ -1605,9 +1605,10 @@ static int migrate_hugetlbs(struct list_head *from, new_page_t get_new_page, >>> static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> free_page_t put_new_page, unsigned long private, >>> enum migrate_mode mode, int reason, struct list_head *ret_folios, >>> - struct migrate_pages_stats *stats) >>> + struct list_head *split_folios, struct migrate_pages_stats *stats, >>> + int nr_pass) >>> { >>> - int retry; >>> + int retry = 1; >>> int large_retry = 1; >>> int thp_retry = 1; >>> int nr_failed = 0; >>> @@ -1617,19 +1618,12 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> bool is_large = false; >>> bool is_thp = false; >>> struct folio *folio, *folio2, *dst = NULL, *dst2; >>> - int rc, rc_saved, nr_pages; >>> - LIST_HEAD(split_folios); >>> + int rc, rc_saved = 0, nr_pages; >>> LIST_HEAD(unmap_folios); >>> LIST_HEAD(dst_folios); >>> bool nosplit = (reason == MR_NUMA_MISPLACED); >>> - bool no_split_folio_counting = false; >>> -retry: >>> - rc_saved = 0; >>> - retry = 1; >>> - for (pass = 0; >>> - pass < NR_MAX_MIGRATE_PAGES_RETRY && (retry || large_retry); >>> - pass++) { >>> + for (pass = 0; pass < nr_pass && (retry || large_retry); pass++) { >>> retry = 0; >>> large_retry = 0; >>> thp_retry = 0; >>> @@ -1660,7 +1654,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> if (!thp_migration_supported() && is_thp) { >>> nr_large_failed++; >>> stats->nr_thp_failed++; >>> - if (!try_split_folio(folio, &split_folios)) { >>> + if (!try_split_folio(folio, split_folios)) { >>> stats->nr_thp_split++; >>> continue; >>> } >>> @@ -1692,7 +1686,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> stats->nr_thp_failed += is_thp; >>> /* Large folio NUMA faulting doesn't split to retry. */ >>> if (!nosplit) { >>> - int ret = try_split_folio(folio, &split_folios); >>> + int ret = try_split_folio(folio, split_folios); >>> if (!ret) { >>> stats->nr_thp_split += is_thp; >>> @@ -1709,18 +1703,11 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> break; >>> } >>> } >>> - } else if (!no_split_folio_counting) { >>> + } else { >>> nr_failed++; >>> } >>> stats->nr_failed_pages += nr_pages + >>> nr_retry_pages; >>> - /* >>> - * There might be some split folios of fail-to-migrate large >>> - * folios left in split_folios list. Move them to ret_folios >>> - * list so that they could be put back to the right list by >>> - * the caller otherwise the folio refcnt will be leaked. >>> - */ >>> - list_splice_init(&split_folios, ret_folios); >>> /* nr_failed isn't updated for not used */ >>> nr_large_failed += large_retry; >>> stats->nr_thp_failed += thp_retry; >>> @@ -1733,7 +1720,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> if (is_large) { >>> large_retry++; >>> thp_retry += is_thp; >>> - } else if (!no_split_folio_counting) { >>> + } else { >>> retry++; >>> } >>> nr_retry_pages += nr_pages; >>> @@ -1756,7 +1743,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> if (is_large) { >>> nr_large_failed++; >>> stats->nr_thp_failed += is_thp; >>> - } else if (!no_split_folio_counting) { >>> + } else { >>> nr_failed++; >>> } >>> @@ -1774,9 +1761,7 @@ static int migrate_pages_batch(struct >>> list_head *from, new_page_t get_new_page, >>> try_to_unmap_flush(); >>> retry = 1; >>> - for (pass = 0; >>> - pass < NR_MAX_MIGRATE_PAGES_RETRY && (retry || large_retry); >>> - pass++) { >>> + for (pass = 0; pass < nr_pass && (retry || large_retry); pass++) { >>> retry = 0; >>> large_retry = 0; >>> thp_retry = 0; >>> @@ -1805,7 +1790,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> if (is_large) { >>> large_retry++; >>> thp_retry += is_thp; >>> - } else if (!no_split_folio_counting) { >>> + } else { >>> retry++; >>> } >>> nr_retry_pages += nr_pages; >>> @@ -1818,7 +1803,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, >>> if (is_large) { >>> nr_large_failed++; >>> stats->nr_thp_failed += is_thp; >>> - } else if (!no_split_folio_counting) { >>> + } else { >>> nr_failed++; >>> } >>> @@ -1855,27 +1840,6 @@ static int migrate_pages_batch(struct >>> list_head *from, new_page_t get_new_page, >>> dst2 = list_next_entry(dst, lru); >>> } >>> - /* >>> - * Try to migrate split folios of fail-to-migrate large folios, no >>> - * nr_failed counting in this round, since all split folios of a >>> - * large folio is counted as 1 failure in the first round. >>> - */ >>> - if (rc >= 0 && !list_empty(&split_folios)) { >>> - /* >>> - * Move non-migrated folios (after NR_MAX_MIGRATE_PAGES_RETRY >>> - * retries) to ret_folios to avoid migrating them again. >>> - */ >>> - list_splice_init(from, ret_folios); >>> - list_splice_init(&split_folios, from); >>> - /* >>> - * Force async mode to avoid to wait lock or bit when we have >>> - * locked more than one folios. >>> - */ >>> - mode = MIGRATE_ASYNC; >>> - no_split_folio_counting = true; >>> - goto retry; >>> - } >>> - >>> return rc; >>> } >>> @@ -1914,6 +1878,7 @@ int migrate_pages(struct list_head *from, >>> new_page_t get_new_page, >>> struct folio *folio, *folio2; >>> LIST_HEAD(folios); >>> LIST_HEAD(ret_folios); >>> + LIST_HEAD(split_folios); >>> struct migrate_pages_stats stats; >>> trace_mm_migrate_pages_start(mode, reason); >>> @@ -1947,12 +1912,23 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, >>> else >>> list_splice_init(from, &folios); >>> rc = migrate_pages_batch(&folios, get_new_page, put_new_page, private, >>> - mode, reason, &ret_folios, &stats); >>> + mode, reason, &ret_folios, &split_folios, &stats, >>> + NR_MAX_MIGRATE_PAGES_RETRY); >>> list_splice_tail_init(&folios, &ret_folios); >>> if (rc < 0) { >>> rc_gather = rc; >>> + list_splice_tail(&split_folios, &ret_folios); >> >> Can we still keep the original comments? Which can help to understand >> the case, at least for me:) >> /* >> * There might be some split folios of fail-to-migrate large >> * folios left in split_folios list. Move them to ret_folios >> * list so that they could be put back to the right list by >> * the caller otherwise the folio refcnt will be leaked. >> */ > > Previously, the cleanup code is buried in a corner of a much more > complex code path. So the comments are necessary. Now, it is an > explicit and simple code path. And, the rule is clear, every folio list > needs to be cleaned up before return: folios, split_folios, then > ret_folios. And we have done this here and there in the series. OK. Fair enough. > >>> goto out; >>> } >>> + if (!list_empty(&split_folios)) { >>> + /* >>> + * Failure isn't counted since all split folios of a large folio >>> + * is counted as 1 failure already. >>> + */ >>> + migrate_pages_batch(&split_folios, get_new_page, put_new_page, private, >>> + MIGRATE_ASYNC, reason, &ret_folios, NULL, &stats, 1); >> >> Better to copy the original comments to explain why force to >> MIGRATE_ASYNC mode for split folios. > > Yes. It's a good idea to explain that. And now the rule to call > migrate_pages_batch() has been changed. If mode != MIGRATE_ASYNC, the > length of "from" must be <= 1. I will add a VM_WARN_ON() for that at > the beginning of migrate_pages_batch(). And I would rather to add the > comments to the header of migrate_pages(). Other callers of the > function needs to follow that rule too. Looks reasonable to me. Thanks.