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 2DFAEC5475B for ; Wed, 6 Mar 2024 10:13:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D0446B0080; Wed, 6 Mar 2024 05:13:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 656F16B0082; Wed, 6 Mar 2024 05:13:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D1716B0081; Wed, 6 Mar 2024 05:13:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 35BBE6B0075 for ; Wed, 6 Mar 2024 05:13:43 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 011A5A0A58 for ; Wed, 6 Mar 2024 10:13:42 +0000 (UTC) X-FDA: 81866202726.05.5A7B546 Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) by imf15.hostedemail.com (Postfix) with ESMTP id 1A672A001B for ; Wed, 6 Mar 2024 10:13:39 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=M2UZoAHy; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf15.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 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=1709720021; 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:dkim-signature; bh=3+gbi0TkcqE1wrd2gyS4ajAOD2lf+Wm0tnSEhRfeeJg=; b=6jX41SXRKWuB3nValr/TAbNx6jeemig/1OzA/yL7NxIu0NKJQXJx8L8sMYBCqwPnDfPIEN TVzyAbYGMykDaqvxuGfXfYPSRIoP9XPV0STmAqRQpjFJ41GdiLRuP4mEaCK+JzFglh2il5 Plcfk6qt0ZpfARku+zGnuqMGnR+A9MA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=M2UZoAHy; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf15.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709720021; a=rsa-sha256; cv=none; b=10XA3FQmH/s3VcaUc4Favd+Qz2gGaJA5kOw1H9spm7LZcfNrFJkJY2HcAY3LpFa1rELMXN rZPomNHYWEosnWPBvI7QKLfxwM64YggSQfqlm5uoQCpC8EQlY7vWQevrz9zZipajb8Ogah f4Dn0uQR4I+L349FZjNWemtlaL+LZ8o= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1709720017; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=3+gbi0TkcqE1wrd2gyS4ajAOD2lf+Wm0tnSEhRfeeJg=; b=M2UZoAHyytPC+FkaOoXq1sVQOcNdpB8UhaLPS/pQuGF20pT7Z+KfsQy6hyXDCo6c4uigOAH1uFEyLpKm6NiWnq27wERKfktga+a7+8YeFw5uvqTptuTYWz5ELB3MYg55rpXyTQ2R3mjIRycQ4u3lChDSVLIrsZABTJP/8gWy/KU= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R121e4;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=10;SR=0;TI=SMTPD_---0W1xC4XJ_1709720015; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W1xC4XJ_1709720015) by smtp.aliyun-inc.com; Wed, 06 Mar 2024 18:13:36 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: muchun.song@linux.dev, osalvador@suse.de, david@redhat.com, linmiaohe@huawei.com, naoya.horiguchi@nec.com, mhocko@kernel.org, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] mm: record the migration reason for struct migration_target_control Date: Wed, 6 Mar 2024 18:13:26 +0800 Message-Id: <7b95d4981e07211f57139fc5b1f7ce91b920cee4.1709719720.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-Rspam-User: X-Stat-Signature: mzyw8my7453mjy8c7ey516ps31odsg79 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1A672A001B X-HE-Tag: 1709720019-873348 X-HE-Meta: U2FsdGVkX19sc0B86SWnJzFE3KVMYwJpZmAEHBYuyBPkqiYZiF2tddOI/QkzD1GuypPkWlBQsMxnUhYxYCGfzYqeYiQsDfUMyEXUnYTXrBWnGUU+ffmMii3eUdi+3leljc8QfVigko7Wmo6opEzcd0SMP9QjiNxQwFORCK1yNsznFTofTDPDhKxj017vLnBexwJeIfd71n9n6qv0v14ULm6ZYqTAxY2RSsl7iYaHe+i5AhFoNB60BPATjHwkFR40p8svVOh38uWErjlDHNRq7ESfqn67N6gsIWwfUZ76chRB1b8Ll/UsoHxgdSfr4GMpdiMZ3kpIHkVi45rWtfBof6UbaB1PgyZWCDe0sLdGsu0Lgh83gJ1wuYJv0nIeIsy1zO5QFC89y0858LSST+aOKjl33URPB1VdN26ofOqHXXVsqXN99Kn3XFe4TTx1Rj3Fi75Hj5fx8x3w277IVYm7a1pTGI0JEOapvgTEgYqxT8XtIlQTdKj5SCoRTKa0u/sfUSKpoEHyXUajEkMTHqe9jI8bQ9dpzC0Qk8sQvD9ms4yNuGCerv7mL8bWLf44n43OBfM5POfpt9w3vSakUtzk87GD3tUrWrO41P3Po7puGWQHSUoK01F2mgJYBm6fkCQL+/A/M5FA79xNHh4mj5FqzebryWhBDIlbxrwytoss3QOjW2IohqRzypUzcQoJ/U3arzEBlGmrZ7dm9J3ORA1YSYG3tj6IgQLTisyaOJAiB/yHiPSP1hneYhfBowta8NTMGfun7vPpr1RDVCIaL/kgM81PSW8o2oBkQiG6+FdX2GKGEwj3H3bIGItkJsRM9WZCdl4qMaKUcAGzYl/0LhRgGtGfFClEGYHT07HYVajBOGQdtVqc9h40xdInqSrw39nTZiYNBZBAlS6G7gMsMgX8DfTJa7Q5PBcFhVbM8C3oDOq1XTDQfWAvc9cik9nriXNJ9+aYKbNlBP4YroF0RWR ivxpsZyT UeKZPugqesouqW8uyYZ3Tx2GF6HVmHpqN9SZUgO/TofLWRYpqbFfXYRlicc8PiC9olHmssRIfuYZzG/mI2BA+MLnH0tj7flUz371iMBgLG7Krmq9gV69LHTHwmC83vgqBAT5xrGd/OvoIjVRGbQMHdqXImnsn8B3PLKdjaDj3H2ElTEUbAT3LvWIdkt8vNQHFN0R8sb1ivnYGs75inmFjlU60YUizdyn2l3miOdJRLZO5WOc= 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: To support different hugetlb allocation strategies during hugetlb migration based on various migration reasons, record the migration reason in the migration_target_control structure as a preparation. Signed-off-by: Baolin Wang Reviewed-by: Oscar Salvador --- mm/gup.c | 1 + mm/internal.h | 1 + mm/memory-failure.c | 1 + mm/memory_hotplug.c | 1 + mm/mempolicy.c | 1 + mm/migrate.c | 1 + mm/page_alloc.c | 1 + mm/vmscan.c | 3 ++- 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index df83182ec72d..959a1a05b059 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2132,6 +2132,7 @@ static int migrate_longterm_unpinnable_pages( struct migration_target_control mtc = { .nid = NUMA_NO_NODE, .gfp_mask = GFP_USER | __GFP_NOWARN, + .reason = MR_LONGTERM_PIN, }; if (migrate_pages(movable_page_list, alloc_migration_target, diff --git a/mm/internal.h b/mm/internal.h index 2b7efffbe4d7..47edf69b6ee6 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -959,6 +959,7 @@ struct migration_target_control { int nid; /* preferred node id */ nodemask_t *nmask; gfp_t gfp_mask; + enum migrate_reason reason; }; /* diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9349948f1abf..780bb2aee0af 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2666,6 +2666,7 @@ static int soft_offline_in_use_page(struct page *page) struct migration_target_control mtc = { .nid = NUMA_NO_NODE, .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, + .reason = MR_MEMORY_FAILURE, }; if (!huge && folio_test_large(folio)) { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a444e2d7dd2b..b79ba36e09e0 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1841,6 +1841,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) struct migration_target_control mtc = { .nmask = &nmask, .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, + .reason = MR_MEMORY_HOTPLUG, }; int ret; diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f60b4c99f130..98ceb12e0e17 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1070,6 +1070,7 @@ static long migrate_to_node(struct mm_struct *mm, int source, int dest, struct migration_target_control mtc = { .nid = dest, .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, + .reason = MR_SYSCALL, }; nodes_clear(nmask); diff --git a/mm/migrate.c b/mm/migrate.c index 73a052a382f1..bde63010a3cf 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2060,6 +2060,7 @@ static int do_move_pages_to_node(struct list_head *pagelist, int node) struct migration_target_control mtc = { .nid = node, .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, + .reason = MR_SYSCALL, }; err = migrate_pages(pagelist, alloc_migration_target, NULL, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 96839b210abe..8e6dd3a1028b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6266,6 +6266,7 @@ int __alloc_contig_migrate_range(struct compact_control *cc, struct migration_target_control mtc = { .nid = zone_to_nid(cc->zone), .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, + .reason = MR_CONTIG_RANGE, }; lru_cache_disable(); diff --git a/mm/vmscan.c b/mm/vmscan.c index 402c290fbf5a..510f438bb9e0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -978,7 +978,8 @@ static unsigned int demote_folio_list(struct list_head *demote_folios, .gfp_mask = (GFP_HIGHUSER_MOVABLE & ~__GFP_RECLAIM) | __GFP_NOWARN | __GFP_NOMEMALLOC | GFP_NOWAIT, .nid = target_nid, - .nmask = &allowed_mask + .nmask = &allowed_mask, + .reason = MR_DEMOTION, }; if (list_empty(demote_folios)) -- 2.39.3