Received-SPF: pass (google.com: domain of linux-kernel+bounces-65928-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 1/2] mm/migrate_device: further convert migrate_device_unmap() to folios
Date: Wed, 14 Feb 2024 12:20:54 -0800
Message-ID: <20240214202055.77776-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?kI5mfImXzBXCJncEw8IAlPDehk0KDaD+BCcBC5T3USUIe3+PE39eXvlGxV4w?=
 =?us-ascii?Q?7Bzf1Qs6xneCBdTCPxzUA0OfzvxYInRQz2b6AmUzlHtW+PAuBddvGTf/N1Za?=
 =?us-ascii?Q?3RkBesBP7au8XOdvJ+OlNkvT9LhPImUzmNPcxZd9N+MOqhT+NefEBkdV0jLL?=
 =?us-ascii?Q?CZpQLC8jWltyAfSpgBUUtHNOXGu7zvhEFBqI6cFjcAE9wn6XjH0cmcZrXHp5?=
 =?us-ascii?Q?G3Y+uTyWjSh8ArAZzSep2EQCDHTj/JXjwY8sStbu7VaCXc4vrKjWMowTRtU+?=
 =?us-ascii?Q?d1KnWrQ7CwXWLxWMYdoXuZB0jLVh6AY/Z9lTBmh/S9HeLE/pfbmwGGvqnStc?=
 =?us-ascii?Q?IfTEnuFru0bSxZpJVQbgJqf0vy2sbq7Om2dXTBNpW+6zi8lEONItQf53iyZv?=
 =?us-ascii?Q?nuk7oDRiu6RxDkkKCFfbQXOvHimgrXewayF/0pzH6D0pAkULDB1+8RUFuMp2?=
 =?us-ascii?Q?QkkLC1PgxE+axilv8NjJ4SY46vzEJBUDCe9fiatDzc033y5FH34pYplnuHAU?=
 =?us-ascii?Q?L6WjZfMzuvv8J35kGE5lGEj5yvjxPCLHbb7Cj+EVRaqSHkCK2u5jKUcW/HJT?=
 =?us-ascii?Q?jp8F5ioTqIPp4K0Xcj8Dme+NCzqtZLoxSnCp7Qybz+mndcw0KbQDVNGzNvy7?=
 =?us-ascii?Q?htWrz8/5oZvipukyxHZ9+N0DPBlHoTa90G+GYlPK7EzJoeukN7kswdqeLcDF?=
 =?us-ascii?Q?q8bowvPnED0pqGazrHnF8W+kOnQiiIBGLAYWWBgIHtRNKKWryya1v9Cv1sFa?=
 =?us-ascii?Q?RfcfgapY46IYQ8SfeeN8xBnNjSrh4eX3e/NL7weOuOayt1fV+2TkZVNf2GLB?=
 =?us-ascii?Q?LoNTusHVkkhDG+RcndIYCAoZhsgSrJ3H0HEFY5APhgHhEnaousBxFeXlta2V?=
 =?us-ascii?Q?dMNBbZhnwdUQsxUObETXN/EXgEuyh7++m0EXxSPeH3vTtAIBBtLDU1obWkb5?=
 =?us-ascii?Q?X3AaNQoyX3VW6FCMOvv844iy+x06mQeD0MBpsAwykCk61nG3SARIahBidJzL?=
 =?us-ascii?Q?wf7fHkXYPz4Pgx+I0TJ3aj4n5mb35i/6DiCtfXfGKQ0QAVGnBCnFsMmdSUPy?=
 =?us-ascii?Q?lhc63ebeThvdA+r4cBrRcoUvMWs7u8CxwNCzObXnReqdQmSqjNW90tPkNeOD?=
 =?us-ascii?Q?wKPzcTOOiDQi6B1J4PeUZ68MrJvSm22V7ayJ77RW5DEgLyBG0E/Ak4rnruwR?=
 =?us-ascii?Q?AgDCM+0x3PtCzJ1Yps2xnzHdZMdc2Gp4u2OAuO8yJUAZz2F4C9UfZlLoB5z5?=
 =?us-ascii?Q?VV6edZkBruOCX6CzddQDp3fBt8O27VerS2hR7f3YlOXLsSyY72K/QcA4+5R/?=
 =?us-ascii?Q?3nu/R+olVJfeDZhYZmHLjuiQNy6z2hX1H7DHJn+5wkT6h5uyl0Dx/mw3JiMF?=
 =?us-ascii?Q?+f7S1jSbAidvU1YV3/Ylu4IWyJ/AjL5AAW69D5Ohmu6rax+aRD3e0aoDWR5M?=
 =?us-ascii?Q?AkEGc+cVY1sCofoHI9H+v4hYeB97eZ0fC/aKfo7JGkeW+EVbyH/rWXFjW+Oq?=
 =?us-ascii?Q?ob8rIVhOKnv5/sen9UWolU/XkdmjSN5PHQ2OQDhqP+Y5cLCzqtGQaKawjyU3?=
 =?us-ascii?Q?JdFEy4FG8wkcSu/s3ci8/AqgtxPBLPdqKFQs3/dGSfYkY7pLWeHY6sSUiRs9?=
 =?us-ascii?Q?TT86uoqShqjEirQxQl/jFYw=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	Cy7wYQeykq4zj/3uvKUrnDVlx9ENOgeunOJKpGUAUzD3MgWckTh4ID7Tv0t/x/A4MineytW+nJDkmA/ORzNGnJ1y7UegRYAXEt8IKF4UMtE00NivtupRf6TnjGu4FFI1s4K9VdY0lOGrKNqm5pNE7dorNkNDm6RDhXfipWmiZdraM2r5jAG2jQrD6ZKNz9RzRFiQD4KXTbk6dGyhlVuDE4lxA1mLlEQQ2e5M8Gf6r1bqjH8dPBTjN7F+OkB2AT1lrKG72HvqVZ5I1nN/QHFOlQoehMc/xOOa0Hm5o2wIXRspgZRcDskk+kRQUYZ04Dsm407o5QhSV8YcCmKviHUwZQPwmSnnbFiPwQOKMixUseSKj/IdMl4CEJbuKBx1UO7L/7h2qZ+H972Hdzi5FzkenYcyogLV85r+rd/MKp9pZ2XUuqhcC+VKKx2F4a6sGchuxhN/UPoqfyPJpEHIJ/fdab825mBpk3K8g5VJSewlWnNWLL9S+UollOsno+KoM1U4DsfF8qr+Li6NlLDuHK1kNj/v+TzfRLHrNGou8EHOKn+SK/Y0VY23PH/Ipmq3y0zYjOSTVqgJzWdcg+PcaHX1EMHkBaCkHXpLGokPqlBz9xQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: accf2949-7f8c-44b8-842d-08dc2d9a7667
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 20:21:01.6749
 (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: gxLBPSDyC4VI09W53OEcJwa39WtPhqMQ9AmaEArjqehkJakJGF8Q0EHZJ59hE/j00EJu1TF/9+VVZXTkQ1zi0lepAwMzCQOFXG+KpyMCNVY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7963
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-14_12,2024-02-14_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-2402140159
X-Proofpoint-GUID: InrWXzdQ2Pe51EgldL5xHgewOgZzewMd
X-Proofpoint-ORIG-GUID: InrWXzdQ2Pe51EgldL5xHgewOgZzewMd

migrate_device_unmap() already has a folio, we can use the folio
versions of is_zone_device_page() and putback_lru_page.

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

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index b6c27c76e1a0b..9152a329b0a68 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -377,33 +377,33 @@ static unsigned long migrate_device_unmap(unsigned long *src_pfns,
 			continue;
 		}
 
+		folio = page_folio(page);
 		/* ZONE_DEVICE pages are not on LRU */
-		if (!is_zone_device_page(page)) {
-			if (!PageLRU(page) && allow_drain) {
+		if (!folio_is_zone_device(folio)) {
+			if (!folio_test_lru(folio) && allow_drain) {
 				/* Drain CPU's lru cache */
 				lru_add_drain_all();
 				allow_drain = false;
 			}
 
-			if (!isolate_lru_page(page)) {
+			if (!folio_isolate_lru(folio)) {
 				src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
 				restore++;
 				continue;
 			}
 
 			/* Drop the reference we took in collect */
-			put_page(page);
+			folio_put(folio);
 		}
 
-		folio = page_folio(page);
 		if (folio_mapped(folio))
 			try_to_migrate(folio, 0);
 
-		if (page_mapped(page) ||
+		if (folio_mapped(folio) ||
 		    !migrate_vma_check_page(page, fault_page)) {
-			if (!is_zone_device_page(page)) {
-				get_page(page);
-				putback_lru_page(page);
+			if (!folio_is_zone_device(folio)) {
+				folio_get(folio);
+				folio_putback_lru(folio);
 			}
 
 			src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
-- 
2.42.0