Received-SPF: pass (google.com: domain of linux-kernel+bounces-69352-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 5/6] mm/migrate_device: convert migrate_device_coherent_page() to migrate_device_coherent_folio()
Date: Fri, 16 Feb 2024 13:13:19 -0800
Message-ID: <20240216211320.222431-5-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?lNm7eksCAllHlXkRreaqDBWOWzQZWyzt7d7oF6xBKNSfRE256fRcoSLPVJiX?=
 =?us-ascii?Q?GJdlmYF7YnnXoea1Tc7ltxIQOgjOzcE/bHQD6rrTmdxYpDinxiQcXfuFHqUI?=
 =?us-ascii?Q?hImTh8tjF9tcaYJN6cCmpYU6ANbvy/lOcvGvz/amBcloPsCGbyR1xMI1DlFY?=
 =?us-ascii?Q?GDbkwkGFkJ5oWBude1mpVZyXzO3A//0oq8flpF9bM6d7r8OLxZM+BhEHXiL6?=
 =?us-ascii?Q?+6U7DwiRAtkA76SHtHBsJjYUBIbkhwNnWuley3brRnaQruJRHTVcyiYbqJss?=
 =?us-ascii?Q?4tvfodX2hyqjoBPyLxHiEl8uyLJi0ltSddI1SUZeABO9s1MckdXl8Rus4Eh3?=
 =?us-ascii?Q?7/fOAuOGWUoJ6FKyiOZ43Xp5+PaG176heNKJ6+qUmu/Rp3vP6cjnxnH9M+df?=
 =?us-ascii?Q?mwhQkhBJK/j8QxEJFBPhtJgvYf9dEPeb9pHoptlGfg4r8QyzdXlnGWlTFFnL?=
 =?us-ascii?Q?H4SfR24mUf/rnjHrpQFa7kU/7mXnxYFFCXLPsxC3YkA8MK+hwUR5O4xkHu2l?=
 =?us-ascii?Q?q6+g4Hh6C4KWTd66Eo/qwXWwMeKH9j0OOL86UabLFTrMzBOSrkBClHjIcD6Z?=
 =?us-ascii?Q?UaIq5ivQsY8tK2hkK5EHoFPUXir65rO7uc1bvGDtIajNgwgSQ9DsSOEXr5IE?=
 =?us-ascii?Q?HuKHX2MXPetqUc0tom3hLLa/vYlfV1k8tVFXbULjD3XfXMCI8QTsFLg/p7iA?=
 =?us-ascii?Q?UTUp/ogVI2vE+xodOsexCkjQbNP+1l0IjNdRwfGvACIa5P8rKmjH1CX2rYdy?=
 =?us-ascii?Q?LTW9TgwF2sJysbMEiFFpV44BOGmpq0Hf6m1pcmrVYAsVlNBH6CqcLlWpQX5N?=
 =?us-ascii?Q?Ks9NuZ/333di7ReUy5twnDAC9zMxJaU2LElfseF9oCQeLfBo79wS64L6WXKj?=
 =?us-ascii?Q?A7en84qU6aZkCZdsxCaNwsAGlZ3k1YnvEQClfxQuIG2jug1LI2mSSVZGURxx?=
 =?us-ascii?Q?6oRuRLQhaWe5PXRNCZWuN3ujBgtUjZ3siibxKB5UNEt8oihlLKyhWFx2Yu8Q?=
 =?us-ascii?Q?hgtIpV2p6VxAz4jsfDa05/oKxrG9leXlVDsh8Uz+0vqKnymEsQ0+XoQFv4p1?=
 =?us-ascii?Q?3qvRRaZ2WGLge1NLE0PYU29rZX3icO2V+PawCouAMwgKQmC02+K5303p4ODE?=
 =?us-ascii?Q?doWf9NopmsR7oSPPHY5JaRoq5kuaE5YFVeCiF/qQnr7dTskMlrOT6+KZN49O?=
 =?us-ascii?Q?UHgAly5r71AsamjTqo/YdYpchcC8BCigf8q5jr1Htkm536/034kyD/E1wnFI?=
 =?us-ascii?Q?vYC8NctDVri2zokofv2S+lj2ET3P6/FCX+VClqU860N5jQ0k5loOQEiPv75e?=
 =?us-ascii?Q?zLOCkikLKfnYb1vMqbw//tABX//DfoctODvzkkOn7VFhMjT5ilNLYsqtE5tm?=
 =?us-ascii?Q?XRCLd97CvSbdYzuO5gFNd49/6qgR1hFJoNdf7FpkwkgquVyM8A1woh2iORRZ?=
 =?us-ascii?Q?LAnrBSBW6Sa/exe97Pvc1sI6En9XKisr/ld0EbNy6Fsr/p78K4DGIdpbMkxT?=
 =?us-ascii?Q?TVk4TjhhVVcWoij4YpWUqeS4he8YgOkmIc9fNZsz9LNtGjGykzOiVmIwncmn?=
 =?us-ascii?Q?04oqSUoOEkr+BCRH90NSf0BWhu4PLKh+0lCpE9ue1NZm8GNTCX2qRCKqB0es?=
 =?us-ascii?Q?rxDrdIljTnBbRPa2cWm23fo=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	PiW5gTH0Qs7hETzQfjgMBRnAGpe3GjAbDbKARFXhA5eg4hXj/kW1UkW2+z4WADzIxhyqTaDLXPQaD+yuFq7HO6Ew+73V6VFwgKDsnW3hQFMS9Wuwb0GPzbndcOD1/AH5kpMvL04kPEiSPR9uQe8JScE8NVRL9chreoWaqelAyats2Sq7CwjWdO2+nBXlYzE4kCupGdot/ySiHNK70GaVyeA5ZtfTZokKIlrTLB0FhUcu17jVQwvv/bEtX/KbUGEaNvbjb4ngzzSqALw3ZpEJT2H5vAQbkbxAhrgLnZz/8iFcpgsjO9H3L7DrgVQVjNq3hQpzVU00rP6WgN+l5lVrc7Hfj4j4hluab0+xxdHINW79EmD4MTQApx6PiTO3WNUQZ+k3+NgWzYsVLsZMhzVDR+qPZ0OP4pif7gTeFhb0EF8WYuYr75lf6fHkdHEK51AmA0DKkvnItTKX73JzHMlP51x5pUwHAbk6QM+g/81MIdqQ90Ci28zXG5pgYtJzA5hXduYvrelgepv52e0rtbeaXsBP8rivNsvVd9uFpi+/7ju6UHFIhk3vBLYqUfnl5l/LJ/yOILjawFqtfZLCBa/ZSbMdi61JDrHpys9T5MJlkU4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e722a654-4602-4d40-9609-08dc2f342375
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:36.0882
 (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: o+hmmwcIVBIxSP65GQbBJk7L2qw8jae56N5HYTPFblDWxS1y6WEQNCY71y10vcVhcZbcco7yTBt0l3YO93hSVEB6Ax+bWXB77Ju1Ixy3oC8=
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: 9X9YI9CLK4D13iF2kKjebom5kvh4zd00
X-Proofpoint-ORIG-GUID: 9X9YI9CLK4D13iF2kKjebom5kvh4zd00

Rename migrate_device_coherent_page() to migrate_device_coherent_folio()
as it now takes in a folio.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/gup.c            |  2 +-
 mm/internal.h       |  2 +-
 mm/migrate_device.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index df83182ec72d5..2c8b183b94485 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2109,7 +2109,7 @@ static int migrate_longterm_unpinnable_pages(
 			folio_get(folio);
 			gup_put_folio(folio, 1, FOLL_PIN);
 
-			if (migrate_device_coherent_page(&folio->page)) {
+			if (migrate_device_coherent_folio(folio)) {
 				ret = -EBUSY;
 				goto err;
 			}
diff --git a/mm/internal.h b/mm/internal.h
index c6ea449c5353c..32304bec79f3f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1003,7 +1003,7 @@ int numa_migrate_prep(struct folio *folio, struct vm_area_struct *vma,
 		      unsigned long addr, int page_nid, int *flags);
 
 void free_zone_device_page(struct page *page);
-int migrate_device_coherent_page(struct page *page);
+int migrate_device_coherent_folio(struct folio *folio);
 
 /*
  * mm/gup.c
diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index d9633c7b1d21b..5c239de0f08b2 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -705,7 +705,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,
 
 			/*
 			 * The only time there is no vma is when called from
-			 * migrate_device_coherent_page(). However this isn't
+			 * migrate_device_coherent_folio(). However this isn't
 			 * called if the page could not be unmapped.
 			 */
 			VM_BUG_ON(!migrate);
@@ -915,15 +915,15 @@ EXPORT_SYMBOL(migrate_device_range);
  * a reference on page which will be copied to the new page if migration is
  * successful or dropped on failure.
  */
-int migrate_device_coherent_page(struct page *page)
+int migrate_device_coherent_folio(struct folio *folio)
 {
 	unsigned long src_pfn, dst_pfn = 0;
 	struct page *dpage;
 
-	WARN_ON_ONCE(PageCompound(page));
+	WARN_ON_ONCE(folio_test_large(folio));
 
-	lock_page(page);
-	src_pfn = migrate_pfn(page_to_pfn(page)) | MIGRATE_PFN_MIGRATE;
+	folio_lock(folio);
+	src_pfn = migrate_pfn(folio_pfn(folio)) | MIGRATE_PFN_MIGRATE;
 
 	/*
 	 * We don't have a VMA and don't need to walk the page tables to find
@@ -942,7 +942,7 @@ int migrate_device_coherent_page(struct page *page)
 
 	migrate_device_pages(&src_pfn, &dst_pfn, 1);
 	if (src_pfn & MIGRATE_PFN_MIGRATE)
-		copy_highpage(dpage, page);
+		copy_highpage(dpage, &folio->page);
 	migrate_device_finalize(&src_pfn, &dst_pfn, 1);
 
 	if (src_pfn & MIGRATE_PFN_MIGRATE)
-- 
2.42.0