Received-SPF: pass (google.com: domain of linux-kernel+bounces-69351-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 3/6] mm/migrate_device: further convert migrate_device_finalize() to folios
Date: Fri, 16 Feb 2024 13:13:17 -0800
Message-ID: <20240216211320.222431-3-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?FfnJ180e9hl9+U5Nniqp9BQUXr7/vo0H0b79EnaNTvdM52S6UVpXYPX7gHs2?=
 =?us-ascii?Q?8Vi8HpkPPOPHuPHaM/Qz3DMtSblnB+qpORhUM40xZuvkiwZKDOZOk/rFbQuC?=
 =?us-ascii?Q?kKn4CdszU9sJ7yb2vLbM2ao92ib2HquQlgTCau/PG8kBsf1qR6iMjEsc818g?=
 =?us-ascii?Q?F4grIQaMLo4qrHv517fqgQVYnN3GfFIFx+UfsgxEJ+LSYArRv9G3+uS3vq47?=
 =?us-ascii?Q?N7pZdFqugbP+J2ND4dRCWIaOyKId89zJFpqMQZSjWzN4Nr5EvMMBm2Vdcsj1?=
 =?us-ascii?Q?2vhfkC7Vki8hh9unbA9/CAGUYAmmC7Tdd+i+GVm67cge4AcPJMLAmNHLrpOj?=
 =?us-ascii?Q?7sPQgvYPx2JkRRUcZA5oS+Vn2qA8oBLjex1EE5vWxI5vwx3v+9r1Xh4a34z6?=
 =?us-ascii?Q?TfWssOoAQThTM5BK2en/r2mBQDeLPSsEl90oLNxOnPYxFcQ7htPn4Om5iY/C?=
 =?us-ascii?Q?w7LAlm9xAjP960DaSscdLgPoom/d9QKocBvxIrrrJqYOrKAIhhEwYsRveEQJ?=
 =?us-ascii?Q?9v+AxId4psAGMMOgWCnGyk7em/kMbmepqWZiQrLCrw7I1Ln90euZMFIyY0+e?=
 =?us-ascii?Q?yVHm8xhXICmundL8A1gR6w9vCRDR/R1oi/xbsv8tS7AUvvtK+NnjowWnlpnC?=
 =?us-ascii?Q?iKtErG/9S44XUZ0V0abY5kGhgjYLCtf5OGPykKxMTANo7TOxjNMA42XjdPBr?=
 =?us-ascii?Q?iCU0neX0Xn/+R7o27Riz3sQNjW2Rb0M0z/7BIME90gsqVhcPm8LAF7LPShfl?=
 =?us-ascii?Q?MLFMkvDTYusEpFU4SDnSC1AzeT/wh1kEduGnp9N7hEt/4i1wC7KP6Wu471Ug?=
 =?us-ascii?Q?oSsWhKqU7v2+235woz4YB/Z8ru5B59Olpwndbi54p77BPtuS+/PqKZcBy0Ia?=
 =?us-ascii?Q?QYFOrZfe0DKn6LBfXsl3GmUahF2WacnCN9mdrhoCFKMV/BznEOIPABqFJvtQ?=
 =?us-ascii?Q?yXKKKPaCFytBScplODbqXmm7GyCa1vcmq4YNAWVmuMWVi6JK2M09gJaRd6By?=
 =?us-ascii?Q?Nkw12hHT+qkTqEmxilnKEj2LuE97WMWXYDG1bg/F2YMq/oeTqPVo87YEiH/x?=
 =?us-ascii?Q?o3N/GrqaqJHw9pIuINZJO2eK1FzybHpXIQu7e+08vcWe1UUxI2WAod9lJOTD?=
 =?us-ascii?Q?P9mvyo0s4L+5VmOEvBdco34sJIoZBVSAcPX8hFHiw/je/Q391eG/l/l79QSh?=
 =?us-ascii?Q?uT9pE9yM/tntX05FBddBTbuJvSFKXuJ+pialtAb29iGMzQGvyzGefhREdbGY?=
 =?us-ascii?Q?WZr/F/05O/PS8lstej1cb7E1oENUmP8fBW5RzeBg0nCrEvdUir9sNe+mVR0K?=
 =?us-ascii?Q?b/WcKJi73hbZ8KF3y/m3nUpyJ09tK8XGEUnDPgPRzgrndud4w7n0pDh6sur5?=
 =?us-ascii?Q?hY9mqSU2VnoeWTrLKZGgGNnkwP268oxRWiFdflC3b2GTusH2eXLNznCrkCbz?=
 =?us-ascii?Q?16aYfEBeriQIoQKwWkhpY0WMJvOi9/9EGYQTrlcgnfYFxcNiIJfXAqbQGwgZ?=
 =?us-ascii?Q?rw6ARNMHYyMt0G7z6QMqbzYikYFrAQ7TLzil0EON+qQqVnYdzFkbz1WYUBRz?=
 =?us-ascii?Q?AXCY4HGrb/Iby+YCqEBfvMxHD6Z6DdrxjWCSw/9c3Hyh2N3rrO382u7kPxlZ?=
 =?us-ascii?Q?7q37GzN+q9YReEfIwKCkWPQ=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	ySCrPWNqdKv4yuYPD2j+K0DXBCHwFA/b2GrwnQX+cjyRl0uJD7YQ4is+rE8Rra/0RtUHdJiVxCSNn4mmfAxXiIZPkDVMnA+Fn8WcSrglbiggYti3w2LWEfzGmwpvSTD92wxJJKOfdWX1Fh9KpEwqH5uofYmmXNyT2ZPo4aS+MjtGnN84yv6Efmes66nvbXXnhTLBxIqHFvNLjCreDLqijSaGu2UZjgRLqFfTHZm4DqhNcfkD592MofRBJALGkWuHIFhHK9k0I31q1h71TkXiK/aaY0KdIwIFFzQY9V2MagZDxeG86cwer7kCndBZ+doqC/sKj2pJrwvmUOHpWfaygTrtztHllZxEMsffDqBXnEuQ3At7/N3hAL3+qqW4DEFGoIeFfPEAwZO8PKoaFbvT0NBjm/6kvJLCs3PbtcxO2Egi+KxGGh5eQ8NO+FuVckwPOzXZdRfi6cqOMk3zJEFy3UKCjGLHOV4ApmcErjX6bAMjScFDTJIVCmumpgJqjIa2SDvOYX9zWmFTkHQiNqOgC3fPxY0a2ipafrkVjNwgDafCsW1fq/emSFpgVgMTZYUs3Hk79owFdQR5P7dHf3hruJqzyMKMvHmepktmh0Nq5D4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dbcebfd6-7eaa-4fbd-b4e2-08dc2f342077
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:31.0724
 (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: 2EF5CK+6GeeD06MXZ4JTW4g3vl6p1x8akwnJYrFxoGr+C7PA8N9+VTKLrZODlGWWhpaJNxvTyHDBlJEm1CQtJbgUgSulQihInhsD06k7N9Q=
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 adultscore=0 bulkscore=0
 mlxlogscore=999 malwarescore=0 mlxscore=0 spamscore=0 suspectscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402160167
X-Proofpoint-GUID: 0UPkmgna_Gs66oS7LDBjgOmhB_m-hQWb
X-Proofpoint-ORIG-GUID: 0UPkmgna_Gs66oS7LDBjgOmhB_m-hQWb

Use folio api functions from the already defined src and dst folio
variables.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---

	v1 -> v2:
		use migrate_pfn_to_folio() to directly work with a folio
		per Alistair Popple.

 mm/migrate_device.c | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 3d3c2593b5b64..81623f2d72c2b 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -814,42 +814,39 @@ void migrate_device_finalize(unsigned long *src_pfns,
 	unsigned long i;
 
 	for (i = 0; i < npages; i++) {
-		struct folio *dst, *src;
-		struct page *newpage = migrate_pfn_to_page(dst_pfns[i]);
-		struct page *page = migrate_pfn_to_page(src_pfns[i]);
+		struct folio *dst = migrate_pfn_to_folio(dst_pfns[i]);
+		struct folio *src = migrate_pfn_to_folio(src_pfns[i]);
 
-		if (!page) {
-			if (newpage) {
-				unlock_page(newpage);
-				put_page(newpage);
+		if (!src) {
+			if (dst) {
+				folio_unlock(dst);
+				folio_put(dst);
 			}
 			continue;
 		}
 
-		if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !newpage) {
-			if (newpage) {
-				unlock_page(newpage);
-				put_page(newpage);
+		if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !dst) {
+			if (dst) {
+				folio_unlock(dst);
+				folio_put(dst);
 			}
-			newpage = page;
+			dst = src;
 		}
 
-		src = page_folio(page);
-		dst = page_folio(newpage);
 		remove_migration_ptes(src, dst, false);
 		folio_unlock(src);
 
-		if (is_zone_device_page(page))
-			put_page(page);
+		if (folio_is_zone_device(src))
+			folio_put(src);
 		else
-			putback_lru_page(page);
+			folio_putback_lru(src);
 
-		if (newpage != page) {
-			unlock_page(newpage);
-			if (is_zone_device_page(newpage))
-				put_page(newpage);
+		if (dst != src) {
+			folio_unlock(dst);
+			if (folio_is_zone_device(dst))
+				folio_put(dst);
 			else
-				putback_lru_page(newpage);
+				folio_putback_lru(dst);
 		}
 	}
 }
-- 
2.42.0