From patchwork Wed Apr 24 13:59:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13641922 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 AEF2DC10F15 for ; Wed, 24 Apr 2024 14:00:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C9858D001B; Wed, 24 Apr 2024 09:59:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D2988D0013; Wed, 24 Apr 2024 09:59:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C31FF8D001B; Wed, 24 Apr 2024 09:59:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3E3B68D0010 for ; Wed, 24 Apr 2024 09:59:44 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E23324097D for ; Wed, 24 Apr 2024 13:59:43 +0000 (UTC) X-FDA: 82044583446.29.95729C2 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf08.hostedemail.com (Postfix) with ESMTP id 470E516001D; Wed, 24 Apr 2024 13:59:39 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713967181; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NOrRckkjpv1GZbrWZHGDKbwKYiLPnl2coNQstv+7hsw=; b=2PP728jHZOJmbhhS82LpidWXDmJej3v9EQu3w8Kk/0YmfJlo9RId63crz8TMC4cPvapOKW ctGfGJWQctBvTAEmUck9HhQxz7T4Mc48UoilZ958r9v6bKto9Dfgt+nhn4w0FXYCSCaknU prKTb8DlffwvSzDxS/Rl4sgVO9n80Zk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713967181; a=rsa-sha256; cv=none; b=GdEHjiKdgF+9kpqzO+N/FisYHuM5H02ATLJ2xj4UGDZkVDpvVH3Ypb/Cs+ZcD/fR1ENDSw aoOTBql/KOEJcwW1dTJVoeIPG0dqruHSskS1RGCklEWjFhn2sdrtA07LcpSQqhbqB9ia/Y lQnGnW16CDsmN4Divo4YQH776O87rgA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VPgWY4SdxzwSNk; Wed, 24 Apr 2024 21:56:25 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 8AF18140156; Wed, 24 Apr 2024 21:59:36 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 24 Apr 2024 21:59:35 +0800 From: Kefeng Wang To: Andrew Morton , CC: Tony Luck , Miaohe Lin , Naoya Horiguchi , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Zi Yan , Jiaqi Yan , Hugh Dickins , Vishal Moola , Kefeng Wang Subject: [PATCH v2 04/10] mm: migrate: remove migrate_folio_extra() Date: Wed, 24 Apr 2024 21:59:23 +0800 Message-ID: <20240424135929.2847185-5-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240424135929.2847185-1-wangkefeng.wang@huawei.com> References: <20240424135929.2847185-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 470E516001D X-Stat-Signature: nna4w63nt5hiyrix3zhq8sq46pedzndn X-HE-Tag: 1713967179-725641 X-HE-Meta: U2FsdGVkX197nKErbYtnmruMH5oZr9tGnk8GeP0f6JQ3BZit+0RVk6QloraynDpbXcTG9L7xGyuZw7tjmmZChtA92J2O6u0M091QnPP6JgElcEFCmdFRsR++XSHU/23h0IEm5hlNVo+fKwRb1Izno37BFETb1IFnyWlY6kigRreB8MUbt73o2pn9QcS5PuKrk5fAePdeW7M84sGCi0ljx1/URcZiWVXLXtjIt34yvNaT40tfYoEL+t2nG0pvZMqnU/wwU5GcVnmSO8Ho2duiJVHGXd+qgLs4BbCfofDFMxgj1Phkv0Z3xnur+ELepguuptbTfEKqIDxbrwPtkOCP4/XG2GQ/eFSo4bQHCtbhAHK2gFNtWDI4iN7sovzGcddrrkNOar5kaF65swuqM9uQMqjJg/TaBcwgpFYIKQXCN/OXxwFx90ZQhgQL8C4t5cWYFEEacXlBJl/9aMMCWhJiAthBVEG4aym7CTnMVWL/cRZ744hGcNRdirWy2fssp4gDSWszqKdupmH8Gy96GjZedrQzRih7mNVPWOSsHzYEot25vZ3pk/sd2RQmqO2MmoaeXkp08XM8wf87vFyh1HcqxLGGL/3GTJrr7dgWm6TJg7mw8GAX7zId8ktizUNVN4GIblL6wDSkmLSjorXjRxyFH2BnJvQ8ySgGvjuzkzdwQ5sKvoZvWTVucC+5ydSJR+HRVJHA7xCZ4qoNZZwHbm8gI6oTL6y6eqRQIMw3KkCQPRLiPHNVyMReD3or2mDm7AkN7y4uYlGfszYH6OCjnS2lXE2O3/m3LSQ8chiixXSzC42j3A45rwOqyL3sFAybdPKUXr+UGtpWlodFGYc7RJFWuY7t+AjugveqCtTjouSCTQFEq5T2rE6R3b2aBHZ95Mhu9TJDPRsKY2ra4V4wq9qpsliY9wYOMEfl3q140Vzitn9TyLnXfUeGlhwHMfkQttkryAL9XWgTOssLhimu9ZV JpOA9yB7 P73Volht8hNLQVotrKpgZI7rsjxudF5Ju3Z4NNEOD5cQ7flkkpnXKcOkfvmiMR4MyLUywJrex2aONdJP3G2A46zLnLx/h7cBjRnUpCgRA/E9992VT4emyT4cDulGtTPMIFS81zpKFaMUDjWYX8Ra0iG8twKqfTDtGXioYk4Qqar3oWb+VuCffPlVgg+GWu3d/hSFU9EWD0jO1//Fmu4ueyVS01lTl6ebB7IqORCk8m9pyveHtptRGct/Kr2xt66mpiuTCBm8QrLnermY= 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: The migrate_folio_extra() only called in migrate.c now, convert it a static function and take a new src_private argument which could be shared by migrate_folio() and filemap_migrate_folio() to simplify code a bit. Signed-off-by: Kefeng Wang --- include/linux/migrate.h | 2 -- mm/migrate.c | 33 +++++++++++---------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 938efa2fd6d7..535d1a5561c4 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -63,8 +63,6 @@ extern const char *migrate_reason_names[MR_TYPES]; #ifdef CONFIG_MIGRATION void putback_movable_pages(struct list_head *l); -int migrate_folio_extra(struct address_space *mapping, struct folio *dst, - struct folio *src, enum migrate_mode mode, int extra_count); int migrate_folio(struct address_space *mapping, struct folio *dst, struct folio *src, enum migrate_mode mode); int migrate_pages(struct list_head *l, new_folio_t new, free_folio_t free, diff --git a/mm/migrate.c b/mm/migrate.c index 9cc5a3e1d97c..ce4142ac8565 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -684,18 +684,19 @@ EXPORT_SYMBOL(folio_migrate_copy); * Migration functions ***********************************************************/ -int migrate_folio_extra(struct address_space *mapping, struct folio *dst, - struct folio *src, enum migrate_mode mode, int extra_count) +static int __migrate_folio(struct address_space *mapping, struct folio *dst, + struct folio *src, void *src_private, + enum migrate_mode mode) { int rc; - BUG_ON(folio_test_writeback(src)); /* Writeback must be complete */ - - rc = folio_migrate_mapping(mapping, dst, src, extra_count); - + rc = folio_migrate_mapping(mapping, dst, src, 0); if (rc != MIGRATEPAGE_SUCCESS) return rc; + if (src_private) + folio_attach_private(dst, folio_detach_private(src)); + if (mode != MIGRATE_SYNC_NO_COPY) folio_migrate_copy(dst, src); else @@ -716,9 +717,10 @@ int migrate_folio_extra(struct address_space *mapping, struct folio *dst, * Folios are locked upon entry and exit. */ int migrate_folio(struct address_space *mapping, struct folio *dst, - struct folio *src, enum migrate_mode mode) + struct folio *src, enum migrate_mode mode) { - return migrate_folio_extra(mapping, dst, src, mode, 0); + BUG_ON(folio_test_writeback(src)); /* Writeback must be complete */ + return __migrate_folio(mapping, dst, src, NULL, mode); } EXPORT_SYMBOL(migrate_folio); @@ -872,20 +874,7 @@ EXPORT_SYMBOL_GPL(buffer_migrate_folio_norefs); int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, struct folio *src, enum migrate_mode mode) { - int ret; - - ret = folio_migrate_mapping(mapping, dst, src, 0); - if (ret != MIGRATEPAGE_SUCCESS) - return ret; - - if (folio_get_private(src)) - folio_attach_private(dst, folio_detach_private(src)); - - if (mode != MIGRATE_SYNC_NO_COPY) - folio_migrate_copy(dst, src); - else - folio_migrate_flags(dst, src); - return MIGRATEPAGE_SUCCESS; + return __migrate_folio(mapping, dst, src, folio_get_private(src), mode); } EXPORT_SYMBOL_GPL(filemap_migrate_folio);