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, willy@infradead.org,
        tsahu@linux.ibm.com, aneesh.kumar@linux.ibm.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH] mm: remove set_compound_page_dtor()
Date:   Mon, 12 Jun 2023 09:34:05 -0700
Message-Id: <20230612163405.99345-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?eSh+wMuyCniisE3FN66D0PlfDRvjEKsh2qJyUFwHkgNv7oD1gnDd2mESMn1s?=
 =?us-ascii?Q?zs4U5cpYg8vTDSKJIEIdaq1ciP/AFtb+/TjQiy800zJnjMOwrN0RzSbEElT0?=
 =?us-ascii?Q?x2Z1PooIMQifll+AaA1YJ9/ereYVbBFB0BBoXZieyo8Nr44D6qUkJTpa+MP3?=
 =?us-ascii?Q?2ZLv8Ykc6CpkVDBy9v8xcfcLCHTSpdG86ESt+tJ7Ooq0+8MfSAnlRfmnzi1U?=
 =?us-ascii?Q?sLKrWbZNxKYZYBRb+FOKRd7TD+t/B4L0/n8eF7t5q0DK2VvbveUlbQ8QVuAL?=
 =?us-ascii?Q?VaYQEkOKG2GCYlW7hHfToufzrBxos98/c5k8T98w5/DU3ndX5/LjF441/UIu?=
 =?us-ascii?Q?QjtTHPbQ2fDpsecleyMH/AJLlp/wo1FJ0b2X1uv7NVeIk3G8AcDB9Gq9s27U?=
 =?us-ascii?Q?A3CmMw7MTyMLYvGsjp253IUdzhTVB93m8xA/3ioqOD9qiEvTEF4T8rBWz6ie?=
 =?us-ascii?Q?wmXsbiBP/L1q7Wu1C7twZSOJ7CGawGuCyIZQsXsK1p9RvhNSptBX3sd5LjEi?=
 =?us-ascii?Q?EDR9MpDqqfcT2fitsK7MCP4X5c+jKEAWPta/xxwMQyi/OQ9LZhVKsCsUFbBC?=
 =?us-ascii?Q?EJs+HiK8n4UbilhzT9PJFCzqKpy7RosGsw11lvrP1vsmz7XVw+RGUeFcppu7?=
 =?us-ascii?Q?Po1hmgCJRh92x7/LZKa3O/pnYO8nv69U7fBiFbHQteJmCTjPqWUkX5ZGRmrc?=
 =?us-ascii?Q?UNYevo8M+9Yr9p0qczHF9jcCc2Tpjfy682U9X+0PyzX8kZAaasJTQ0uZPtt9?=
 =?us-ascii?Q?qlExbvbb+IzL4lBXqhI6dIiJxHRvT2DQTEqJEzL3Ph5NZ3yvMdUeLu4b02FQ?=
 =?us-ascii?Q?XnSclsgIIphE6ufyCtDGW6kR1SaVrY8aYFV4Fv1PSE8hMvQUmh8x1rmWo7o/?=
 =?us-ascii?Q?GKscrgBERnm540PKrwFBPXCegxQVsCfB2XJttxTAyRLxT6u3AQTFfI2Pez+R?=
 =?us-ascii?Q?37j9Xb6fZgGVGvxFvSis1ZD82/B4k2UMCuGia2mLEKooMxAevAsC3RNNXobp?=
 =?us-ascii?Q?qpUgpCQzJQ599R8IZJmMYu5BJMdb7jcuOZ6DadlUPy9Qi942IYDvd2Ct1dz0?=
 =?us-ascii?Q?hbGEaKQY9GUgxo1WwBN2qDodU432UnPf4IRVPUhgMdCss2Nom46Gpu0QFw8t?=
 =?us-ascii?Q?iyt0GTu/xHs3c542wIMjmYIJ2BptEIsNaRkjB1HwrT9yxXn9GEZjdrgY3Ovz?=
 =?us-ascii?Q?CSp/rxY95L1NeleouPATH7VrKXfeJf6E4V6gfU3V9gzlj/ZTss3Pj3MXbBaE?=
 =?us-ascii?Q?KcWQTAtAmXJZqP9RvZK2nZ2+fDo1hs/Y0LSm8i6TvRWcm+W5nTZ72C6i7fGr?=
 =?us-ascii?Q?dvPHPUTxk6XKyXXaNB7SP1c2fXG98fOvGvB3423oRdmZNs5182gI7MzS1X72?=
 =?us-ascii?Q?VuqVUTkYP4G7xnG6ApmaEezq5IIIRCUQqxNPdKylEf23CtgBU7zSNSi6ZLPB?=
 =?us-ascii?Q?jTdL/E1+lXrg2askFU7BTOJ5NXIiM1afWXIsBbmu+bnc+ciChlbT9Sv6LOz2?=
 =?us-ascii?Q?vOd5p97KoTxTbtaX1JGdH4v4oHGPsGHg1QIX6UKcDffzQ/QpNii79Vx1HGCj?=
 =?us-ascii?Q?vVoOJFIbfVlP7H09lNG3qWX8OLftMr2MMu+NaXvJpEQM+d/kE/BDLHJ5SM7t?=
 =?us-ascii?Q?xsJ/6iHpz3CXgO2PhymdRfI=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: axJqr86s8s+KM2xZBlda/VvXKvm8lf0DASfVDb/eKfN9kbrCKuy2o819zht/hWcibx7CtQ+L2JOKSqzJ5a7m2LXRGcaL8g5mU6yc3ThZ7+rVugLiOBd0Y3bqojxJrzeNar22kiR2jOaKQg9VBl4sL35ec3xNr+5FbH9Jt4e0fsgVQh7AZc2rEEeJ+SUcJ0olF8E3uioV1xNrI6h5Td16HmF7v9Cq+AYzKAy7YpgfvS3rtVhusnpaUi+/2cLnmAtR0hQMlT6a2DfAT42NhpAY0mntMya8wWV6aTzU5rjHLB8MnSkFHmjiPHcwEf59Vh14ArY3oL0EX04HBZ/p7eXsSsmJAXclwE1eNGLX2AhQCPI9JU0PPJpejbPNCbDw69a+ib9QDV4iKsI3yaBPLniksXVPHx5BmO2uOIEXRZm57InvYmcFFYFgVaHxIqm5IBBXwa9+vN61USprHKfT9IXOjHLlC02IHLpGw2g++RrIqRWT/suxt/ao6Kp7/XYIYXBKCtJ0PcJFoyrXzkNRW0EgrSAlCZyj+wdPFEQCBameUP48VV7uaCB1TryyJebDFFa+qDlIu2uOAV3COFk61odVr97lNypaycgWhR4e+2RWICRCbXL2IRbn1RDMM2G7rTQ7Vjy2UkNWXJnfzIvBul3FS9IWhgjHxpTxmFWclL069umr/4hSpiUBZbMOuBhsJmlnLILd7InQvnhmILCfdICimeWT/leu3rLy2HIyEuMrtyZDzwkfDHJWietr1jeas5ltAyRpoR66vRegEHOGt6Duj3VG27bj9ZiVX125w3BKzD/9koaq5cFzPgcubccE8LX/19en2WDOyhF9etYZSrZ+XflXU9jUVf6qQdppiOOr1NGkQcyupyyFTBqtAGMbOaOU/YlOMXoimeaCFObF6BrcV/6TzxC0XnSrSW48GozB604=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 83436bd0-8ea6-4aff-4c08-08db6b62dd51
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 16:34:16.8512
 (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: cVprlAcKfb/nrClBdrzeMGcNiFzPff0DuQoY9im3C3AWGuF2fZ33lw9JkKo64VAE0cG4A7MT0W7aJ53Y5fs1OzBIL26CukMElmWeeSwu3Y8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5266
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-06-12_06,2023-06-09_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 malwarescore=0 mlxscore=0 adultscore=0 bulkscore=0 spamscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2306120143
X-Proofpoint-GUID: Djz-w_1XhaWGM3vWfVYRdtEdJ3O36qe0
X-Proofpoint-ORIG-GUID: Djz-w_1XhaWGM3vWfVYRdtEdJ3O36qe0
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_H5,RCVD_IN_MSPIKE_WL,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

All users can use the folio equivalent so this function can be safely
removed.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---

rebased on 06/12/23 mm-unstable + Tarun's patch[1]
[1]: https://lore.kernel.org/linux-mm/20230612093514.689846-1-tsahu@linux.ibm.com/

 include/linux/mm.h | 10 ----------
 mm/huge_memory.c   |  2 +-
 mm/internal.h      |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4a1aec5e4b83c..485224cd62ffb 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1223,16 +1223,6 @@ enum compound_dtor_id {
 };
 extern compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS];
 
-static inline void set_compound_page_dtor(struct page *page,
-		enum compound_dtor_id compound_dtor)
-{
-	struct folio *folio = (struct folio *)page;
-
-	VM_BUG_ON_PAGE(compound_dtor >= NR_COMPOUND_DTORS, page);
-	VM_BUG_ON_PAGE(!PageHead(page), page);
-	folio->_folio_dtor = compound_dtor;
-}
-
 static inline void folio_set_compound_dtor(struct folio *folio,
 		enum compound_dtor_id compound_dtor)
 {
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 31bc8fa768e3d..76f970aa5b4da 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -583,7 +583,7 @@ void prep_transhuge_page(struct page *page)
 
 	VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio);
 	INIT_LIST_HEAD(&folio->_deferred_list);
-	set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);
+	folio_set_compound_dtor(folio, TRANSHUGE_PAGE_DTOR);
 }
 
 static inline bool is_transparent_hugepage(struct page *page)
diff --git a/mm/internal.h b/mm/internal.h
index 61acceface45f..a64967bfcd2ab 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -406,7 +406,7 @@ static inline void prep_compound_head(struct page *page, unsigned int order)
 {
 	struct folio *folio = (struct folio *)page;
 
-	set_compound_page_dtor(page, COMPOUND_PAGE_DTOR);
+	folio_set_compound_dtor(folio, COMPOUND_PAGE_DTOR);
 	folio_set_order(folio, order);
 	atomic_set(&folio->_entire_mapcount, -1);
 	atomic_set(&folio->_nr_pages_mapped, 0);
-- 
2.40.1