Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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, vbabka@suse.cz,
        william.kucharski@oracle.com, dhowells@redhat.com,
        peterx@redhat.com, arnd@arndb.de, ccross@google.com,
        hughd@google.com, ebiederm@xmission.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 5/7] mm/hugetlb: convert hugetlb_delete_from_page_cache() to use folios
Date:   Mon, 29 Aug 2022 16:00:12 -0700
Message-Id: <20220829230014.384722-6-sidhartha.kumar@oracle.com>
In-Reply-To: <20220829230014.384722-1-sidhartha.kumar@oracle.com>
References: <20220829230014.384722-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?TZsUnhXYmr3O3V4HMeaZcNN5/Ag6jJmqOFH4k38fj8SLgXB120zGA2Xd8Ufr?=
 =?us-ascii?Q?yH4WN8I6gFkMPHQXgWQQD7ex89fFrPfj8zvn5HAIOmm3B87VKeZOVbb7RCPg?=
 =?us-ascii?Q?LOaZzM9x8Knz6fP5b9BKZpaXkS0WZ85/da4U71twMriIHNdK8Wrb1kwNS5V8?=
 =?us-ascii?Q?x9qzuS7JJykhc+gNtHCHvW9KvcOhuXFFR7mHIybYt7jtBW+OtO4vGsWuebxP?=
 =?us-ascii?Q?M6Gh8C4saPN78gBtFKdUWGyu2EDjiBM6CEL28o4gn/CCoKa1CvvzEOA9AVRE?=
 =?us-ascii?Q?Ev47FtTBYH+QcACfM47OWdQMpt4omiBDV13FYsOkW+ZjGJcOviqrYvry/dtr?=
 =?us-ascii?Q?OCb+oZohEb4aPfZ+r64QBtHapJgPxtjVFmMbK+9jB5ZWutfDeaJl+3hC8+yl?=
 =?us-ascii?Q?tKyvPxQ1Fzw/9Mko0z9bPnbFA8oLVDZFCGEKafocMsXXcJNGzjh39PJTqqNC?=
 =?us-ascii?Q?49cwdwuzuEs2Ur4tX53bl509aP79c2ztD6EQ1ER8k8Ya6Mg+7BVChA9AKtvC?=
 =?us-ascii?Q?VrQNhgiRmWtEY/991xWD+ryhZ9acQexwcDTwFuXxjSlXrFCnpumpI0Q2DoId?=
 =?us-ascii?Q?1zrPAhgwO20pVeh93+QylbUffX+Dc8yZ3+sMe9MeaDIbvgOsAeffzyhvEU8R?=
 =?us-ascii?Q?lnOue1Zm4ddjIc3Kbos9uxwHQ9u64pJlGAuFwN8etvIRJqph1hUwDOgbRWPa?=
 =?us-ascii?Q?EOymezClMpn6iderPkuUfijUDTB/iPb8sTkAn8dfTe/vrtW8EmFdHYsOlt0t?=
 =?us-ascii?Q?MxGPvupL7pZU/mxxFN9bpQuuA2xwp8sX5r16qnqBN6zaYLPLMfYVCP8T9eN0?=
 =?us-ascii?Q?4FJNYxs4FVqJ3aclIYTE/Pkitep3JyZpCoss4IoZ2vGABNXksAf/KLGrO4wH?=
 =?us-ascii?Q?Hlk4rd8bPJnJ6h+MvjdZvW7IC68l7fzoP2ekb1DmhhpifLvZfZbWjzStCcnx?=
 =?us-ascii?Q?a81lhkRWLZD92XpNKiaj5vp9WnFqKd881c9hJ/OAaIxjYL44K5UYPd4iE2Sh?=
 =?us-ascii?Q?LIfnfaMYfPQT/MNn6496Yzf6QdukkWwRgfL1RpdiutSLsww9dZFLPC39oQfe?=
 =?us-ascii?Q?IyYhf+dkoekfrrXPmP5qVctsRlWX/HLSc8QrlYOHaq7vRqxaXr+/l85T6U2m?=
 =?us-ascii?Q?f7WcNYK8S59697mnOHLsEAvt6QicxH+9ZZy871E+81Sy/AKwmSCMZwdrKrC0?=
 =?us-ascii?Q?hUGsbsEcj7vQ0O8XzLEGUXo9cgc+BoGABrqCoFRQadBRIfqJ2TGBFmlWRsIR?=
 =?us-ascii?Q?IDza8fJzXdZecC6IRgSAUTgZLHyd6TZw12JkWRsO246IUVrZbrEoVIyInJLK?=
 =?us-ascii?Q?U6DakGHYovbrFqDQcTeGGWfqnMHMKisI4N7Pex5iX3bjCu9emBIn1A0ZXBvf?=
 =?us-ascii?Q?hK4MLyLB0syxeK2RGg0Bclx/TS/39H8fUxmMj7BYrJOoX0Ie/3aNmlKJXi9N?=
 =?us-ascii?Q?Nb1rvo6pAyQULYqnFXn7jPWC1/0qUMXfNL5eZ2qt0K00gZTB9VRt0PS0tzS+?=
 =?us-ascii?Q?B7+45y3Eyh82BA6IUIXYmwh6bWadXKXfECkZLHERD1n2M2TinFLmQlusdSns?=
 =?us-ascii?Q?CS058pgKlq9VE83zvWrxFS5rFbJ63xed7nxMAa+i9IN/aCMbcHqVFHE4mZ6p?=
 =?us-ascii?Q?cA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1694ca92-c6f2-4779-c538-08da8a12545e
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 23:00:55.7775
 (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: 8OvAeDhA3n1eALrCXtemUT0V2WHL1zl0FzrS9nm+cOanidM7pIm1MYS1mbUe8FO+rEJEMOYzxrCFYcGMDjQUZf0HUm3GR32x6Q9ZsYwcTuU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3736
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-29_11,2022-08-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0
 mlxlogscore=999 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208290101
X-Proofpoint-ORIG-GUID: CzSqTwL8LsuHDyA4mSIO5pFcQxmGdSOd
X-Proofpoint-GUID: CzSqTwL8LsuHDyA4mSIO5pFcQxmGdSOd
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Removes the last caller of remove_huge_page() by converting the code to its
folio equivalent.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 fs/hugetlbfs/inode.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 3b5c941e49a7..7ede356cc01e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -366,9 +366,9 @@ static int hugetlbfs_write_end(struct file *file, struct address_space *mapping,
 
 static void hugetlb_delete_from_page_cache(struct page *page)
 {
-	ClearPageDirty(page);
-	ClearPageUptodate(page);
-	delete_from_page_cache(page);
+	folio_clear_dirty(folio);
+	folio_clear_uptodate(folio);
+	filemap_remove_folio(folio);
 }
 
 static void
@@ -486,15 +486,15 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
 
 			folio_lock(folio);
 			/*
-			 * We must free the huge page and remove from page
+			 * We must free the hugetlb folio and remove from page
 			 * cache BEFORE removing the * region/reserve map
 			 * (hugetlb_unreserve_pages).  In rare out of memory
 			 * conditions, removal of the region/reserve map could
 			 * fail. Correspondingly, the subpool and global
 			 * reserve usage count can need to be adjusted.
 			 */
-			VM_BUG_ON(HPageRestoreReserve(&folio->page));
-			hugetlb_delete_from_page_cache(&folio->page);
+			VM_BUG_ON_FOLIO(folio_test_hugetlb_restore_reserve(folio), folio);
+			hugetlb_delete_from_page_cache(folio);
 			freed++;
 			if (!truncate_op) {
 				if (unlikely(hugetlb_unreserve_pages(inode,
@@ -993,7 +993,7 @@ static int hugetlbfs_error_remove_page(struct address_space *mapping,
 	struct inode *inode = mapping->host;
 	pgoff_t index = page->index;
 
-	hugetlb_delete_from_page_cache(page);
+	hugetlb_delete_from_page_cache(page_folio(page));
 	if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
 		hugetlb_fix_reserve_counts(inode);
 
-- 
2.31.1