From patchwork Tue Feb 6 11:21:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13547065 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 A267EC4829A for ; Tue, 6 Feb 2024 11:22:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F6AE6B0092; Tue, 6 Feb 2024 06:21:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E0486B009C; Tue, 6 Feb 2024 06:21:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 360F66B0092; Tue, 6 Feb 2024 06:21:55 -0500 (EST) 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 D4D876B0092 for ; Tue, 6 Feb 2024 06:21:54 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id ADA0B80B78 for ; Tue, 6 Feb 2024 11:21:54 +0000 (UTC) X-FDA: 81761139348.29.0C014B3 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf26.hostedemail.com (Postfix) with ESMTP id 85B7B140017; Tue, 6 Feb 2024 11:21:51 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.35 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=1707218512; 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=Lbim4OxWpe+7K4MQiappNT1vfza0vYYhAmOt8/UlubI=; b=JmKmDebATOrhpLN9XonNEGb04Ihv/yus1SiaaqpG3HXhTlG2EWUyDDVjhzE8HvsAe/JUu1 XjEYnV1mNVjA4kHKLecfhL/UTXcj9efDllJfO2r86jUEs77pcF1pdC3qsVNmmiI0Z2JtJC gYSJsF86DPp+fP5VrRwVPW9PXz5jQKI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707218512; a=rsa-sha256; cv=none; b=Uk5BG77nl2gAOsYiGq15bOGzA3tWzBdRzUgPY+l76TZ6lozArIvulddQ0eFM1HpGNTrSYJ xYRYMIpux1vZskkskzkrxuW0Yz/9dwMLqu9j14Q4e0s4MPt69dl2MMXFIgQK5zudEFQidG V3vy9oxgvEZICArFM4qXrsWg4Jre3jc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.35 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.44]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4TTgkw5npnz1Q8mm; Tue, 6 Feb 2024 19:19:52 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id DD363140412; Tue, 6 Feb 2024 19:21:48 +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_128_GCM_SHA256) id 15.1.2507.35; Tue, 6 Feb 2024 19:21:48 +0800 From: Kefeng Wang To: Andrew Morton , CC: Tony Luck , Naoya Horiguchi , Miaohe Lin , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Kefeng Wang Subject: [PATCH rfcv2 10/11] mm: migrate: remove folio_migrate_copy() Date: Tue, 6 Feb 2024 19:21:33 +0800 Message-ID: <20240206112134.1479464-11-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240206112134.1479464-1-wangkefeng.wang@huawei.com> References: <20240206112134.1479464-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: 85B7B140017 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: i39zcgiqzrxhbi34qy7yyscqff5o3q1y X-HE-Tag: 1707218511-549536 X-HE-Meta: U2FsdGVkX19m7BjD4wonFe/mIGi7IuiP5a7Pd34FlXAg4X7rcFpVAlTxJJmQPAc3ZEunNnmDkXhTaaJrrwO9RLuWikox1Q0rhm4Vt5h0KWnBd+X4JiWalnuWbFH68TOiysk33s6m6fnyvGnIrkpO2LKUDQIYfGseQR9ZYxG8jKggXk8j631n9U87pFCr30N5pcSMfV3hZlR7psYY7Ngl625moWD5ejZ4W/nAEjFIxDodR7GXejFAPIxhPhKeYF8+T5vgyqlQVdkwqtQ/jv6A0CGTaVyUXAirXeL9K2N2gpukQv2QClMkV5lhiU66fJMwpIw5D7Z4Mbp+YO93klfVgOvD5UCYN95NJTjIU0BrNTFlZ26ehZjsmd735H5iFu3d78GJ//xXSNgHTFW2ncBZ88NyvI8awfXa+2l4PRIbFd4BE5dbQE9N4UKTg0b6yQ/eUCqJaloosRKZahwYDIK6ZrInZYre3u6/aLfeNrwiiKLF0Stlj2W/mZ/rLZYgAxA7T3eETopCpexepSoLlg2iKAbr9lyESlj2qtdIWjnhrdwdA8PqcxzyOjyqUUHbhGDHVxbr4VNoxHqhEFjt8eH5nrSwmDGQjQ4TZZs9KYWPPUlbZqxmPsA0BEO3TZfAoOj94EPK8aPoRxuqKjZvTB8n7pxXduecm9Hn52JJqJf1SnIg3eNSOrWmeBAeAiaxPALUlR7LpC7ReYi6sjfDDJggizAnjbEpKKbtUeUlN8SJBtlFQpLpJDljqZ/VTH/LY2naAG7TyjOUGyckUfPOb7RxrfidOf5TrO6eCZeBolFBIOpoeJ01kr5puPq9oMiutbRoUyHW9ekBcSbU3oSyJpTxt2aWYTpeArq7VudUDzEGsbanBx0zkVL0t0oBTokLSCArEtkpdhcB6p15BDqiRTLQwn6E+dKZbeFaK1y9c/I2kjqmVfmSRIS7Rn5JteATmE/pKCUTJElH714RYqpAAoo pTrV+spN uzr4ruAKe3OqFaDIKasil9h8lNy6YXKG/NsG1ERUpg3q4isQFgwynFAXkY9xr58OJIbB1OPr9A0QNzNsavozTN21UtBq5yGzu49GV3vy1X6v7nfd/dBYjGL68MqK1Qmyn5HBmAyqG6GNElOp+Xbc0QMQZzUUgbsADB+X5we8ir0DulTBS+4+NxOvqSwZVphrlb5T7 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 folio_migrate_copy() is just a wrapper of folio_copy() and folio_migrate_flags(), it is simple and only aio use it for now, unfold it and remove folio_migrate_copy(). Signed-off-by: Kefeng Wang --- fs/aio.c | 3 ++- include/linux/migrate.h | 1 - mm/migrate.c | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 1d0ca2a2776d..631e83eee5a1 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -454,7 +454,8 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst, * events from being lost. */ spin_lock_irqsave(&ctx->completion_lock, flags); - folio_migrate_copy(dst, src); + folio_copy(dst, src); + folio_migrate_flags(dst, src); BUG_ON(ctx->ring_pages[idx] != &src->page); ctx->ring_pages[idx] = &dst->page; spin_unlock_irqrestore(&ctx->completion_lock, flags); diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 517f70b70620..f9d92482d117 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -76,7 +76,6 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl) __releases(ptl); void folio_migrate_flags(struct folio *newfolio, struct folio *folio); -void folio_migrate_copy(struct folio *newfolio, struct folio *folio); int folio_migrate_mapping(struct address_space *mapping, struct folio *newfolio, struct folio *folio, int extra_count); diff --git a/mm/migrate.c b/mm/migrate.c index db189ed8ae06..7a3aa0294031 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -658,13 +658,6 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) } EXPORT_SYMBOL(folio_migrate_flags); -void folio_migrate_copy(struct folio *newfolio, struct folio *folio) -{ - folio_copy(newfolio, folio); - folio_migrate_flags(newfolio, folio); -} -EXPORT_SYMBOL(folio_migrate_copy); - /************************************************************ * Migration functions ***********************************************************/