From patchwork Fri May 24 05:28:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13672723 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 8ACAFC25B7A for ; Fri, 24 May 2024 05:29:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 207296B0096; Fri, 24 May 2024 01:29:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B6756B0099; Fri, 24 May 2024 01:29:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D2376B0096; Fri, 24 May 2024 01:29:53 -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 E088F6B0096 for ; Fri, 24 May 2024 01:29:52 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9DA9B1608BD for ; Fri, 24 May 2024 05:29:52 +0000 (UTC) X-FDA: 82152162624.20.ADA4500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf28.hostedemail.com (Postfix) with ESMTP id BCD06C0008; Fri, 24 May 2024 05:29:49 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716528590; 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=7LINns6u6XINepRudvhCLzjVAhVYTKUd8WDvD2mfO8E=; b=gXd/IK4NFbk5sAFejw+L2r9huZHXR3HbBSo6LxSY0mP8pUhVrD5SB96S5rgfo9MKSoeo9d lMHUqVXwOfz42Fx1sfbSxrxwppDei62Zzlu2SbqD+Zvi3xQ+rW+LEnmVe809AcXKt/MaM8 /0WPhU932X9des0kOmyhTeTv/EymFUE= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716528590; a=rsa-sha256; cv=none; b=oCSRGI1RizK/4N7sO7UbU/MAGsBe1yomaT05/rnlD+6L4i9Lw+NhtDLqoHD/wblZ5JYf3T y4g4uNzp1l+P6NdbDPSFw6+Iaex0r5Grr71lW0Y6Fmg5YunXF29WNiZcUtv+jyJibnLKe+ ny4sPZs/W3FAB5A0Fu3YgN9czW4hCPM= Received: from mail.maildlp.com (unknown [172.19.162.254]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4VltnZ18qbzPmcb; Fri, 24 May 2024 13:26:42 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 306671800BC; Fri, 24 May 2024 13:29:31 +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; Fri, 24 May 2024 13:29:16 +0800 From: Kefeng Wang To: , CC: Tony Luck , Miaohe Lin , , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , Zi Yan , Jiaqi Yan , Hugh Dickins , Vishal Moola , Alistair Popple , Kefeng Wang Subject: [PATCH 4/5] mm: migrate: remove migrate_folio_extra() Date: Fri, 24 May 2024 13:28:42 +0800 Message-ID: <20240524052843.182275-5-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240524052843.182275-1-wangkefeng.wang@huawei.com> References: <20240524052843.182275-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: BCD06C0008 X-Stat-Signature: rtso1zegxqws9dctsskeitn6z4nf65ze X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1716528589-994116 X-HE-Meta: U2FsdGVkX1/GvGEycC3b4U3+XG1Emht2zI83kvePLsiJbGkH+Ek46sKrUZnPDiCYTf+HD9hFQJhLNEMRGpYB2kGRNvpjco93sZqDdvIFxNbUnfX73rUuPvCKy8SLcMWX4We9msI2DvRZquX5+dOLpckYf0TXhPMW9RkeA6KI7gldk2tpljhZufB5S2SvNhGiAy0BAUP1otLPF1CUj8OKwc2IrKPCcTQEmZAckMMYs0743BeQDJpvc82hu0ITr6u4zZhzyWpgqz1K7lvdIStXwTr8uNL3ScP8B+nRHdTqYHqHThmEMh8XrahyfZWvgIE8j2aIDYB1ukwYDCngeUC10m/uX+WqZJ/E/CuCol4Os4bm5E280cUKwNbhLj53PXyitAcHDYBxlP3nyex+X9RTPeC3gp696BpXPKKQBF7zHx6JKqSiq1etmIAg40/qLzPBiVv1yc370PCrMSumJOm2mMBGi0Stosh1LLlHfiXfKuvpcWIICjjFyJlH719EQ1cc8JwcBeWfnvWFpkQsjQrJ1PM8FAgx/uifcbFQ24KtXrxJRkCIt0aZ3GvVDxWsRKev9MD1OiK7l07EGnsJg0axeQFAhhFWosCXSte+QpyQo8CDJ46xyXQ3SNdrh5UQ7qdKi/h766WGi64e5mJXhxCxODeVO9n3wUgcbxQBX8yDhI3hi91YdHzFzRMDb/OqReO9Rf0IWyPwdp95yuLXvy1ADthkEiWVkiDas039Qr40+QuMIJAyL5wX/dGU9xcsr84x6ux0e6nH4gKcKwwmU7X9FMNRyNPC0IieoR2T5zBguuXGh/s8QS6Km8IvofQEwgss1zl8wF+YheCMNVy+Q+OabeXoPbj+C5jeILRf+NXBR/APHfe6gkJhJvapiqbmur7u6RdxVDx2WCQLEy+YwHZNW1IVfAsT70wRQYP4gdi+yFLjnuvB1B/WmvO6hOqysNoj8lIw/yM8MP0/PrQ9jIo 1hJXOCMr VXDYHNqk9lS/6wt7tvBRLDQzrajIDTPQ9gSE0ng4L4MCT7rYiLvxYKY1PguvS3H7CCliEK1uLKt8lCv/qPpWfkv8+1V6vRpTBZn3srvyhgukj25aUQrUiFCtPnvF4tqaqqD+p+j30zLyB+W1002FHCxqWk96f3/VX/FA4PO4AqfiXkTx3DjX9rcLITqa261AQlVSDXFy7+9Xr79QzP7iU7x2FnBq0scw+CK46e55K9YTkbBKPfFFkKBgR+HxXI9R2YlCOOQujx0PytxQ= 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 Reviewed-by: Jane Chu --- 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 159f737501e1..1d1cb832fdb4 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);