From patchwork Wed Jun 26 08:53:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13712431 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 428A1C27C4F for ; Wed, 26 Jun 2024 08:54:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 990CA6B0095; Wed, 26 Jun 2024 04:54:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A2D36B0098; Wed, 26 Jun 2024 04:54:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63A826B0095; Wed, 26 Jun 2024 04:54:46 -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 186546B0099 for ; Wed, 26 Jun 2024 04:54:46 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CA2771C1C11 for ; Wed, 26 Jun 2024 08:54:45 +0000 (UTC) X-FDA: 82272429330.18.3F71D8E Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf23.hostedemail.com (Postfix) with ESMTP id 313E414000B; Wed, 26 Jun 2024 08:54:42 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 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=1719392075; 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=sh/rLJatyLcvr58SzlyCdL8mOi1a46w/NsBvf6k1hqw=; b=sysLQFJxI1bmUSb35vhmr0kx2EHfJZHebrMy6fCXEeWVCNMwW7NxlzURCo+BWirqrVJEPk GsU037BVElw6VXcaNy3poboEneNA0G/YN+SE3I3hSCRPbOqbFgQHIKNS3adRSmEe/SxGCS dryS0JhDp1kG3g7Z9HXxP4pbErIQZJE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719392075; a=rsa-sha256; cv=none; b=CLyNdEk2AWSKdbAX99Ri0Bvb3KF8JyMo4kGkV2idLXls+hlF8OSvjn7K9XHfJ512QQFnGn idBxNe5IR4a7BKMCfwqVHmZLwpzcM4ydgJ1QwLiEUch5Hg15blizltwYaxn/Imma+AEus+ etUx08a3Kx4DKG6eXQ0BK7TtVA86SOs= Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4W8FpV0zlvzddvV; Wed, 26 Jun 2024 16:53:06 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id 0453514011B; Wed, 26 Jun 2024 16:54:40 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 26 Jun 2024 16:54:39 +0800 From: Kefeng Wang To: , CC: Tony Luck , Miaohe Lin , , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , Jiaqi Yan , Hugh Dickins , Vishal Moola , Alistair Popple , Jane Chu , Oscar Salvador , Lance Yang , Kefeng Wang Subject: [PATCH v5 6/6] mm: migrate: remove folio_migrate_copy() Date: Wed, 26 Jun 2024 16:53:28 +0800 Message-ID: <20240626085328.608006-7-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240626085328.608006-1-wangkefeng.wang@huawei.com> References: <20240626085328.608006-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 dggpemf100008.china.huawei.com (7.185.36.138) X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 313E414000B X-Stat-Signature: 4mnrg188huyxo8fzjxp91m3zuwwsduu5 X-Rspam-User: X-HE-Tag: 1719392082-41563 X-HE-Meta: U2FsdGVkX19dWLhFiTyVrBB96C1LVcy52MVEXg6ZvMIYpv/alen6vAXvA8IccfAr3so5bE/QMD6N1RAwaDV2i8Fzvc/HyVl9//DVtO1nmNcjoL3vi+LG+dxnFKbFnTYW7eZxDJIezptbuIpuM43lygESCf6F6Q4YH4RA+kImO8W5b3f27Kv6Az2xPIztcIybfolaCHrDDk+StZPfUL/Zq+w/CE6QwYcmx+Tp4II7koXFTPrfo44xA13BSrZQl9m3pqEeFoorJRt9cB6D7TDz/KQm7+7KleisQjWoO8NObOe3H9oce32I3GTc8q4uUKDIr7grDhgEVNxRcV0ua02Rep6HmoJIMNXs90rWqDzXMaNIrDxMtUq8Zrs7zBrXlfyio8J7p7nNmxr8q1rNfqoOoUDP2CceluYB1Tf1l5L72i/rFSG2jTI6phHZrBPV2EKl8MJknnaFtI0qL+klwMN1x7iJDJbDWlK+8qtQFEr9vxsCa2Fn44wxFo0OhCo3bKf7/GozjK6sUgwtFGrDJ/S2R7Au7pQ4XoZKapH8GJDvP0CyE+U9ReIU7nPkmFHHJX+MOosGr3FXrJCJK1OJzSWKdFs2NzgDHu7Kt988zbHBDqrFZq9JRfaDXtUciv6AZ1beRBuIa3RkL6g0Siof50m7+jWpQe4aVFfmStvH+CmaRZyHLlFlcgszepW7BgjQewF1CtqlnBSjf0eIV+ZC+RsLFLwIaim4NMX+6tNMmSSLRJzv3+3pWqzjM8dkw861zSu28uwuih+OKl+5qHshOamx4JZHy7MQkg8wPUZTO4hRT7dYYU/kSpZXDdDWR1XifS0Qtl5itEaA+9hTYVIWkkciXMhgFt5b5RXZGUQwUHlBo9sAIYY62j5TKcl07Eg14LDE9u8zLQL6jRIFmaGSP8R6e2orF3/dCMWM39y/Ror1LYTtX/utB8ssgGtHmyoJpY03X9oNbrnXlcdulI/Ggds 975RK1RZ XPClbfWU8l8k/0EQdelsucFHqcIkJFal9hbvw/QRcbr0kA9tX5o5eIFCCIQrTGFR2bq87EaXXuie9+TdYXjV1p2101rv+L6pSUiZyICs+CHiYcvu7nmwaR5+ibdI+JSvuJVo9CLRNRLsgQN2EhJ2N+5SqSTudmqYJzo5J74DQrj4HtPf/mfMLChqbvtos/rMlAeOTpwZpmIgyYUBi82pPvE7PJvCTp0t2jFLJwOP6F3OVWBg5JAgZhG0kuN0f8xby1YyM3CLKrrEFImPYr+AM01BJX/+VagPRtAyR 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(). Reviewed-by: Jane Chu 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 ed730b5f4c54..6066f64967b3 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -455,7 +455,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_folios[idx] != src); ctx->ring_folios[idx] = dst; spin_unlock_irqrestore(&ctx->completion_lock, flags); diff --git a/include/linux/migrate.h b/include/linux/migrate.h index af2579ae93f2..644be30b69c8 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 ad78b053815a..906f6a2e4f38 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -659,13 +659,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 ***********************************************************/