From patchwork Mon May 20 02:17:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungchul Park X-Patchwork-Id: 13668005 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 C3994C25B7A for ; Mon, 20 May 2024 02:18:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A61ED6B009B; Sun, 19 May 2024 22:17:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 99F796B00A1; Sun, 19 May 2024 22:17:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 472686B009D; Sun, 19 May 2024 22:17:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F0F776B009C for ; Sun, 19 May 2024 22:17:54 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B9EBDA1D8D for ; Mon, 20 May 2024 02:17:54 +0000 (UTC) X-FDA: 82137163668.22.F231733 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf23.hostedemail.com (Postfix) with ESMTP id EAFDA140005 for ; Mon, 20 May 2024 02:17:52 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716171473; 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=u2mjUnFQvLeiyt0EIbd9RAlKFlEDSFVl1qIOuPU7u6k=; b=DyG1fgKu0sJbtpR37Eit2tTjQEmwrf6/Mm1TZ+3qxAw/Gr5oHSmAtFZeEVD803TPRIMSp3 VjkUSlH1WHGUQuxF5k/OdX2b7Ai1yCc54S3HbvFGEo7Mb++ws7nqZ8IVuseLVuuDIwwqpX LsrrgowCHeo9DZDfTk+zftJvwZBj94A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716171473; a=rsa-sha256; cv=none; b=aKTGGIfIOKCmXDEPliJc5LJkyDXb6QxVRmxoD27pmrIH9bN6MEOeCRk9y6525emo8EK//v +0/WXdXaJ54XF53lUyqbU+ECm3KG6F9+GvfjFlTNCuSRSxNQe8Q3NXyKVPlq37LWVoAhHv gw8NTOSCVb+fuJfZOHFqzeAT1gHIogA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com; dmarc=none X-AuditID: a67dfc5b-d6dff70000001748-c7-664ab2c9c7c5 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, 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: [RESEND PATCH v10 10/12] mm: separate move/undo parts from migrate_pages_batch() Date: Mon, 20 May 2024 11:17:32 +0900 Message-Id: <20240520021734.21527-11-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240520021734.21527-1-byungchul@sk.com> References: <20240520021734.21527-1-byungchul@sk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsXC9ZZnke7JTV5pBvcWi1jMWb+GzeLzhn9s Fi82tDNafF3/i9ni6ac+FovLu+awWdxb85/V4vyutawWO5buY7K4dGABk8Xx3gNMFvPvfWaz 2LxpKrPF8SlTGS1+/wAqPjlrMouDgMf31j4Wj52z7rJ7LNhU6rF5hZbH4j0vmTw2repk89j0 aRK7x7tz59g9Tsz4zeIx72Sgx/t9V9k8tv6y82iceo3N4/MmuQC+KC6blNSczLLUIn27BK6M LZOWsxT81K64fW81awPjdOUuRk4OCQETiaNT9jPB2CsPTAOz2QTUJW7c+MkMYosImEkcbP3D DmIzC9xlkjjQzwZiCwtESqxvfMoIYrMIqEpse7MDrJ4XqP57+042iJnyEqs3HACLcwLFZ6za yQJiCwmYSvw4+hWohguo5j2bxJqv11ggGiQlDq64wTKBkXcBI8MqRqHMvLLcxMwcE72MyrzM Cr3k/NxNjMDQX1b7J3oH46cLwYcYBTgYlXh4dzzyTBNiTSwrrsw9xCjBwawkwrtpC1CINyWx siq1KD++qDQntfgQozQHi5I4r9G38hQhgfTEktTs1NSC1CKYLBMHp1QDo9i6TfPfGgUuZOud e7hv9vdJLslOl77VWnNNDk032Dln7v0ue3ZDt5p9occ+b2sIUjv+4MUBNzaZ6a+3PT25/m5M TQ2fJ4/kjB1yBg7tvMFCxx/WvWBhf3x2o8ebyssbPScZCNyKm/s4XeEsE0f42aN3FV/eicrY aaH05nD8LMmqjuv9PEt3P1ViKc5INNRiLipOBACLhzNzeQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRmVeSWpSXmKPExsXC5WfdrHtyk1eawfXlHBZz1q9hs/i84R+b xYsN7YwWX9f/YrZ4+qmPxeLw3JOsFpd3zWGzuLfmP6vF+V1rWS12LN3HZHHpwAImi+O9B5gs 5t/7zGaxedNUZovjU6YyWvz+AVR8ctZkFgdBj++tfSweO2fdZfdYsKnUY/MKLY/Fe14yeWxa 1cnmsenTJHaPd+fOsXucmPGbxWPeyUCP9/uusnksfvGByWPrLzuPxqnX2Dw+b5IL4I/isklJ zcksSy3St0vgytgyaTlLwU/titv3VrM2ME5X7mLk5JAQMJFYeWAaE4jNJqAucePGT2YQW0TA TOJg6x92EJtZ4C6TxIF+NhBbWCBSYn3jU0YQm0VAVWLbmx1g9bxA9d/bd7JBzJSXWL3hAFic Eyg+Y9VOFhBbSMBU4sfRr2wTGLkWMDKsYhTJzCvLTczMMdUrzs6ozMus0EvOz93ECAzkZbV/ Ju5g/HLZ/RCjAAejEg/vhtueaUKsiWXFlbmHGCU4mJVEeDdtAQrxpiRWVqUW5ccXleakFh9i lOZgURLn9QpPTRASSE8sSc1OTS1ILYLJMnFwSjUwXim/sPG8woXUZZpls36/s7ujpLNTXU5o 2sNHG1XOZHDv1td7ocMQWGeYsTvx8vVVQSIT2VplZ3BM1H2fOFG2w+o9I/OznvPnjV9s2PTC 4FZXUGp844F8nVIv+8anVvtsl7En3EoxaPLO271g7p4Lsu6i3YLaO9qWJM3ral3VrVA/8c9j iQg2JZbijERDLeai4kQAotwRFmACAAA= X-CFilter-Loop: Reflected X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EAFDA140005 X-Rspam-User: X-Stat-Signature: x9z9jfaydhx3u3uaiw4fqhstmwirboxs X-HE-Tag: 1716171472-612644 X-HE-Meta: U2FsdGVkX19FB+kTrEmUX6qojdPtuMkbPd5eTI/bHFnHC/MzQcP/owOCQxH7nh9C6OoKnENJgBsaBb5yTVfACMkVTYrjWMa061EZdJpCbrLb5V5T2uHv5MOWzekjfw6S0D+lHwivnFqTsaDVM5FFtd/li4aGgDIDghadiUibS6t0ulbHSSx9z21nCXR4QnkNv39MU5o5X2suG+vTgAs5uMUZZwqVXkYsqPV/LncIbjV836cOo0KrVwQtPuummoD/n4wpwdB7MZ91PUSYpJ26txJaESh2YY2GW4NmbtqvnlhGGn40MoU+89EoIoq+W5KgTABB78ii7Bd3ODfe4a1czfLDzNVwAzFOK3w/yV1LxxAKMRblO7G5AKoxYW0zg5AOGRe4+ClSiEm5PyLE+NCGDZCW3khWSLOqNkK9P6S1w86jjDtOU8Cw1dvWYgJzrsUSZWVRrvbDpiSC/wFvHS1Rb7EGYelQGg4ywzY2iTg5tQyyNjEahg5jAmkVKdFamRB8pCH43L7apGKWXGJMGIZtWVnDzH4zxtcM0bGLHYleT50IUnjiuDRhh/tj/wyuPJziFESc49/1RxFdazxH+PsrUf16LL3w5zsowkXlbXOp4cxByRkttf7ul922mVb1ZUCcWL0/ANdVfGloPcROZyb6bRqZqoQv8IbWJXlx+oZ3qD4u1Ke6UACjURwyUkwzPMLNW1jOThsPL/nyvLJZthpHl/aKqadFbPrkE0s51tpflUoJgLHzIQ5AypNdt3yvhEWpsb8rdWl2pYJMk15iHQGkjTqRK9y2y73FCbrdIaSNkz/DQpU8UWJLa5hRA2zMdFwe8WMS+5v1StwpmucIBtJbzG/dz4rQ9sn0PKO3zQumNuZPgtAcYwr7NDCxIbpJ+UyNOyunId8vOZcQ72i3okj029PO9sji3BmfkeVNFMqJ5/cXTLMbxT/GSKnWJJLpGppSDMSojnum0KGd51i0h5N VT9E0Kw6 T5Ddua33GTH6g0VAL5/3kOTM6atKN4fzHXQED 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 luf mechanism that requires to use separated folio lists for its own handling during migration. Refactored migrate_pages_batch() so as to separate move/undo parts 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 c7692f303fa7..f9ed7a2b8720 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1609,6 +1609,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. @@ -1631,7 +1706,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); @@ -1790,42 +1865,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; @@ -1834,20 +1878,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; }