From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, songmuchun@bytedance.com,
        mike.kravetz@oracle.com, willy@infradead.org, jhubbard@nvidia.com,
        gerald.schaefer@linux.ibm.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 5/8] mm/hugetlb: convert restore_reserve_on_error to take in a folio
Date:   Wed, 25 Jan 2023 09:05:34 -0800
Message-Id: <20230125170537.96973-6-sidhartha.kumar@oracle.com>
In-Reply-To: <20230125170537.96973-1-sidhartha.kumar@oracle.com>
References: <20230125170537.96973-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YPhLAf4DVUj1h4TmYkHSr8/shIEAgSHcEffxPtTP9ON5EHyGB7Id81zmPj9X?=
 =?us-ascii?Q?BYVgb6AeBqj5qU/L9i/P9Bhwotn2UyxWOLDvgECPKg7ZgkdBzEKHD4RmseAy?=
 =?us-ascii?Q?Bhq9DllPLiOc0Ce6ZBcPVV+Qo8UTYFHLpjTuqCMLrvzxhpvW/KqT4qgu66fN?=
 =?us-ascii?Q?jeKF4MfhDY+62BkAJQPfPGTvwd+ySAoMcq0IGBS8TjtOdpUtNG55sooyYvAB?=
 =?us-ascii?Q?zOAMxYHAzpapXMTH0zXRCmAu4xMSrTZ9V2Old4LaDlZWj2Ye5FWZuHne3qyX?=
 =?us-ascii?Q?Kh56ze4IbrREIY2tilANDtcGMTkKUTNkJ5We0PYx48fOnthCc7tPsJMchA0T?=
 =?us-ascii?Q?q2Us4xT8Kzh+uDYseT2etvRBIfNjh7rooItfaDQNDRyI/UKrRozX5uglYt6d?=
 =?us-ascii?Q?qExS6yOszUgUC6u6P8r6GLg2pLtfsnT+ZiH4jBLwF75xzJJynVf7I2h6r+Mr?=
 =?us-ascii?Q?gsAH4L+PW1nU51CWqR7QPvucH2heJ3RcADGDCmCpRJLlut8f5K+YpHHu3vn7?=
 =?us-ascii?Q?AlnAtTpdn33GZClG+0JpYe4bbcNI+6ySgA9JEyk6MtAAKPNjiF9nxeakdgBm?=
 =?us-ascii?Q?hxphRq1RnJ9lHzLU4YALAqGhzV4sOyGNz0ijXgr/LnfXt26+pA0kV4MJVJrI?=
 =?us-ascii?Q?SNaSIYlNvwjtPnKhEVl3iinHeUr6OgVNHqzSV2p0mC2EYpJeZZpRPYmhCMpi?=
 =?us-ascii?Q?f2/bYQ3JT6erPYBMk0/3Y/zidpnAn7CIbVZMWe9MmXifOlI3xL2Cey3TRFf0?=
 =?us-ascii?Q?zO/Cvh4ZwvMeW8Y0yLIMOOsJRIhQv1zY/hgODpycMhh8oX5rDPh/m6SoQGwm?=
 =?us-ascii?Q?5HvN9MjPajx/3+qIOY6JOeBOP4XqBj+w249wlMeS2sYaKjyzmj8Z3V+MUT00?=
 =?us-ascii?Q?iDVvCWkoxGorsB9QAto56VXOjx/6uCc57gWWmPgLDUtSFN6+a681Pww4newJ?=
 =?us-ascii?Q?f+sFi3dR/gKkHJrEaVrR0a7tsHp6PpX20t1W/hpE2pIB7QRLPRr14xHQPKx3?=
 =?us-ascii?Q?ozxM7IESYpQ3BiHMm8iZMGqCVLZqgd5bVwKTgN2TMKBj0xWkRj4+GVX4PwX+?=
 =?us-ascii?Q?XugoGRJHnJ/oP6RK52NMF7Dg37FjDQMzqAq2k4uEW/qMFv/y4QrQ9zNJVekY?=
 =?us-ascii?Q?oJEWjlXkEgXHY/gFPJOOCCQhLIg0YLn6f5bspENJopW+Jz67i0ZSwiMchmZV?=
 =?us-ascii?Q?IGOr14MhtuTml+EYhDvHYgUUmMl3J7kIp6Qq4xKefi1TEb9htowNGwDVMscC?=
 =?us-ascii?Q?hTyS6r2gYJ7E4NEA/PWowKnOybgkDojMy6/f/o3u+ou5d/2fSaSIz1tyqHfo?=
 =?us-ascii?Q?EN9HxCWtiyz1BF1RgKkj9r0g5E1nzC7mMc3nfvaFtR7NcZC7kIkrpY0aEwZz?=
 =?us-ascii?Q?pJ90rd3DPqDfm9TqdZbE4AfL/Lg+hB+5E6BS5gYiMnW2I6m0M3Ax6eaJt/43?=
 =?us-ascii?Q?SHSUcIs2+/h5txJWrAur8m0Sc/Z8EgAfcDntg2lfpjv7Qqbx8GVA7nvw6G/8?=
 =?us-ascii?Q?tx76919RbmtTh+OSZKZDFHqTbQiMe8oSObYzO097enFmimxNj5Qph29t/Qfc?=
 =?us-ascii?Q?Y1E87mOP/Q+lQBqtW0b30V8EIAouAk+X1dDVcXza8c9AnJ2Ebu/C/U5mVOMN?=
 =?us-ascii?Q?gQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?tvU/MuygR6xJmmOKrNWuHw4HaeUnvU46vo6iQ1URTC1Rj9MxXS0kzSp9oXAa?=
 =?us-ascii?Q?HNyQ/hT4XV7SvAhyezyjNFgrw1+f4x20LWOBttjXKgXQ4Tn/c9JlpEVaWEzX?=
 =?us-ascii?Q?G2UIP9cOIaY0w4uSS3dccszTBR25O3KQKO1p3FWgeUOtCxf630wRpZSQnUnK?=
 =?us-ascii?Q?Ij7/KkQ+Pvm6gc/huTNq7xde8c8vSICNI4cCRGGBelWt5tIvzfAE9AoLwDUF?=
 =?us-ascii?Q?xVnkQGQXPkGQdAhxMprs2stiHS0BgS28fT37BjOPB6K4E56oFWYHMLbiQGWn?=
 =?us-ascii?Q?0b4kN9CXwECUS0o5zQTqZnfYXrTrKalYFyezpFiTDaz3Dldy7YG1JI7RVgBw?=
 =?us-ascii?Q?5X3Je4uydP3iw+WGLBxVnRud1HEWAOtihWsX4NEgu7UbbV51c/0O/CMJcQis?=
 =?us-ascii?Q?8ZCNCkWNe4NgHSg3ErmeN+zHhZ9T8i04U7sLU4+OBB7I4kRDdpLQxfs8qFFC?=
 =?us-ascii?Q?saSTDlP3QNcEz2OdOC2TltSPW4+PGYapz66FHqxwN4Ows0p0Po14f49RYT40?=
 =?us-ascii?Q?y+GrpUlVaJ6fsz9vNLR5Ch5N2o2fTaREW+PR+ds0dKtwU625WmtTzwBvdDRO?=
 =?us-ascii?Q?Fe29ROVBLPNrLu2QccjHqN0tt668t1aEtYALjCnmIKutQj2+XtC1w49wxv1l?=
 =?us-ascii?Q?wA80BpFRVEQdq0MbUeI2ElKGW8m9N8eZAy+tvbT6mNkdWwGZf0f9EJpSO9jE?=
 =?us-ascii?Q?T/zr6Yvq6zk3+x4rQ8usiFZ/igEeqVACoak4hOAzetsvU/GnyFUT6TouvXC4?=
 =?us-ascii?Q?PeQc5WdmAB/dYms6O/Uioh0CgGLk0j64KiZmwPcexUfLIL5PDMPSMOGyJ67g?=
 =?us-ascii?Q?Rxz8ShrWDZmbZaJ7tYdptOCiQJlSP8l6Dx6cpWXJz6OZHfBRopqoCRAUPPRM?=
 =?us-ascii?Q?vS8uXlPfCCMwEvOq7Kk5BGyaN7OTuQWKX2f+nqq6n9LopGwrlDiJMPFmXU9U?=
 =?us-ascii?Q?YRwePrwzL2sGC8I69fIXZ+8wBWf8QXvSwh1b4rbmr8k=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: edb7cb53-3212-483b-b3ec-08dafef66efb
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 17:06:00.7182
 (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: 9dUMvuj/ypICxdDliAPL+YEwgD0PWkwBOT++nF7AQQ4wz8NKVXv4xhft90E41J3eK2/2rZUmB19M7pTIBNrfrX40YeE1GHjtVwV16nUF6gY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4384
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-25_11,2023-01-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 bulkscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301250152
X-Proofpoint-ORIG-GUID: SVNEP9c7uXmuU6nQBfSepqD9lZtyfC34
X-Proofpoint-GUID: SVNEP9c7uXmuU6nQBfSepqD9lZtyfC34
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Every caller of restore_reserve_on_error() is now passing in &folio->page,
change the function to take in a folio directly and clean up the call
sites.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 fs/hugetlbfs/inode.c    |  2 +-
 include/linux/hugetlb.h |  2 +-
 mm/hugetlb.c            | 21 ++++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index ac16ada48f75..e2b8a00696bd 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -873,7 +873,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,
 		__folio_mark_uptodate(folio);
 		error = hugetlb_add_to_page_cache(&folio->page, mapping, index);
 		if (unlikely(error)) {
-			restore_reserve_on_error(h, &pseudo_vma, addr, &folio->page);
+			restore_reserve_on_error(h, &pseudo_vma, addr, folio);
 			folio_put(folio);
 			mutex_unlock(&hugetlb_fault_mutex_table[hash]);
 			goto out;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index f6849e67ffef..d46f9db09a2c 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -725,7 +725,7 @@ struct folio *alloc_hugetlb_folio_vma(struct hstate *h, struct vm_area_struct *v
 int hugetlb_add_to_page_cache(struct page *page, struct address_space *mapping,
 			pgoff_t idx);
 void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma,
-				unsigned long address, struct page *page);
+				unsigned long address, struct folio *folio);
 
 /* arch callback */
 int __init __alloc_bootmem_huge_page(struct hstate *h, int nid);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index e104dba1e5ea..aad028706fbc 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2802,9 +2802,9 @@ static long vma_del_reservation(struct hstate *h,
  * and the hugetlb mutex should remain held when calling this routine.
  *
  * It handles two specific cases:
- * 1) A reservation was in place and the page consumed the reservation.
- *    HPageRestoreReserve is set in the page.
- * 2) No reservation was in place for the page, so HPageRestoreReserve is
+ * 1) A reservation was in place and the folio consumed the reservation.
+ *    hugetlb_restore_reserve is set in the folio.
+ * 2) No reservation was in place for the page, so hugetlb_restore_reserve is
  *    not set.  However, alloc_hugetlb_folio always updates the reserve map.
  *
  * In case 1, free_huge_page later in the error path will increment the
@@ -2817,9 +2817,8 @@ static long vma_del_reservation(struct hstate *h,
  * In case 2, simply undo reserve map modifications done by alloc_hugetlb_folio.
  */
 void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma,
-			unsigned long address, struct page *page)
+			unsigned long address, struct folio *folio)
 {
-	struct folio *folio = page_folio(page);
 	long rc = vma_needs_reservation(h, vma, address);
 
 	if (folio_test_hugetlb_restore_reserve(folio)) {
@@ -5102,7 +5101,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
 				entry = huge_ptep_get(src_pte);
 				if (!pte_same(src_pte_old, entry)) {
 					restore_reserve_on_error(h, dst_vma, addr,
-								&new_folio->page);
+								new_folio);
 					folio_put(new_folio);
 					/* huge_ptep of dst_pte won't change as in child */
 					goto again;
@@ -5634,7 +5633,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * unshare)
 	 */
 	if (new_folio != page_folio(old_page))
-		restore_reserve_on_error(h, vma, haddr, &new_folio->page);
+		restore_reserve_on_error(h, vma, haddr, new_folio);
 	folio_put(new_folio);
 out_release_old:
 	put_page(old_page);
@@ -5846,7 +5845,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm,
 				 * to the page cache. So it's safe to call
 				 * restore_reserve_on_error() here.
 				 */
-				restore_reserve_on_error(h, vma, haddr, &folio->page);
+				restore_reserve_on_error(h, vma, haddr, folio);
 				folio_put(folio);
 				goto out;
 			}
@@ -5947,7 +5946,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm,
 	spin_unlock(ptl);
 backout_unlocked:
 	if (new_folio && !new_pagecache_folio)
-		restore_reserve_on_error(h, vma, haddr, &folio->page);
+		restore_reserve_on_error(h, vma, haddr, folio);
 
 	folio_unlock(folio);
 	folio_put(folio);
@@ -6210,7 +6209,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 			/* Free the allocated folio which may have
 			 * consumed a reservation.
 			 */
-			restore_reserve_on_error(h, dst_vma, dst_addr, &folio->page);
+			restore_reserve_on_error(h, dst_vma, dst_addr, folio);
 			folio_put(folio);
 
 			/* Allocate a temporary folio to hold the copied
@@ -6339,7 +6338,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 		folio_unlock(folio);
 out_release_nounlock:
 	if (!folio_in_pagecache)
-		restore_reserve_on_error(h, dst_vma, dst_addr, &folio->page);
+		restore_reserve_on_error(h, dst_vma, dst_addr, folio);
 	folio_put(folio);
 	goto out;
 }
-- 
2.39.1