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 B3A69C61CE8 for ; Mon, 9 Jun 2025 20:00:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1C506B008A; Mon, 9 Jun 2025 16:00:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C30126B008C; Mon, 9 Jun 2025 16:00:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6D736B0092; Mon, 9 Jun 2025 16:00:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9BC106B008A for ; Mon, 9 Jun 2025 16:00:57 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E9ACA5DC27 for ; Mon, 9 Jun 2025 20:00:56 +0000 (UTC) X-FDA: 83536930512.06.BF9E462 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf16.hostedemail.com (Postfix) with ESMTP id 5EE8C180013 for ; Mon, 9 Jun 2025 20:00:55 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UVpBFWRg; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749499255; 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=rD1BVlOje2RKKRMuIlgQ8M/1i+6yjx2XKaGUz1+1Kdc=; b=YJI6bxzR3AMZYKT22l/VlrM9Ee8nxg4H1YsdNTEUDLdR1oVYPS/n42plPrXDf8XyLAI3Zw W8LQmrS4BG1F7X3j/oDwRhzarzCSvUijjpUZI50vebqwr8J/tjEistIEd6n4c+lEcwSd67 wcZrs4Xm2NLxotETD4xlzlmcRfvfctw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UVpBFWRg; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749499255; a=rsa-sha256; cv=none; b=FF/heUS9a/CLoP/g7J5RFx+8uqbEqylxf5xqi7ZrgEk6nW8xV//dXvbGMGTV4HMreCWV3q tpWKtsETlxxsm1Y7Q2Zz27R5QmS/EoFR5n0YJbCQaxEQDSC6VqgznfTXlRyatGZE0WNc7P yvs5CDbe44e3CA90yYv2njKYQ9NTOGg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 97306629E1; Mon, 9 Jun 2025 20:00:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4790CC4CEF0; Mon, 9 Jun 2025 20:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749499254; bh=L6hbnI31264eoN57CA+wuQ9nzeSgAHueWnj1w5Hosxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UVpBFWRgJj3ZYaTUXGGUODCbgXZHtDyo4JRY07CXgW7sJCiiqORGaAiL13Juv/HE1 ptbNcx5kDhFgNwloqTfG2gs7Klr701oqQd6UGYQgv450uBsriOZ3EsXDAkakbYYVUD 3QZymycC/375xe698z0NBWts7twIcZ1iDeViP4pidCcz00go8m6dT+VvEvl9SO/uhx ngs9+M+OLH+4FL3tWLyThmsXjGPQbnUmxoRT9+ZF3ruVaNXQzWwUEs4jIj6eTkdZfz zTyR6JxQy7zz/+QiR9dFhPTUK2zZ1ICtM3I6PCzrdxya/dXE8X3HorUba1jQ7v63DK rcLIPnKP1XtAg== From: SeongJae Park To: Cc: SeongJae Park , Andrew Morton , David Hildenbrand , Honggyu Kim , Johannes Weiner , Lorenzo Stoakes , Michal Hocko , Qi Zheng , Shakeel Butt , Simon Wang , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH 2/3] Revert "mm: rename alloc_demote_folio to alloc_migrate_folio" Date: Mon, 9 Jun 2025 13:00:47 -0700 Message-Id: <20250609200048.50914-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250609200048.50914-1-sj@kernel.org> References: <20250609200048.50914-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 5EE8C180013 X-Rspamd-Server: rspam09 X-Stat-Signature: xih4a3tazbm9i9kasuayai97zei6xcob X-HE-Tag: 1749499255-864347 X-HE-Meta: U2FsdGVkX1/YUmCA3ZaGCWXJUDBPSzh/F+qcWOvl2nmBsGus2dJYby9ThszxXZ7YmBkRaV3D1Oq1BFLAz/cgY/ON7HfzBzFDfoUx8l7Ck1jPIrijjnvvn4rK4JMVWz0b/R6KxQgp2Y8jJHnykTAjIcUJcQuozRScjJOfdnL9MqN6jHo9sHN2vtPkMPDcd7X1alHrxHPtgrNWtLqBGniqZ1uXjsnfpdwS/cN58XrxqP2sjdzlA+M7X7pcysWp3sd/952t6og7aMfvWlb4U1CCgmx3Kr7PwZJX5eBGnCuKgh4SR/Pw+8TmMSQPunhNg92PbergfP+EG72RqCf90a/zCFvcnl8rJbiq6rkGbtxY/OfIlCRiXTGv8BBxCGcMbId+E6r1CWmLj8HvzI+tl3XL4hflOPxqiZZxZCbxJqBfix5xb4C08Mr02JLqRmBU1WKlDfXz7YdVuf0B55nvwXlcfGb2vKto87YkYWeBTtn/1bACSeQWPz9dDWXMdl6Xv4mzv0p0o70Ocmd7CkY4wqMvCW9b41gdrGz8CEAO3IvaOA2sL3P3gIr/EXNkXByc/TKv5OOLjWhWUmDmsMboLs5VTF/8TM6Kg+lWMHWi0ldlGDU7t4DV1Eo2BNwwkwqwhjqdmMUptXCb+Ek5P04ze91BAd62RwpSLhdNj/UPTA5ruWM+TKte3XkSlTifhEPbZgxKizs15Z6DSeFiXHnfhwJHeaRnlWjLAWlFrZgqrBQ59rZSosyfOavUPNcW92cp2KPKk4uXHG8YVaao5B0SrdAwlPheD+uHYS1WkDyRZQZzlO1qlGDyr1A4mibuVLRQgrYqBb3ZQ5JsfMlM3qzuVx2e88sSBwTCa/KGVh2a+u/E5YzSMYemIUuehoaylKyfe+fyuOVoHfk+0bc/OthXMt2pjoHyipath898yraIh2QvNWi4JAhmTFYp9PMsnPmbVpP8RkB6Tt+gCkjFroUUold DEcvM8JK qtaGzHWeijQfuQ1yNbLhoIxCvKu/siqY+UXoOAxr17e+E6u6GVYFOe4BBYQ8gWs3Bez5nAlQX4aqinwIzXLKxBILYIJuy6Y4dvV8V8Sn2y8ZG0/QlWBTKTHnHraVsZWLBGJuVPcV2b6+fBbzqMJBOgRQQIPMHNfpzX//fZ5L9elK/UdcdbI5HkONbiCaommQtIiuUKZoEg6avV/j3wqxZAAGFDSGNktdvfeALJpU07PgNc4T+7vt8LC94Tz1whPfmMgK2JD/c5zns8KQwtE7VfqowCA== 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: This reverts commit 8f75267d22bdf8e3baf70f2fa7092d8c2f58da71. Commit 8f75267d22bd ("mm: rename alloc_demote_folio to alloc_migrate_folio") was to reflect the fact the function is called for not only demotion, but also general migrations from DAMOS_MIGRATE_{HOT,COLD}. The previous commit made the DAMOS actions to not use alloc_migrate_folio(), though. So, demote_folio_list() is the only caller of alloc_migrate_folio(), and the name could now be rather confusing. Revert the renaming commit. Signed-off-by: SeongJae Park --- mm/internal.h | 2 +- mm/vmscan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 71eaea2db9b0..b76b5162314a 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1227,7 +1227,7 @@ extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long); extern void set_pageblock_order(void); -struct folio *alloc_migrate_folio(struct folio *src, unsigned long private); +struct folio *alloc_demote_folio(struct folio *src, unsigned long private); unsigned long reclaim_pages(struct list_head *folio_list); unsigned int reclaim_clean_pages_from_list(struct zone *zone, struct list_head *folio_list); diff --git a/mm/vmscan.c b/mm/vmscan.c index a93a1ba9009e..6bebc91cbf2f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1006,7 +1006,7 @@ static void folio_check_dirty_writeback(struct folio *folio, mapping->a_ops->is_dirty_writeback(folio, dirty, writeback); } -struct folio *alloc_migrate_folio(struct folio *src, unsigned long private) +struct folio *alloc_demote_folio(struct folio *src, unsigned long private) { struct folio *dst; nodemask_t *allowed_mask; @@ -1069,7 +1069,7 @@ static unsigned int demote_folio_list(struct list_head *demote_folios, node_get_allowed_targets(pgdat, &allowed_mask); /* Demotion ignores all cpuset and mempolicy settings */ - migrate_pages(demote_folios, alloc_migrate_folio, NULL, + migrate_pages(demote_folios, alloc_demote_folio, NULL, (unsigned long)&mtc, MIGRATE_ASYNC, MR_DEMOTION, &nr_succeeded); -- 2.39.5