From patchwork Mon Jan 15 08:19:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungchul Park X-Patchwork-Id: 13519383 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 0389FC47422 for ; Mon, 15 Jan 2024 08:20:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84D526B009A; Mon, 15 Jan 2024 03:20:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FE8A6B009B; Mon, 15 Jan 2024 03:20:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 677886B009C; Mon, 15 Jan 2024 03:20:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 57E536B009A for ; Mon, 15 Jan 2024 03:20:13 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1E58E120217 for ; Mon, 15 Jan 2024 08:20:13 +0000 (UTC) X-FDA: 81680847906.19.E777CC9 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf10.hostedemail.com (Postfix) with ESMTP id 2FA51C0028 for ; Mon, 15 Jan 2024 08:20:10 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf10.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705306811; a=rsa-sha256; cv=none; b=oC+hGVWJUzrmyVIC0PFSYhNDB16R9CG+QyxMq5ombLfSRt7k4/hN0hN+qcUpx/wSNuoWhi JCHjPlVa3wI+Blx832qLk9cFik6LAx7lLqFqGJzNm3E6+2xqPTtlsXnjWfNOurXSu3R4KR 3YShAIMpIvQ2JFwqW+kVPVO2ISaW7QM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf10.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705306811; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=hj/OU3wk3OzsqULfJnD2mvtgwTJyJb/ndDOd9gzDe6E=; b=nj8AslgA2DEd8JNlnJc86AoRNbUmL3PKSlbzzWgpZNe0EAEwUx5t1uqhxbNNhTOIOywtpW k3rCCm9kA+yyuo+fQLLc0IXYXbuH5s/x3+/OXGuuk3np3fVsQRhcrffiRdtLVYApoeb0pM QTlb/qcHTOizXXesNESXQJy1bg7DDKI= X-AuditID: a67dfc5b-d85ff70000001748-84-65a4eab4f79b From: Byungchul Park To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: kernel_team@skhynix.com, akpm@linux-foundation.org, ying.huang@intel.com, namit@vmware.com, vernhao@tencent.com, mgorman@techsingularity.net, hughd@google.com, willy@infradead.org, david@redhat.com, peterz@infradead.org, luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, rjgolo@gmail.com Subject: [PATCH v6 4/7] mm: Separate move/undo doing on folio list from migrate_pages_batch() Date: Mon, 15 Jan 2024 17:19:50 +0900 Message-Id: <20240115081953.2521-5-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240115081953.2521-1-byungchul@sk.com> References: <20240115081953.2521-1-byungchul@sk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRmVeSWpSXmKPExsXC9ZZnoe6WV0tSDbZfFbOYs34Nm8XnDf/Y LF5saGe0+Lr+F7PF0099LBaXd81hs7i35j+rxflda1ktdizdx2Rx6cACJovrux4yWhzvPcBk Mf/eZzaLzZumMlscnzKV0eL3D6COk7MmszgIenxv7WPx2DnrLrvHgk2lHptXaHks3vOSyWPT qk42j02fJrF7vDt3jt3jxIzfLB7zTgZ6vN93lc1j6y87j8ap19g8Pm+S83g3/y1bAH8Ul01K ak5mWWqRvl0CV8aN93fZC/p1KhbNecjewLhSuYuRk0NCwERiS/8KRhh76co1zCA2m4C6xI0b P8FsEQEziYOtf9i7GLk4mAU+Mkms/t7B0sXIwSEsECvR0q4JUsMioCoxf/1+sHpeoDlr7jUz QcyUl1i94QBYnFPAVOLdx+PsILYQUE3L3XWsEDXN7BJTngZA2JISB1fcYJnAyLuAkWEVo1Bm XlluYmaOiV5GZV5mhV5yfu4mRmA0LKv9E72D8dOF4EOMAhyMSjy8P/4uThViTSwrrsw9xCjB wawkwlt9Z0mqEG9KYmVValF+fFFpTmrxIUZpDhYlcV6jb+UpQgLpiSWp2ampBalFMFkmDk6p BsayDdmKIvZJfT1vmndotTML1bskNc9m3rehRtL8XVaftK/b6Q0Tj2Zwz+HfX7PJf/VKltXT s9bGHk+XjF4QfyX70aTtipv3PHT/PIN9n63qjsaXL/95blZcsr5hs5L5TqE2I0f+Peddd88S 6HANWj939qsDm79IPop6plt3XtJoSoiqyvM5HNFKLMUZiYZazEXFiQAY5wXvggIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRmVeSWpSXmKPExsXC5WfdrLvl1ZJUg3tPuC3mrF/DZvF5wz82 ixcb2hktvq7/xWzx9FMfi8XhuSdZLS7vmsNmcW/Nf1aL87vWslrsWLqPyeLSgQVMFtd3PWS0 ON57gMli/r3PbBabN01ltjg+ZSqjxe8fQB0nZ01mcRDy+N7ax+Kxc9Zddo8Fm0o9Nq/Q8li8 5yWTx6ZVnWwemz5NYvd4d+4cu8eJGb9ZPOadDPR4v+8qm8fiFx+YPLb+svNonHqNzePzJjmP d/PfsgUIRHHZpKTmZJalFunbJXBl3Hh/l72gX6di0ZyH7A2MK5W7GDk5JARMJJauXMMMYrMJ qEvcuPETzBYRMJM42PqHvYuRi4NZ4COTxOrvHSxdjBwcwgKxEi3tmiA1LAKqEvPX7wer5wWa s+ZeMxPETHmJ1RsOgMU5BUwl3n08zg5iCwHVtNxdxzqBkWsBI8MqRpHMvLLcxMwcU73i7IzK vMwKveT83E2MwOBeVvtn4g7GL5fdDzEKcDAq8fD++Ls4VYg1say4MvcQowQHs5IIb/WdJalC vCmJlVWpRfnxRaU5qcWHGKU5WJTEeb3CUxOEBNITS1KzU1MLUotgskwcnFINjDM3VMxZ7fhZ I2sjq+uKlefV+7Nn/+x6//RNsMK6hi3ciYnzD2/31Xc1/bPJP+1uy9HdSVJ1QnW5jEcmCNV9 WeL46ce13/2BUyfeCK5MSTepqb7CKKJn9cj528e4+m9yYqp81zR/vzHdG9a2ffu1e2qqz80b F/w4nOX/r0w4WP8Al21PhjT3LyWW4oxEQy3mouJEAKF8z8BqAgAA X-CFilter-Loop: Reflected X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2FA51C0028 X-Stat-Signature: hewq6ycmqzk7purpohzgr1q59e81ci33 X-Rspam-User: X-HE-Tag: 1705306810-915934 X-HE-Meta: U2FsdGVkX1+gagxj56zh8m4/NqM5qBWwfQN4FBhqBbvIOn+6YM9WXnJp96ZQcLwf6xWBFEEHzXo7I1pcja8He2k9YIsTrDvumkHOJX91tZFjehhyBZE1sPZKJxDSVb+5mWqBXTdkWYInAHj6/V6ctjC2yJsjhHl6qZErfOZoGJC6Hxqtf9m64SbDg65HqqWHPhP8Vqq5lBoZiVI+bGwaN3MLI+SYn9n85Y8ikcGu+KE6bS0OGBtqikTTBmSkxX8HhMbOB/vlzcp2uwbgUBB5n2MEk44RD+Scy9ZFVHTrhGcVpMGFVmJnZ9m9anizmcdCLPYqPZk2Gxk12XEYQtrsJxiDxLN/lPWulbqMRKhtxtVz+Gdj23fflCBRRSf7wwqef/vyIzmnRyao31dtKtzP2fx2eGs6+EML4anvdc4AqNa/cNQffdKZwLqb70JZltD4xTrVsV8o79t9i8zkt+V36ItoR5Aa+NJZRRz7DFV8GzioKd8LzCCKdWLe4Igvb4eCdEfwnFLvU6CA/9EAgjtAEXYPkam2dU8SyOqc40v/mA5+aFCOG7zhLrTBpobk1SF3xy9ubo+Jhrmjz/EA8rf3h3uJ50zAQNOy4bL817y75ASGPFOtv7LHEpuHioy+2zEBSOyz9lCTJQsj6BBTurYFiKI/e4g4Myj3HdB+fWGcEfdz961K0lfrAmSNXoOXucF8SRXdv/XMhTHjgbAJUCuG7zgTw7IfENjz7J7WTBnejMrMAp4kHVcN+WBUXWsAYAv5DbLK1idS28NeElunf7l59fCMzT+Hm2jUF19p/1A4ddTASnz9YvsHl/6pYZ9MCEZ1RZEttHzoG32Arlqaaoinmntnxt6XIzjSZ4gEBqaXnvckjq1QTaOiJTpLqGVu4S7sTFX7LQgG+5TAfm7HD1RE25pIzlXhgkRq3ptUeIjgoDGto6wmvMyThyAC45VwQvL89EOcU4b7Y8HOK5+3DO+ 0JafUmkQ o1MNcpj4BH1fzQGNWEhnKxSfqZlg9P5uKWPk8 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: List-Subscribe: List-Unsubscribe: Functionally, no change. This is a preparation for migrc mechanism that requires to use separate folio lists for its own handling at migration. Refactored migrate_pages_batch() and separated move and undo parts operating on folio list, from migrate_pages_batch(). Signed-off-by: Byungchul Park --- mm/migrate.c | 134 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 83 insertions(+), 51 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 397f2a6e34cb..bbe1ecef4956 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1611,6 +1611,81 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, return nr_failed; } +static void migrate_folios_move(struct list_head *src_folios, + struct list_head *dst_folios, + free_folio_t put_new_folio, unsigned long private, + enum migrate_mode mode, int reason, + struct list_head *ret_folios, + struct migrate_pages_stats *stats, + int *retry, int *thp_retry, int *nr_failed, + int *nr_retry_pages) +{ + struct folio *folio, *folio2, *dst, *dst2; + bool is_thp; + int nr_pages; + int rc; + + dst = list_first_entry(dst_folios, struct folio, lru); + dst2 = list_next_entry(dst, lru); + list_for_each_entry_safe(folio, folio2, src_folios, lru) { + is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio); + nr_pages = folio_nr_pages(folio); + + cond_resched(); + + rc = migrate_folio_move(put_new_folio, private, + folio, dst, mode, + reason, ret_folios); + /* + * The rules are: + * Success: folio will be freed + * -EAGAIN: stay on the unmap_folios list + * Other errno: put on ret_folios list + */ + switch(rc) { + case -EAGAIN: + *retry += 1; + *thp_retry += is_thp; + *nr_retry_pages += nr_pages; + break; + case MIGRATEPAGE_SUCCESS: + stats->nr_succeeded += nr_pages; + stats->nr_thp_succeeded += is_thp; + break; + default: + *nr_failed += 1; + stats->nr_thp_failed += is_thp; + stats->nr_failed_pages += nr_pages; + break; + } + dst = dst2; + dst2 = list_next_entry(dst, lru); + } +} + +static void migrate_folios_undo(struct list_head *src_folios, + struct list_head *dst_folios, + free_folio_t put_new_folio, unsigned long private, + struct list_head *ret_folios) +{ + struct folio *folio, *folio2, *dst, *dst2; + + dst = list_first_entry(dst_folios, struct folio, lru); + dst2 = list_next_entry(dst, lru); + list_for_each_entry_safe(folio, folio2, src_folios, lru) { + int old_page_state = 0; + struct anon_vma *anon_vma = NULL; + + __migrate_folio_extract(dst, &old_page_state, &anon_vma); + migrate_folio_undo_src(folio, old_page_state & PAGE_WAS_MAPPED, + anon_vma, true, ret_folios); + list_del(&dst->lru); + migrate_folio_undo_dst(dst, true, put_new_folio, private); + dst = dst2; + dst2 = list_next_entry(dst, lru); + } +} + /* * migrate_pages_batch() first unmaps folios in the from list as many as * possible, then move the unmapped folios. @@ -1633,7 +1708,7 @@ static int migrate_pages_batch(struct list_head *from, int pass = 0; bool is_thp = false; bool is_large = false; - struct folio *folio, *folio2, *dst = NULL, *dst2; + struct folio *folio, *folio2, *dst = NULL; int rc, rc_saved = 0, nr_pages; LIST_HEAD(unmap_folios); LIST_HEAD(dst_folios); @@ -1769,42 +1844,11 @@ static int migrate_pages_batch(struct list_head *from, thp_retry = 0; nr_retry_pages = 0; - dst = list_first_entry(&dst_folios, struct folio, lru); - dst2 = list_next_entry(dst, lru); - list_for_each_entry_safe(folio, folio2, &unmap_folios, lru) { - is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio); - nr_pages = folio_nr_pages(folio); - - cond_resched(); - - rc = migrate_folio_move(put_new_folio, private, - folio, dst, mode, - reason, ret_folios); - /* - * The rules are: - * Success: folio will be freed - * -EAGAIN: stay on the unmap_folios list - * Other errno: put on ret_folios list - */ - switch(rc) { - case -EAGAIN: - retry++; - thp_retry += is_thp; - nr_retry_pages += nr_pages; - break; - case MIGRATEPAGE_SUCCESS: - stats->nr_succeeded += nr_pages; - stats->nr_thp_succeeded += is_thp; - break; - default: - nr_failed++; - stats->nr_thp_failed += is_thp; - stats->nr_failed_pages += nr_pages; - break; - } - dst = dst2; - dst2 = list_next_entry(dst, lru); - } + /* Move the unmapped folios */ + migrate_folios_move(&unmap_folios, &dst_folios, + put_new_folio, private, mode, reason, + ret_folios, stats, &retry, &thp_retry, + &nr_failed, &nr_retry_pages); } nr_failed += retry; stats->nr_thp_failed += thp_retry; @@ -1813,20 +1857,8 @@ static int migrate_pages_batch(struct list_head *from, rc = rc_saved ? : nr_failed; out: /* Cleanup remaining folios */ - dst = list_first_entry(&dst_folios, struct folio, lru); - dst2 = list_next_entry(dst, lru); - list_for_each_entry_safe(folio, folio2, &unmap_folios, lru) { - int old_page_state = 0; - struct anon_vma *anon_vma = NULL; - - __migrate_folio_extract(dst, &old_page_state, &anon_vma); - migrate_folio_undo_src(folio, old_page_state & PAGE_WAS_MAPPED, - anon_vma, true, ret_folios); - list_del(&dst->lru); - migrate_folio_undo_dst(dst, true, put_new_folio, private); - dst = dst2; - dst2 = list_next_entry(dst, lru); - } + migrate_folios_undo(&unmap_folios, &dst_folios, + put_new_folio, private, ret_folios); return rc; }