From mboxrd@z Thu Jan 1 00:00:00 1970 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 64E6DEE49AC for ; Sat, 19 Aug 2023 10:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0981900007; Sat, 19 Aug 2023 06:52:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB977900004; Sat, 19 Aug 2023 06:52:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA88C900007; Sat, 19 Aug 2023 06:52:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9E612900004 for ; Sat, 19 Aug 2023 06:52:52 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5BD9F1A06FB for ; Sat, 19 Aug 2023 10:52:52 +0000 (UTC) X-FDA: 81140541384.29.1E6D803 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf07.hostedemail.com (Postfix) with ESMTP id 485794000F for ; Sat, 19 Aug 2023 10:52:49 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692442370; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0rt+ALKo4EqL8ciztB1XVFtEoBaR8AO72C9HhYNyCKs=; b=CBjHR5Z8GQlcpfGUvKuNITVIbYwuqKzeGEInSZs54gD8OM+zUqkeP/YEhepdV40YYIDBuc Leupv21XD1MDXqygT0p6CKvf+4+seUzwasS5sJLdtyK5vClnYdTWvX52dqyaxp0U4LT305 47SD2Ek3zi/5P/xTYiJe1KxTJ40aV7Q= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692442370; a=rsa-sha256; cv=none; b=sN3ykPJIZjW6/nMCAAl0VD4f1VRA05sS3klnUc4yXm2nVkU+UxhF76kYZNeAI44U5HOYC0 V4oZXsta9fdm7LSrSj+jSQi64KtrKH9Bf6U3gwduNkUT5Pfln46kH7HjwuUxzozheowuBW cpe8OYKUqNpHmIlqT5aKKuWpoorLoE0= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0Vq56wHJ_1692442364; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vq56wHJ_1692442364) by smtp.aliyun-inc.com; Sat, 19 Aug 2023 18:52:45 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, shy828301@gmail.com, david@redhat.com, ying.huang@intel.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] mm: migrate: change migrate_misplaced_page() to support multiple pages migration Date: Sat, 19 Aug 2023 18:52:36 +0800 Message-Id: <2aa06e6f1addbfeb8784b4c282f1d4e4eee3f560.1692440586.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 485794000F X-Rspam-User: X-Stat-Signature: h74r6135eq4wkdse4n9kjie3yzmm48q8 X-Rspamd-Server: rspam01 X-HE-Tag: 1692442369-992842 X-HE-Meta: U2FsdGVkX1/ugKO5W4y7VXyusLL53wEY1SQmqx03BcJt5QBTV4r17Q61xWEbr4f5F5mbhGAUv1G66nxjmWOc0HByV/fHx35txyuM627d6y6rIdCEPBiJjM3fdTzOejqUS+WHM+Jc//AnA5qa2iPeUlGpN4+JRiItlJpc3EfkWtoSK+4WEQHOibP+eqCL5gRIx1tO3DJMWp+xS2XVmM3cuBgbaAHb56H64htdvybFBDqzLU2UxwYzkVOfh0YDMHnTfiFKVPTeQ/gu3cbkNuA8ldXGi8fxSXgn+fGLNWbb8xk2/PgccOXBe0p2TTRGg5dQQWruT2y4dCdva6bodcndJC7+ugGOWzGHmDfrj1bFcQUK9cJ6BJ8V4br6ex8Ejo2fXaS3jYXUypleg/hgQLRxjLdBEWNpdOl0ZFD9vE3JFMdEsoTer1Kp8zgkt/STI4oQKIuiuYw0VVdJO7zEwO7+q0SgMVIVa+XI2uLjyH7mCfKH3v4az7wJnp6WFpMW3DCoW+Jd0ajvCzUxtOdy3zLk9w1oJpRUZOkm7HfXydAo66nOxR8yZqdjJj5+vwjZImwyW2H27WCYeOYoCPmET9WNNNxsX3F+wZaLRSZ91bbtwGEDPKvV59cArJPzyjKHk7R8beH64w431frf7h5fTxr6ktpOY2xMW27M726lraqle2Kk8U3bm5HeGPm4IK84CRkVghgfJ5mhmZptKAEP+APXQLwDjkUdh6yXyc+OBSwdjuBMXKMoQg3zMqeWGhX5byiHwg58zz9wrDQJQ1TNDPaVIww+mVnjVUe3WV0BzWjfjuZKp4IZ0hh1ZP3aTZOgeFa+c9hIbqDxs/oog/eNLP6fDVukcCPcswh1YPknngdc0f8GvZE9qAP5MWuBgvakt229sm1VlcFjf6VCFwl8ytSbt128CKCQ4piU9FfYVNbneqs9Zp3FF4u1fIalwFoSf9JJQNZlBTNcfXG+Tx9Pgtn VdPOGJoM j0sPrmuWyKpcGOMi/JI78IcIlSDhiXeFdOCbdNiXVdu1J3PhR+RsIUnv6OiYYE1N5OnTqisyeF9UrwsKaD2atV7ASpd1Gr2ya55DovhAv4zfK4QswaFqKQClgLaXxIDA/W8ENxUfQ+VqrSq0= 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: Expanding the migrate_misplaced_page() function to allow passing in a list to support multiple pages migration as a preparation to support batch migration for NUMA balancing. Signed-off-by: Baolin Wang --- include/linux/migrate.h | 9 +++++---- mm/huge_memory.c | 4 +++- mm/memory.c | 4 +++- mm/migrate.c | 26 ++++++++++---------------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 7c5189043707..2599f95d6c9e 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -142,12 +142,13 @@ const struct movable_operations *page_movable_ops(struct page *page) } #ifdef CONFIG_NUMA_BALANCING -int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, - int node); +int migrate_misplaced_page(struct list_head *migratepages, struct vm_area_struct *vma, + int source_nid, int target_nid); int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page); #else -static inline int migrate_misplaced_page(struct page *page, - struct vm_area_struct *vma, int node) +static inline int migrate_misplaced_page(struct list_head *migratepages, + struct vm_area_struct *vma, + int source_nid, int target_nid) { return -EAGAIN; /* can't migrate now */ } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b7cc6828ce9e..53a9d63cfb1e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1498,6 +1498,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) int flags = 0; pg_data_t *pgdat; int isolated; + LIST_HEAD(migratepages); vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd); if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) { @@ -1549,7 +1550,8 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) goto isolate_fail; } - migrated = migrate_misplaced_page(page, vma, target_nid); + list_add(&page->lru, &migratepages); + migrated = migrate_misplaced_page(&migratepages, vma, page_nid, target_nid); if (migrated) { flags |= TNF_MIGRATED; page_nid = target_nid; diff --git a/mm/memory.c b/mm/memory.c index 01b1980d4fb7..973403a83797 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4781,6 +4781,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) int flags = 0; pg_data_t *pgdat; int isolated; + LIST_HEAD(migratepages); /* * The "pte" at this point cannot be used safely without @@ -4858,8 +4859,9 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) goto isolate_fail; } + list_add(&page->lru, &migratepages); /* Migrate to the requested node */ - if (migrate_misplaced_page(page, vma, target_nid)) { + if (migrate_misplaced_page(&migratepages, vma, page_nid, target_nid)) { page_nid = target_nid; flags |= TNF_MIGRATED; } else { diff --git a/mm/migrate.c b/mm/migrate.c index 5eeeb2cda21c..93d359471b95 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2519,36 +2519,30 @@ int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) * node. Caller is expected to have an elevated reference count on * the page that will be dropped by this function before returning. */ -int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, - int node) +int migrate_misplaced_page(struct list_head *migratepages, struct vm_area_struct *vma, + int source_nid, int target_nid) { - pg_data_t *pgdat = NODE_DATA(node); + pg_data_t *pgdat = NODE_DATA(target_nid); int migrated = 1; int nr_remaining; unsigned int nr_succeeded; - LIST_HEAD(migratepages); - int nr_pages = thp_nr_pages(page); - list_add(&page->lru, &migratepages); - nr_remaining = migrate_pages(&migratepages, alloc_misplaced_dst_folio, - NULL, node, MIGRATE_ASYNC, + nr_remaining = migrate_pages(migratepages, alloc_misplaced_dst_folio, + NULL, target_nid, MIGRATE_ASYNC, MR_NUMA_MISPLACED, &nr_succeeded); if (nr_remaining) { - if (!list_empty(&migratepages)) { - list_del(&page->lru); - mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + - page_is_file_lru(page), -nr_pages); - putback_lru_page(page); - } + if (!list_empty(migratepages)) + putback_movable_pages(migratepages); + migrated = 0; } if (nr_succeeded) { count_vm_numa_events(NUMA_PAGE_MIGRATE, nr_succeeded); - if (!node_is_toptier(page_to_nid(page)) && node_is_toptier(node)) + if (!node_is_toptier(source_nid) && node_is_toptier(target_nid)) mod_node_page_state(pgdat, PGPROMOTE_SUCCESS, nr_succeeded); } - BUG_ON(!list_empty(&migratepages)); + BUG_ON(!list_empty(migratepages)); return migrated; } #endif /* CONFIG_NUMA_BALANCING */ -- 2.39.3