From patchwork Thu Mar 21 03:27:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13598363 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 159A7C54E68 for ; Thu, 21 Mar 2024 03:28:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA5E56B0098; Wed, 20 Mar 2024 23:28:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEDCC6B008C; Wed, 20 Mar 2024 23:28:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 747416B009A; Wed, 20 Mar 2024 23:28:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4AEDD6B008C for ; Wed, 20 Mar 2024 23:28:56 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 26DF6121542 for ; Thu, 21 Mar 2024 03:28:56 +0000 (UTC) X-FDA: 81919614672.19.AF0D016 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf19.hostedemail.com (Postfix) with ESMTP id E04AC1A0003; Thu, 21 Mar 2024 03:28:52 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf19.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 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=1710991734; 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=5kHlQguiyY0NIsEqNK4PelI7nnqf6T638TpoAY/bxh0=; b=ykZ69BUxJL/oMhMHPS4GPNxYpUugdFKDzbdcX0G473MhUv+w44zcszEGqBgn9jyOSy/qrs su6iOsyBYNFKC82t4DbSdloH3aRDKWWqttzIG/T3OUGr7U6M1TxnO9InEALjXQNghfh3y9 nxhEku+kHwZbPseF41RSlxGZNuob0/s= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf19.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710991734; a=rsa-sha256; cv=none; b=o813MUWduU+rFBsa7EGthWvl5rofusficK/22GLuo6eSqCpVNRtoKjwhcfpiVpDSD3CLEe bRxl4XwZQ0OkVWu8y8PC60ldawj0VkbIz2Bkcf2YsyMYbXIZZXRbUFQ380nkBf+OaESJwU EmmB0J6hwIsvwMb7p25tcGwQPolsNJk= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4V0W875zfSz1h2YJ; Thu, 21 Mar 2024 11:26:15 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id A927E1A0172; Thu, 21 Mar 2024 11:28:49 +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:48 +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 03/11] mm: migrate_device: unify migrate folio for MIGRATE_SYNC_NO_COPY Date: Thu, 21 Mar 2024 11:27:39 +0800 Message-ID: <20240321032747.87694-4-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: E04AC1A0003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 7wqm64mfxa54eajz1pgbwoyw44rsipe7 X-HE-Tag: 1710991732-702554 X-HE-Meta: U2FsdGVkX1+RVYUAiMnVWFtGUbu61Wo+r0VHwRB2+eaGCoBuhGNPUdvzNlY8iJltnOkKN0A6ExMprLNzh2vpmRw0dMfIwHCTJi9BmIqZnHqRv+IFZ4YDBUJ9pfLtylOVDJmjmF6/c0W8ey0D/fIEcuge9sEnZOnq14GllI8WIEyXa7M8kLzYWAzR+bKd8xYwVc0kcI4Hdept0+f/NRRF71hWKutbpUbMp1FNvkrPvlG1QCr/93lktA1EBayEulyhoQQEBvsgj7oDlOe9frF0+Znc0DXCEJ1zWOiHyfqStiy+dVlCYPql6E0at2KKArxWNfEfFJ6mkuUjR8cmn4B5e/OKAujEbHZSap8Aen44vwHfB8IL/Umd/s13UKf2kOWL9END9WvxEOH7tnssjFwKTHSlDAhpgFuwAEyE06/Dw6depaif3sr0YjNTHgkV6lX/RphnbEZ1KGRXiIZ4L8bu1hPTPAVvn2iIOhpaOxNNGr/ej7O4uPfSxoUXCRqzOAWy+ye3iCInkR20CPbhdgRWUzV8YlYog0IWfY1LKQA3T5+ztfoH4uYEcsAZBDW01Y0IKhBy5u1QgZIlgRbpuf5YvS6Ttzjlrse3Xb5SP5sH0ld+3/cCLkf/7KTlXiTPpdPWs0IEvYGOTNAkaSf3KrrrUHbabeyNtEJ2tQPOVPuvU1Qe3S+UvZdAIjqYeQELqELYjW15ouDSFv6xaPFb90le+3op/u6R/CjnyxbrnheURtov5IzD1V8fPSZSLRjpN/ANp1FbgAz7S4YFxe0Ir9LjbBhTo7gdKKxQpJK4gXFiCXCyXCNil4SFRBnpufIXN6mKTu/1UPvInneYrpXCWRJXcbMbR4x6eFsPGwZd/8FA+XCqhZsTdL7+YvvwpS0lSO73tNgnGXtPZ/uPE7zaEH3Lr/EWX31QQSWCSbR4TYG8407bIjR5KdVxUuO+vCd9HAHJnpGrpPWPvCfVJ/j2giY rkePdwlD 71FPnOD2hGEcmV5MfDzrzpR/OMeHDDMFRs3AR0j73/HlVHszN1F9Gsw/hwcHEK6aBTf2rRBBG62AWATbgGRVH4ybke9J5GICN/mhrQ585wS1ogsxxLLp2yCqE/xAAbK+Fz+ivXqhwRu5NZi9mTuM6NthLajG4iBWFoXyIYpXjI/amtP0+R83NGCcEhfuFbZQYlEPn+THlaMHsJNk= 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_device_pages() won't copy page so MIGRATE_SYNC_NO_COPY passed into migrate_folio()/migrate_folio_extra(), actually a easy way is just to call folio_migrate_mapping()/folio_migrate_flags(), converting it to unify and simplify the migrate device pages, which also remove the only call for MIGRATE_SYNC_NO_COPY. Signed-off-by: Kefeng Wang --- mm/migrate_device.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index ee4d60951670..c0547271eaaa 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -695,7 +695,7 @@ static void __migrate_device_pages(unsigned long *src_pfns, struct page *page = migrate_pfn_to_page(src_pfns[i]); struct address_space *mapping; struct folio *newfolio, *folio; - int r; + int r, extra_cnt = 0; if (!newpage) { src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; @@ -757,14 +757,15 @@ static void __migrate_device_pages(unsigned long *src_pfns, continue; } + BUG_ON(folio_test_writeback(folio)); + if (migrate && migrate->fault_page == page) - r = migrate_folio_extra(mapping, newfolio, folio, - MIGRATE_SYNC_NO_COPY, 1); - else - r = migrate_folio(mapping, newfolio, folio, - MIGRATE_SYNC_NO_COPY); + extra_cnt = 1; + r = folio_migrate_mapping(mapping, newfolio, folio, extra_cnt); if (r != MIGRATEPAGE_SUCCESS) src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; + else + folio_migrate_flags(newfolio, folio); } if (notified)