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 A7ED5C61CE8 for ; Mon, 9 Jun 2025 20:01:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D41F66B0092; Mon, 9 Jun 2025 16:00:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF2F36B0093; Mon, 9 Jun 2025 16:00:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C08176B0095; Mon, 9 Jun 2025 16:00:58 -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 9EC246B0092 for ; Mon, 9 Jun 2025 16:00:58 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 253825DC7B for ; Mon, 9 Jun 2025 20:00:58 +0000 (UTC) X-FDA: 83536930596.28.F7CC0EE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id 777FD40002 for ; Mon, 9 Jun 2025 20:00:56 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="dC/6i3Qd"; spf=pass (imf12.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1749499256; 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=pSy+NNEfngA0BoTCiZ3lMpIuyv2SctC+bq4fJFEBGQM=; b=2G5HQkAgtG58e5fWUDl2UBoyy/7fXg0FdfGu3/+mm12p5GnZMfZwRSAAnbEXbr210tci0G czXEwAxxGyuOEsLfbcj6rVWTht1C4yVzjyzHl3iXCplLz0Ag4HRdgMQf3jTo13ciJabqgd HEIKhD3CPOkPt8vjny/F6Uh8wZAA4zU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="dC/6i3Qd"; spf=pass (imf12.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1749499256; a=rsa-sha256; cv=none; b=Kf8sx9tzCvZ6Godartnm8Bl+qRvE0k+Zwt03gbsDCYEOa4mZOVAXa6suMr1ISyYUhXFe/g 5eOKyROuHBsjTl8RpvlEEBQVQ0xVjVOwEVzuWzs7nFhfJotdjSfotaYdiJ5lUgtuWOPcKA LFRt71vLz6xsWfkuPDHcCUoRkTWdUf8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0B1E75C4891; Mon, 9 Jun 2025 19:58:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 575DBC4CEEF; Mon, 9 Jun 2025 20:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749499255; bh=kXfXXQuZy3Q2a6PJsLDR0HH0HOWqYg4BhOnbE4nBfzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dC/6i3QdlnobUADLR23jkzeDlz9A6Soy9CnntKUIo92Wq1Q+zZoR+o+JXyK48Zxdv Eh4WCJ56JfeHljelt19WAAJhIIyMKqSQaGys0GoGNhph2XufAuahIbzfmZMcmJxV04 4AZ06fGy/bDA73HNAbEm1gIEcIM0v45/uHQq4koCt0vea6c1EZPYnnImPwAX8FumLC 4jmlZ2RTPbyHHk51PIlkX6mfn0RQOB3NzQa1n+3+1XxGgS5ENUy6HFj0aP+msKK8Lg 8xmpnn1mDFxQMBwrK9Iq6XYT0fRMHeqoBjEE8myYXf1IKjtk4c5FwtrU0mRJ3wvuK9 o4fonEAjGs+UQ== 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 3/3] Revert "mm: make alloc_demote_folio externally invokable for migration" Date: Mon, 9 Jun 2025 13:00:48 -0700 Message-Id: <20250609200048.50914-4-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-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 777FD40002 X-Stat-Signature: c6k39em9z6grferufk87baewywf3gcat X-Rspam-User: X-HE-Tag: 1749499256-275979 X-HE-Meta: U2FsdGVkX18sZOTMAtcln30v+xTz202aok+jOIifiBKPLXKliMJqrL5JRo53OtoT/5w7UL5QIIPA8rtpEqSie81ljbCM0ySrmovOOM9ah1yUa8M3YguEpXmW1n2O2kHMsWb6MItXCagk2k1z10HWFyA5RscQTKYmxNYPY1I1F91H+J6GcMJUAaachgjRj5hReQ51PeCOXFXJdlJlQSDSIgjkcoE/sHtxt5i+Js/1zHZig3oQCM4frBlj9JlI/wix0O17dgR/k9bdu2gIC4JPZZO7bfp2uBWbnKDxSdV3RLlfXV2n281TkpsnLL1gVTetJYNGDtJTpySDOXNcVNIsqrhT7KF0J1zyksYfcj16oy1ZO+j3ggDaKeIMGE47jWPZ/adjj+Ldg+l6z0EQMivo2rPnLmMK1M1vCD+dujxzUvRmpf3rrs+0kakMvdlRULXMaF7vWTC1jN1CccZQxwrRwYGXzOKcq/tIoLz6ROaRD7S/kxcys3FdR5BKthb7thfwNzQe76bPl2mA/gJBbR1HBTndsNwQ8D2Z8Vg+D84GxXwdKFYPtxmn2d5Hrx39WZq+3rA4xPiNUn+4FZ3IIqDFHCarnEpola/jLOELZz68r4HDOJYbW79a+o7rkQb8Pr0KeB7X/EAlM6M+0fS7MShGipk0oaYyOazoe42bcgHw777iITeC62MgMuQmP2mWFEM11y2+mH9RiLGEAC876/Fx3s1XuQbBO/8X5qZV6rU12TQnzSYPrYP7zAuhBBFEYM8cIZAOaqmCtYNUsd6npCFSdAtQvW0CpVIqAzMMYLWfk0O7rWL8hrta/NR09RSzNi/rlb0D+q5FQYpb8KwndFaEgjKsA7YLEWA/prDGeNLWbiA6Q97ZUnmPMID6DllHwRapl6AVbWv0ZJci4EjA3SORY7aUJxyYvEutt6CLOaTxQ1sQAjgvjAQ/VcuqD0xMvs5m6t8GTk6ANiV+LDnnY47 RtX+VjKN dy6SOWzHBkD78/B3x2Y8TxAhBWJH5vhrozKrL5zjV43Gg+zqbHADBkaZEOK/k5xvUo+EYOuKz4FMzxtDl/gjsGClYgStmwoEqoc9wS1iRyfw+yhtkeEni9Y2a0aL5IpBT/jOgr1Wrpni5c/89wO8OAA8a4loY/Hc3pt15vF7wsBSaA9IVXxlKWG3/JeOxT+NnReMS1n0y0fzZluJKxqMrEZm3bTuCLON01BDzVtmc918Bz4oKz/IVSAOo470jzC/D1OBi92zqMkBjvwud7f+u0q0ukd7WMS0bxhrW 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 a00ce85af2a1be494d3b0c9457e8e81cdcce2a89. Commit a00ce85af2a1 ("mm: make alloc_demote_folio externally invokable for migration") was made to let DAMOS_MIGRATE_{HOT,COLD} call the function. But a previous commit made DAMOS_MIGRATE_{HOT,COLD} call alloc_migration_target() instead. Hence there are no more callers of the function outside of vmscan.c. Revert the commit to make the function static again. Signed-off-by: SeongJae Park --- mm/internal.h | 1 - mm/vmscan.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index b76b5162314a..12470ee5f05b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1227,7 +1227,6 @@ 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_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 6bebc91cbf2f..620dce753b64 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1006,7 +1006,8 @@ static void folio_check_dirty_writeback(struct folio *folio, mapping->a_ops->is_dirty_writeback(folio, dirty, writeback); } -struct folio *alloc_demote_folio(struct folio *src, unsigned long private) +static struct folio *alloc_demote_folio(struct folio *src, + unsigned long private) { struct folio *dst; nodemask_t *allowed_mask; -- 2.39.5