From patchwork Thu Mar 21 03:27:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13598366 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 BFE2CC54E58 for ; Thu, 21 Mar 2024 03:29:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D0EB6B0099; Wed, 20 Mar 2024 23:28:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 155096B0095; Wed, 20 Mar 2024 23:28:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDEA46B0096; Wed, 20 Mar 2024 23:28:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 87C4D6B009E for ; Wed, 20 Mar 2024 23:28:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4DAAA814EB for ; Thu, 21 Mar 2024 03:28:57 +0000 (UTC) X-FDA: 81919614714.14.C117480 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf04.hostedemail.com (Postfix) with ESMTP id C9E4040009; Thu, 21 Mar 2024 03:28:53 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 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=1710991735; 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=neFvFD6XmKhwmSkGqIVMQMMsXjTLSUt4syOUTN94+tY=; b=0q1EI7/plzhzSHjPqdQVwtSNaFSevBzVZwpOq5a0bWixhlmbasy6T+og2xjwvJoaU3psbi 5Ss/8xt9oidGEVUvE8vkntuJpITLANTW+AsrBW2S0d8j8bVPdTiUHVdv5SRgtIhqtp1191 0PANLCryTdjTxqdud3GJfNmllKeqtuA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710991735; a=rsa-sha256; cv=none; b=5ji/VanlOGf3DQ9S7TwIayx/VPXQs2ugmm476Yh1gF3yKjJBHQ4F/pRmR2zdyJkYswy6am JYrhtukvY7RXmLEb4BNdRNAPCxj7w6krU7kJacedEK0uVXgveF/r2N8U4xKrSl6lxnPvEw WphqCJIZHR6brr3HT0msd0nsn87u3pU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 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.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4V0WBC62zLz1vx7q; Thu, 21 Mar 2024 11:28:03 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 6B7D314037D; Thu, 21 Mar 2024 11:28:50 +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; Thu, 21 Mar 2024 11:28:49 +0800 From: Kefeng Wang To: Andrew Morton , CC: Tony Luck , Naoya Horiguchi , Miaohe Lin , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Zi Yan , Jiaqi Yan , Hugh Dickins , Kefeng Wang Subject: [PATCH v1 04/11] mm: migrate: remove migrate_folio_extra() Date: Thu, 21 Mar 2024 11:27:40 +0800 Message-ID: <20240321032747.87694-5-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240321032747.87694-1-wangkefeng.wang@huawei.com> References: <20240321032747.87694-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: C9E4040009 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: qde58hdeq7qwxupzoibymcdx74kyrbrw X-HE-Tag: 1710991733-633472 X-HE-Meta: U2FsdGVkX1/1N9N9rdF3gvvmYQryWeP4CStnC51LYhfBDmGsQDBxyo9kUJoHxeIg++qfslHz0QZhC714AT7h1BOIZwymWQOe3LWEwQND2xmmXqbV+6IXHAeLWr47+TWuitbR/vC4HuohMUgcOQXVHgKejBIeaDkA0giwGnnE0Cx2tsoqqpNQZV0EX1Q+EXpaGr+iTSgQsqFEB9JMTI+UzyYQGCjZcyDkYWf8hX+j9yvOjD6o6QGi7OWiaA9rKUPATAzSkHWfGlpAHaN/hO9qrDLK8sMrrFU48wYBV9JOHwcw3RaCh/Ylh6HarkNeuN+sZj5fC0t8fU7u8L3UcG8UDZH9Yo4NyBaQugGS2bufigveZjIuJbaH+eRGydGbvjS3wptKSFwUYp8ajXUx39QfNho9OIacCtMqEyPb9zinC62fLIZ2fNgWTvepwXd00WY9Jbvz/Nqtqs8rWMSvlSQlH3ounxxFStrd7r1ejFHsIJU1+rIVgUW2Yi0K0GRhsh8h1FAud9ywW906vjO7m9xdAt9qAELn18tC4Gmw58/16c1hpvMj7DD79UuWHUk4XLdC2VuNjIYJj/x8VCuh7W+IlQP1vevNyPZ7btAzPFaUMGUYqnQQw/qxy3uNpvjd4PjM8wc/SrFIci/zcBx6UGe6nrTL9sJZ0XI+cWYh8SsiB4/LtqeXbhwbahkHWGem+Jt8SvM5YUbcWOuh8jH+uyqyORFuvg7CxLhDi9XhT4HAum+vHQ1ZOQzUokM98fPUgD/xok7BCHcCZdTSmTay2eKwgj+RdgI6f4iMIDFbifbvhGSgCXjFZmerzTABieKd8MWK9tOZr2NeAFf5cjqm4IHJy9dow6azv9G7Zenqh8CVFtoRcA6hABfI24NmDa78K6M/qYHK1NcjkEjPqdEceyokchWAjhJ8NkH41Ko8CPua04AyhzG/N34HuzaX7i75qvGxH26S3q7o2mQKcE07BaG xj+1x134 PNc6YkM1bgF6v+bE9FVZPrTSYzC0DkAHiBsz6d5og7ujcN4AruyfafSFPalFJSCos2zPBlcKTw0SaPbo/BNfTvEeiU5vqCQu5biPKkiYqTlHwLR3VcLbCegJkmKFxa493e+aq1mhuOiHXsVy5CPsMP3ZuSLJ7pmrgd3QBVDCIFRGe1vs2fC4J5NJZkzgcJ+REmXPT 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 2ce13e8a309b..517f70b70620 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 cb4cbaa42a35..c006b0b44013 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -658,18 +658,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 @@ -690,9 +691,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); @@ -846,20 +848,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);