From patchwork Tue May 28 13:45:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13676760 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 DB788C25B78 for ; Tue, 28 May 2024 13:45:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCDA16B0099; Tue, 28 May 2024 09:45:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA5C76B009B; Tue, 28 May 2024 09:45:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C45706B009C; Tue, 28 May 2024 09:45:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9F0286B009B for ; Tue, 28 May 2024 09:45:27 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5C7AEA35A0 for ; Tue, 28 May 2024 13:45:27 +0000 (UTC) X-FDA: 82167926694.12.E9F5D76 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf18.hostedemail.com (Postfix) with ESMTP id A273D1C0014; Tue, 28 May 2024 13:45:23 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.190 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=1716903924; 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=2ERo7fs/VL13wl1oZ7vh0gekVyJ93jqSyuHHJZLw1AE=; b=2/ueFSwDXJ+l2W0UUVWo+A37N4uS3jv8hB+SHBjfoEzCtY9jpPkLfpBMyZZXVhQvpkucmt CiCVQwjntkYpvZJ5JhKNR4nzhQN09OzCGFRuI9qHYH29nvIsveF44ssTgwHkzXIJK3xXJ7 sxHgaDBBr2xqVpX0wfYXwdoC9qbDLNg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716903924; a=rsa-sha256; cv=none; b=uKPXNUQK7Isu36cjQAEDcqg14bKwyFKcY/df+o1Py01S6Y8N22IgLoy7kzeboqDq5jNExj vduxv3feu9c4F1B5fCvZZvsMP+KOur+vsKY2RMH9HPh0agFhSnGTqiUcuoyNIx6gQAm66I Bgo8bnd0TAyjJv5mJPt835MdFexeaVw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.190 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 szxga04-in.huawei.com (SkyGuard) with ESMTP id 4VpYbS0Zsrz1yscx; Tue, 28 May 2024 21:42:12 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 6925A140158; Tue, 28 May 2024 21:45:20 +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; Tue, 28 May 2024 21:45:19 +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 , Jane Chu , Oscar Salvador , Kefeng Wang Subject: [PATCH v3 5/5] mm: migrate: remove folio_migrate_copy() Date: Tue, 28 May 2024 21:45:13 +0800 Message-ID: <20240528134513.2283548-6-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240528134513.2283548-1-wangkefeng.wang@huawei.com> References: <20240528134513.2283548-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-Server: rspam03 X-Rspamd-Queue-Id: A273D1C0014 X-Rspam-User: X-Stat-Signature: wgiap8j9ah969pjih4onfbbun8unhysn X-HE-Tag: 1716903923-281184 X-HE-Meta: U2FsdGVkX1+mVu/iH8GltEqdoF6Zw4QhrX6Ru5P1XCndjDZrv6Tcld77947s9AmO98kq8TmdcWodrjQ8oQ0IGhnrmPz4HlbJHUOafs7zxNnp1WKRJJjUIph1/jfvxRBbkcCpkQq05Rk9a1xg2lKp14EKc3tR72HG39B/mVzyjD7jgHjWUxuopo3lhsDyxUbqJHZpGCnySeKX7HNza1LS+evGxTWisjdkXHtDvWiZ5+61Wv6MRvGiLtbPy8/TIveVunCjW/Oo0NWA9SpT702nfz6nzGbHx35f/bjt+DFpeqCWQROM1qXeO+X8JCAfVhfBufJ0hSmVszQJJOWrQvP9XG2fvzEK4Y7H9dhWYxJUJb8fYjbf3ZO2Z1NNYfKomA3szI6zpE+9DOx7XGKHzGBA4d1YpXfROWDwJWlHCSj+zfIQBW7pt1+h50JIk17aqzXS+hVqPEpPucgm6FOuwcwSCGY37Zqb65r9JYA4ZwX/3PvwfvF0Jv4pIW5LIj5E9XqOrf8NMo3BcXMOv8qMDx46LHwBTpabWbzg7mw+KzHwvQH1U/nMF7UeebY8JfnmsEf8xkI4BXKLF9kDZU8k6bQ/lboO7aZG/gZ/I5EW3pt6YAlmD1TioocdWkJ/wyL903sG5AMa4/N2Zbjj8PfUuKXk7IhcxKYguiQXU6h+LOrSxhC6P3AM9ja8ko0vRr8BVbTvBGFD1v36a6seNpExaEalHuD3KEihvmwegylzpvsTcmM4lidagvF7U6b26ND6IAQnE0wJeddCD6PDq0gIzgkw2hD+3WyVExooqproCIPGYDBJi6wZ1yNvD5KKAnb+qQCPeyi1egcuQv2VA1mAE6IEYg4goHpayh1YANSeacmyGlgxBJhT8XhMn4GEBd+oONxXfQGgi9crD3QhqBipkWKywexO5A9V3DUGHuc2YTgMDWVweTiMDbmPmjRS6BMF0Q6c1wl+mQe9tqkP5lPMnJ0 voWfJvt7 S6r/RpzB1odCY+ImSmeggdyn/XOLUkB8ekttN9RTG0fhVj5LRlPCjDxW2pd8jAAs/u8bB9ar3/MHVwbFxcqYDdo6iALBbROc1Mc34JvgozmHV8RPnGlFegE2uWhrZX8HHiqApSYRCV++OGQGMw2nm+CNGhJem+2EDHOmGP7LgeKP7RwOO03DVJmsBQOdPi61Y2+SPQToNlQFHxHQUxtsa2w7j+4Z+bdGJiLjE/bTIn2/9EJ2p1krHSuV9FKVX5nqnZbcOCDjpB4xs7Fk= 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 07ff8bbdcd2a..bcee11fcb08b 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 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 78cfad677789..6404239938be 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -651,13 +651,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 ***********************************************************/