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,
        almasrymina@google.com, linmiaohe@huawei.com, hughd@google.com,
        tsahu@linux.ibm.com, jhubbard@nvidia.com, david@redhat.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable v5 01/10] mm: add folio dtor and order setter functions
Date:   Tue, 29 Nov 2022 14:50:30 -0800
Message-Id: <20221129225039.82257-2-sidhartha.kumar@oracle.com>
In-Reply-To: <20221129225039.82257-1-sidhartha.kumar@oracle.com>
References: <20221129225039.82257-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?hSrcKvGfsyqr07KCR4Jld6R0dVwsBaAsOpwsEPxk7jgFZctCHnJFdMpaZRyI?=
 =?us-ascii?Q?Psm6IklvnDr1HhakFHrV/TlVS01JdWk6dOLI7QOQftMHygGjK8mKMkHUpAis?=
 =?us-ascii?Q?AvXHUGggah2XnfDpqnm0YvO5rgdoNv+o6AANO7Z4eY4da0RuxwxgiwvvKD3p?=
 =?us-ascii?Q?M3Y9Rjk1MIFFEJp7HiaaSaSDMg9ciRyeIUoyXMVYDKhnKREBLHLlH4qnmTTB?=
 =?us-ascii?Q?GMb7CA7vB+jHpgILQyzSwpha9rC7yG7VnTTIte1j2PzPQE+IZX7PlGzSTVtQ?=
 =?us-ascii?Q?YetwbS7NvZ7ReOM7xYEQmdFP+OsZLt939JnfUtU99KS2PzWanDiP9Wvldyoe?=
 =?us-ascii?Q?hwCPNLxomemH7/HPGQ4l80cbL3YS06Ps6hSn+0LllYt377+uRma4a43JIsdo?=
 =?us-ascii?Q?8IgqiqS3EY/8wb4KcmEr2Y0s+P8CAhgqZiuQ5ykiU7gkj7rYNIyJ9mqV84C9?=
 =?us-ascii?Q?TeWw+x1WeEFw/H1ItkFCmRPbKy08vryUxcKD8f5u8v3bKeShXO48+4a3PnLw?=
 =?us-ascii?Q?Iu8ZzSMXwHcVWFUgZIZ7z5LKYHkjlxghxN0PiKO/bova4Pey4da4jIbZRMtn?=
 =?us-ascii?Q?J3xM1LMK1omAGSq+EocBO04wJrfTuOZACkYOchk5x2deifL6OX6XgwilqiPw?=
 =?us-ascii?Q?9JKD9QuhcqMfHUGZhXNzQuVT+UW34afjPNbC+pFQbOn1g4/qBBPsBJHDsaGU?=
 =?us-ascii?Q?hpaZoycZcTX7PqMf0wjCQZJdOmmuReutVLcAlbB0UOQ6oGoNh6qUC5WLDboY?=
 =?us-ascii?Q?Ti+FRNmV2FI+5QHfcWVJmiIt09XmQqL13/aFEL+/Y3WViO747faTENb+JjBy?=
 =?us-ascii?Q?DtcPnOUZ8wLgIoBehfhNhj2iVRX96nREf8wSaC1cElQ+jDKYq9OzSfCPUilY?=
 =?us-ascii?Q?GGfNX8OUo9HnGW8ZSUJ6nlvtWznMtDp6Fk73c9Ax14cPRM6dZKR0BV9tT9YH?=
 =?us-ascii?Q?nUx1Xc71/jzB2DxO+2J0wFk+UzC+AS0MskqHpsI7NaP+xURfCmEN0DZkTZsf?=
 =?us-ascii?Q?VLx1WHps+Q0cixd4R82J7tBqZkZLDst44up1i5yQ3bHddf+aikGGleJ543lv?=
 =?us-ascii?Q?xybCE0RRBP6JOfxCp85MbS0S10IXfYImYQP1Vy8xRRHrmzStQGRf3L6OSTBY?=
 =?us-ascii?Q?6tY3T8HHmAskHa+GvBe9GUN0YMume7V4lVlzoKjTmKmpF6FXh8oZfmHDsrSq?=
 =?us-ascii?Q?1BI52u6lrTorYqHy/hFeWcM16BWVsh6L2yOu6ViSkS5W2xR/N9XWqEBAeyAm?=
 =?us-ascii?Q?21BVNN4pV8EOHrAoXIqR+pgihMcmr6XNXkJx85JLQnPzPUvym4UTidN+mnH+?=
 =?us-ascii?Q?nrnb1xlzq72Gs0QaQV/3FLiYPOtDWy8hOaGk3AjRfmoDdZE4E1hchuCkwS/f?=
 =?us-ascii?Q?1cu0OWzcpd7or5+Q3rv1CBqBBk2hcTWZASY9x7AxsXEOmD5UrBlIVtd1/+6C?=
 =?us-ascii?Q?ah3lEtL6d/SJJZYc7gZL6z5RLwG6YL1tFF23WJm+YPA2LDHfcEPy8MkzWaqd?=
 =?us-ascii?Q?vDfmONG+yBSgwzEQIGbPBfKUZKHy9tyzvTPUpNUmcd1H3rj8O11Z8ld5dvV9?=
 =?us-ascii?Q?3p0mSejDLLyPy4SiqEMstNlxXDPRr6QmZsczhZlX1sr6HB6U7jxs0X9t8BgE?=
 =?us-ascii?Q?tg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?zw5eKEqYUMj5vYO9d0dKyNUC4BnQ9HaLHzRJXHZziK2VdGLnl/lnIoNLol+t?=
 =?us-ascii?Q?O55ihEIurlhh5F8nMwhdX27OT8azvTHnWPxYCH+zQmbFZDADoFFMWWytzuqE?=
 =?us-ascii?Q?fy8QxcPB2UJXKrA00EsHhhdKocc0uJiVNW9aKPduDwPhFJo3BeQ5TKSLNPmZ?=
 =?us-ascii?Q?IQS0t53m+TOs9/iLvzWhtDFwvuYyNiKALWUfKy6gXODSyOUmDn1izE+7L5cU?=
 =?us-ascii?Q?OTjlXPo3hR+43zxTRksJ9nnFA27UnunMMTkjUy8cfwwKGZqG6hhm/2cslcaB?=
 =?us-ascii?Q?E3SHvf7ZAUUkGP1vUdBJYhA6IdM5FR3cKgzSrimfJGaVMw3BLDnGVEClzFNa?=
 =?us-ascii?Q?N5H44ayvOq/PM8PJ9UIOHIiBL+7fWYE4AkHMNCCNJOOzprDgfJaTHZDQXffI?=
 =?us-ascii?Q?h0W4Rsol8Z19Ouh1TTg7yUgeF5xwoOTxR1YXYwiScJZ/SfKq85/UjJx/1FVG?=
 =?us-ascii?Q?dx88ep4lrsG4NqFRVaxeu2dSOOAo9PfJFsRpk5Cof+0yVo0l/WOpIy9UTTgE?=
 =?us-ascii?Q?W23N8HA8kg1KirAI3UCdkMohAxx2appQxgx9TnopnEv4rSuzvgrF9wikhdd0?=
 =?us-ascii?Q?KKvOj2tvu/wuwnxI8+s8cz3m2nVmflw6Bi2wRfm3KQcHyeoM76T4zoy2BvSv?=
 =?us-ascii?Q?YGCJwSl9ye4FufMGTjBwldv40Ll7n5qUyCYcTCSJNVH2hkRb/7maHIeh2KgM?=
 =?us-ascii?Q?6mxvdN60/ydDnfuNkXE0AiJaR7hjFRVyPwjPJMhtvzN+p+cdLaHPGCje0lfI?=
 =?us-ascii?Q?saxCjFXLHqGSrIjPhYACPf1+WC2ywW1i9jeksFfATS0EGhE9vTl5sj3/mdoO?=
 =?us-ascii?Q?+PU5wsmDCqlMd2AzvnGp0zs/Ys359p9jWen75+hUfxd/zZFavtblTZRSCEl1?=
 =?us-ascii?Q?I+QpH5ZyAydGh1dEwSO4PBwBOEuIyNgk/yaqHnmGIkltbnpAhwT5LNqWZrnS?=
 =?us-ascii?Q?uytJXAJoEU737I1fIMx3lnvs4i4BuCEBgt0R0ZqxhQEy/E+xrmNVZ4uS+uSV?=
 =?us-ascii?Q?S0YzVqaJ/g0lSFZ7+bRIh0T2kydYh9QODXi7WqWYSkkI5xsiVeziyeRoWJd0?=
 =?us-ascii?Q?v7bb0+RZAR3YpN4tilTEEsarx2nQk8C8c+QWZorDiZCn0gZ+8Ec=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c488c91-f80a-409b-e44f-08dad25c25c0
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 22:50:44.0130
 (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: ykDOd7EDrmXoFetYWuu43ynh5LPKcPZ9mg+D/axNHBDvQNopxDWiJNjJzsQae4sDhuadQlKnIsnfnYk0tIKQgtE1ElX1RZ/hrfiCIfPUNYA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5586
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-29_13,2022-11-29_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 phishscore=0
 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211290137
X-Proofpoint-ORIG-GUID: VufT3BYM0vTRovhzMkprFtWtqClY2Vd3
X-Proofpoint-GUID: VufT3BYM0vTRovhzMkprFtWtqClY2Vd3
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 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

Add folio equivalents for set_compound_order() and set_compound_page_dtor().

Also remove extra new-lines introduced by mm/hugetlb: convert
move_hugetlb_state() to folios and mm/hugetlb_cgroup: convert
hugetlb_cgroup_uncharge_page() to folios.

Suggested-by: Mike Kravetz <mike.kravetz@oracle.com>
Suggested-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 include/linux/mm.h | 16 ++++++++++++++++
 mm/hugetlb.c       |  4 +---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a48c5ad16a5e..2bdef8a5298a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -972,6 +972,13 @@ static inline void set_compound_page_dtor(struct page *page,
 	page[1].compound_dtor = compound_dtor;
 }
 
+static inline void folio_set_compound_dtor(struct folio *folio,
+		enum compound_dtor_id compound_dtor)
+{
+	VM_BUG_ON_FOLIO(compound_dtor >= NR_COMPOUND_DTORS, folio);
+	folio->_folio_dtor = compound_dtor;
+}
+
 void destroy_large_folio(struct folio *folio);
 
 static inline int head_compound_pincount(struct page *head)
@@ -987,6 +994,15 @@ static inline void set_compound_order(struct page *page, unsigned int order)
 #endif
 }
 
+static inline void folio_set_compound_order(struct folio *folio,
+		unsigned int order)
+{
+	folio->_folio_order = order;
+#ifdef CONFIG_64BIT
+	folio->_folio_nr_pages = order ? 1U << order : 0;
+#endif
+}
+
 /* Returns the number of pages in this potentially compound page. */
 static inline unsigned long compound_nr(struct page *page)
 {
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 4c2fe7fec475..6390de8975c5 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1780,7 +1780,7 @@ static void __prep_new_hugetlb_folio(struct hstate *h, struct folio *folio)
 {
 	hugetlb_vmemmap_optimize(h, &folio->page);
 	INIT_LIST_HEAD(&folio->lru);
-	folio->_folio_dtor = HUGETLB_PAGE_DTOR;
+	folio_set_compound_dtor(folio, HUGETLB_PAGE_DTOR);
 	hugetlb_set_folio_subpool(folio, NULL);
 	set_hugetlb_cgroup(folio, NULL);
 	set_hugetlb_cgroup_rsvd(folio, NULL);
@@ -2938,7 +2938,6 @@ struct page *alloc_huge_page(struct vm_area_struct *vma,
 	 * a reservation exists for the allocation.
 	 */
 	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve, gbl_chg);
-
 	if (!page) {
 		spin_unlock_irq(&hugetlb_lock);
 		page = alloc_buddy_huge_page_with_mpol(h, vma, addr);
@@ -7351,7 +7350,6 @@ void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int re
 		int old_nid = folio_nid(old_folio);
 		int new_nid = folio_nid(new_folio);
 
-
 		folio_set_hugetlb_temporary(old_folio);
 		folio_clear_hugetlb_temporary(new_folio);
 
-- 
2.38.1