From mboxrd@z Thu Jan 1 00:00:00 1970 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 7029EC25B7A for ; Fri, 24 May 2024 05:29:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E17A66B008A; Fri, 24 May 2024 01:29:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC4B36B008C; Fri, 24 May 2024 01:29:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C17C16B0092; Fri, 24 May 2024 01:29:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9CC7E6B008C for ; Fri, 24 May 2024 01:29:23 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 53AADC087D for ; Fri, 24 May 2024 05:29:23 +0000 (UTC) X-FDA: 82152161406.09.3657A9F Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf01.hostedemail.com (Postfix) with ESMTP id AF4104001F; Fri, 24 May 2024 05:29:20 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf01.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 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=1716528561; 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=MRKLb1JgakbWd7i8F4UuBmHSAShxsfei2gxNvpAs8ME=; b=7Umy7xnOyx/Anq4uqi5QfuT+KopmNCb+6QerG7wWL/Lc44VBgWUojPcGwdRC2SMG6pTpKR zP2/JhoYczaEFWhFpVYYPw6keVs4Hv52icW2brcdaDZZuOAEFzGU31XjdlruY+9XUzHtUY +n4rstSfzK9dUyY6AG60btRF+ooyi70= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf01.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716528561; a=rsa-sha256; cv=none; b=WDOe6nuWFhU4IwLH5jPWGwqCHZlsZhvXjs0Hc+N8vWZEAC8ChnTCxCpFMmeW74sImmbo7Y Ye9kebzD4tYTSDNljBkcu9u3uLYt4lNZs7pk8HYbf+TC26iePjknGvOxj4xWmwpJg4F6Pc p45qU7YDfgqNllDC4fTra0ORuMv1pk8= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Vltq10YmYzcjWn; Fri, 24 May 2024 13:27:57 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 7E19218007E; Fri, 24 May 2024 13:29:15 +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:14 +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 2/5] mm: migrate_device: use a newfolio in __migrate_device_pages() Date: Fri, 24 May 2024 13:28:40 +0800 Message-ID: <20240524052843.182275-3-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: AF4104001F X-Stat-Signature: e6u1tzempou3cgrpqr3jiwemb1ia9a7e X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716528560-36843 X-HE-Meta: U2FsdGVkX1+4BhYcVju9XyK+KPOJG5yL9kQFw4lBcLF6TM7T/NLftpDfEVCxBd4r7WUWYRR5QsKo/PZEMyWN7HGXm1LoBspfL7zCHOfAHAkmRX26tc1yKKKe7C5D51ePGKCHJC0aKl2HGKBeVD/BQaDp1lDXZ5sIPHaEQI551aqvp0CDb2A2OU9EnNGS+PRr96NeRXPu44FEU+wZ6+vQPSS1zdBsAdNkaluWQlLo/vnT4/ZVMCZejGI85iXtl8VEQTFYvSTsHpTw1jMlwHn2+wOdSpW1pZUujvJ4Uv5MsEqNowgwnUkV10cLeN0ZzVR8cqtK7gKPrxcxF0G+I4ake/ygNN1BERTFtNemXm6QJNXi7MlYRKlTzJGn0YgaFJbTeMQ9KOGu9eXy21y/cwmCmiLIJG8FHS7N7u0ZFYHtS26G43nfSR/fpckpjzTGFEuN6SVP4cgQ1LJ4TRJvknMc/Ipc11pt4JGxHYz8VHILFPQSu1Sq/3HnwaoSTFqVzoivEMlOEDSl/LDCzxtSXSB3fBLBf7VFID6r9qAhAT3oe9DPMef8xsUwmXOXZmZ6J6wKAI2fgEuuz+cQ+f49tUOfyl8hjb856Xg6VGc4czaFGHzspWYV+1gXHIlrFYLeuLGRlF8gIAhMJOsMDDdyN3+T17ZkVkjJ9/Z1QzzX4Vk3hUUC3Omycxk9sDdxMWzCIcOvSa5Llbi7A1H6XjXglfOWVuKK/VpirbTZncXQsgFoRV5TdUYVwywvZyvCOFM2K8soAEvva1o3xVeGSpzDI3uWP+JO14jvm10eKx/U0ntvCPmdY0YpGe6/eG9OAgRq9mkyebpV/NSM4CfrxqhB8NHk5zYCpHaLPd4r+WpUK96jXyKDZZqdf52A4FGdKAH26HNna+DV1TPPrZhgXktA7WgGlAInFQbQEDuXm9ppByPJJZjLfxKpgZPNkvf9wLOZySJq2/3HTW/T9nzmS2bAS4P m2DhpE21 0FNN/KxZNtgiaBoI/Sp3ukDfJZeNcg5ad3zdvZ/c98geLoulse2qj2rCptfbw5+nQJWXbmEUG9nSzlfnWv9QIKPO4+qLT21xmaU9BS9QHv+gozUW7ZbKrXW9HwLKvJJs0siaIZEO37csbEuqLm+A5k29RjMaVcijNIh6OJ8Y98m+bqPPT6ncHGOvvu8VkMH9OdOci0hXgEceBJz76fPbJeP7HzDj75wUFHeob2Wq7753OEcKRrfmQ3GLFRfj9tE2nHAL3hLcQjhPCP/MfyQdSwCzUgrZdUZqMmFZUaXQYmVtvuLuXyL8CppPO6Jdhff4KAdP+lcCafmmo7mp5ixmMzQrjElmzYTpcT1/c 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: Use a newfolio instead of newpage and convert to more folio api in __migrate_device_pages(). Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Miaohe Lin Signed-off-by: Kefeng Wang --- mm/migrate_device.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index aecc71972a87..f5e034de718a 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -692,7 +692,7 @@ static void __migrate_device_pages(unsigned long *src_pfns, struct page *newpage = migrate_pfn_to_page(dst_pfns[i]); struct page *page = migrate_pfn_to_page(src_pfns[i]); struct address_space *mapping; - struct folio *folio; + struct folio *newfolio, *folio; int r; if (!newpage) { @@ -727,11 +727,12 @@ static void __migrate_device_pages(unsigned long *src_pfns, continue; } + newfolio = page_folio(newpage); folio = page_folio(page); mapping = folio_mapping(folio); - if (is_device_private_page(newpage) || - is_device_coherent_page(newpage)) { + if (folio_is_device_private(newfolio) || + folio_is_device_coherent(newfolio)) { if (mapping) { /* * For now only support anonymous memory migrating to @@ -745,7 +746,7 @@ static void __migrate_device_pages(unsigned long *src_pfns, continue; } } - } else if (is_zone_device_page(newpage)) { + } else if (folio_is_zone_device(newfolio)) { /* * Other types of ZONE_DEVICE page are not supported. */ @@ -754,11 +755,11 @@ static void __migrate_device_pages(unsigned long *src_pfns, } if (migrate && migrate->fault_page == page) - r = migrate_folio_extra(mapping, page_folio(newpage), - folio, MIGRATE_SYNC_NO_COPY, 1); + r = migrate_folio_extra(mapping, newfolio, folio, + MIGRATE_SYNC_NO_COPY, 1); else - r = migrate_folio(mapping, page_folio(newpage), - folio, MIGRATE_SYNC_NO_COPY); + r = migrate_folio(mapping, newfolio, folio, + MIGRATE_SYNC_NO_COPY); if (r != MIGRATEPAGE_SUCCESS) src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; } -- 2.27.0