Received-SPF: pass (google.com: domain of linux-kernel+bounces-69353-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org, apopple@nvidia.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 6/6] mm/migrate_device: convert migrate_device_range() to folios
Date: Fri, 16 Feb 2024 13:13:20 -0800
Message-ID: <20240216211320.222431-6-sidhartha.kumar@oracle.com>
In-Reply-To: <20240216211320.222431-1-sidhartha.kumar@oracle.com>
References: <20240216211320.222431-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?y0v4x7AcUELOXDmidVcRvKpAqyvtWiFqd6sv7DdPiFofAk4GVbisveEXLAJ7?=
 =?us-ascii?Q?dMOea/odvvc+2cOvrD+LNcKbsTZl6GJ/Ubqzro2eF05WByRZkXmfsGrsugfe?=
 =?us-ascii?Q?gtagUdRVvsYDKO9UWPzmH/Kg3itUpn7u7+XLuyTlgX96mZg7TRWAJvb/gnbr?=
 =?us-ascii?Q?r1gVvO/w4RKBb+R8DC4B+qecjuFsXr8TZ5zXTQRKnwQ8jZmBwZKEtWvwWmdv?=
 =?us-ascii?Q?DM6WoKwlb+7V3OWqSE/CdIrBIKYDUcm+pJ4EzJjgspZSUKKgfCdPVMXqRj+3?=
 =?us-ascii?Q?LQHLsMXMzsEVEHj6gnC+PVsWqFUreiIMnm+YQ8UQWbYXnzOCMTrQcPTei53/?=
 =?us-ascii?Q?U4XzmDmqrzqGp8pOQEcsktYKvS3m0Oxz3lZRngHqG/RLP+JxbHX1baiJAGpn?=
 =?us-ascii?Q?+DyP8QQNGJx0KP8QfyWOMWP8Ff/gaoOmLdRep8uddlmkOdqo5eGT6ww1ezvi?=
 =?us-ascii?Q?8ASRucWewvHgWsOz9622fuQVIuLt8opDnih7OubqOvUDyD0ITD/QFgT9qOpb?=
 =?us-ascii?Q?DA6een6d9YRgE8TEJRJNi8x3dItiWK1snR9bL1aMPaF/2nFKhGO/JxPpiPrF?=
 =?us-ascii?Q?ZQmRqrY8mxUTYKiMEcENp+cerM9PYdfV7g3G9aBtCihQl0dZbkXWLchI1prE?=
 =?us-ascii?Q?vPqY6zR8J9Lqj1e9XGbOW4gnufC4AG3iVnujp7KDnxZWPDU11jEpCYtlo0AY?=
 =?us-ascii?Q?eHwZsH2HG541EUx2MJim1SGWkPQaC/zq02r7OVKi/uyUPF84EU7z+f4kn19v?=
 =?us-ascii?Q?E4Di5dCNnI2GYvt3Sy3vMgGgrk6e3F1qvEl4EAS2tEl/vhQQXWeIXhzm3Pnj?=
 =?us-ascii?Q?WNRzd51As8bvMeKTxgKfJNR5TXdFltK5cFu8dXiCz0NPdlXeTxt/MjXJzEha?=
 =?us-ascii?Q?ugjHZrAUpH2snTpPMrYksnoSmXFivqg658Yni7Jddb7rNhpjNqgp7jwkSKSD?=
 =?us-ascii?Q?oKEDi0Hg/jDjpO9aOwc7rrIbhp0XB3bCU9DjDxJI68xAzSAl90SfvuahZOoA?=
 =?us-ascii?Q?AHBGh9oJVjeU6bPBbzwCQNmj8Q1mnRZVOkqNC3Ic9rNA3TxaXklWBSSkHQoi?=
 =?us-ascii?Q?bGo3CWjjjJLk5sf7YpC7QVv5oHaQJPhVVdZ+FmLFI9DILpHEygOQfYzuCTuR?=
 =?us-ascii?Q?NqZj3dXP7JJ7IqA+sP4zYt8+wAQugK9Hn2UqunYl6CWbuSqvTvtTxvX6GBMR?=
 =?us-ascii?Q?WaeKnxqhGUoTh1IHAWUxFfpFTV+k0ZlWWiAub9299nMw0XQxcrctSPBsWZGl?=
 =?us-ascii?Q?U1QL6t2FQv12N8+lddw2ejGcnthRA67iTN+hDifF04cRmALi9BWjMzsGfrPJ?=
 =?us-ascii?Q?4eiaPf4C+Bfvc8aT3Ahc6duaG7EnauI0DivO9QXEpoUbi3l2ZYi0WhfkuSXe?=
 =?us-ascii?Q?JgkAN4tn0ki4NiTLD23NNAe1MzRZBHx7PcKpUbvtB8ax/bpFjudHb7EADiki?=
 =?us-ascii?Q?1Klp8hi149yCriokPFmff5nFfKsASMacJG23YLJwGcDb7jEngx3zVQ4htAEO?=
 =?us-ascii?Q?eq51rbTilZbqQPOlV+D3a6dWlXlmQN3emqzGm/yVqkN4Y15gITuau5xg/Mi8?=
 =?us-ascii?Q?tOqA05v/kQ3pJDy5NoGPuz/OAfiuUVqoB/1lLeSrBPR2JVIPPZwcKUbhDaG4?=
 =?us-ascii?Q?LWDDv48s4zg4noaMvoAjZiw=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	RZ61GBIEoJ2uLaGmrKbnRiTfUoHhYGLCHiPoh0Z5GfjQxHNgbcjsRrzy9rl3y4TDvGyr7Zt4oGyEFwY14J7yizmcoN/3DtO0RrtS/cUu0siqeas17ULWWMSPKI6FneXJ3S8Zk12bnfWf+wpE6ULLiXJZQQ65HyQ/Sc2Cq4zeyVCMBaA4KKfEUyHeWVUZ1IC87/piwvDJ0iRXu+8MdDU7eNG0siLNtKbGvkuaChqiewel9s9bLZKQjEoEBlEmfV52L2Pl7FVWUGf3XdtAD5Z+MtlxVN76oe5H6bGCnp6Pgofn3K+br6CEDjUKI261Ucyeeo2mJ14tCTfV0rE/dCUFjNfvZoCjRghtuHx5im1p3ZCvlDpSQCJXMd/oHXeVJoxU8HcPttdrjsZ9+JrTsDEsHsc40s9n/8xubHv+tLVSEhtWfXuOq2KzrL22vcHqZ+AEK8J0bTILlNW9plHazKoQ2DLfmYYDA2SDUMQq7GuB+fKtbsv323RbPPVgKLUapsCv5d9zL+mpeFI//e37pFVlNSyNAobtp9AXgBILcnaZbbDqTVjDRUxOWVoVy+d980pjQbJzwegdKMF3ENjy1RFC1PRY15vDZlShhUKUKG1jQm8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a80b552e-2cb2-49a6-3b5a-08dc2f3424a2
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2024 21:13:38.0530
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ea1grRmPVkNyKloGVj6+nj8dY8Gt8OKuQWUKmAS2Lms0xskXr3VU1uQnUKsG8YFrm+U2XKINnVJvuyt63UUSGkylUASktt8GkYh4PR57a9o=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB4909
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-16_20,2024-02-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 mlxscore=0 phishscore=0 bulkscore=0 malwarescore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402160167
X-Proofpoint-ORIG-GUID: gt_se_bBm78GGJLXdfZeJ4TRBRua8Pnh
X-Proofpoint-GUID: gt_se_bBm78GGJLXdfZeJ4TRBRua8Pnh

Use pfn_folio() to get a folio and use the folio equivalent page
functions throughout migrate_device_range().

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/migrate_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 5c239de0f08b2..0c8d86851e631 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -888,16 +888,16 @@ int migrate_device_range(unsigned long *src_pfns, unsigned long start,
 	unsigned long i, pfn;
 
 	for (pfn = start, i = 0; i < npages; pfn++, i++) {
-		struct page *page = pfn_to_page(pfn);
+		struct folio *folio = pfn_folio(pfn);
 
-		if (!get_page_unless_zero(page)) {
+		if (!folio_try_get(folio)) {
 			src_pfns[i] = 0;
 			continue;
 		}
 
-		if (!trylock_page(page)) {
+		if (!folio_trylock(folio)) {
 			src_pfns[i] = 0;
-			put_page(page);
+			folio_put(folio);
 			continue;
 		}
 
-- 
2.42.0