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, jhubbard@nvidia.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable v2 6/8] mm/hugetlb: convert alloc_migrate_huge_page to folios
Date:   Tue, 10 Jan 2023 15:28:19 -0600
Message-Id: <20230110212821.984047-7-sidhartha.kumar@oracle.com>
In-Reply-To: <20230110212821.984047-1-sidhartha.kumar@oracle.com>
References: <20230110212821.984047-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?7LIBioIc03Vjh6qEcvWWmobp+Axm8JVNcyNppew+iqYv8I7buyvg11hhfy1c?=
 =?us-ascii?Q?PJItgzUJtcPGTGEs7iJ53hGG7ERZ3Od0iiLnFv+hoCav3/cJdxz774E6u7Em?=
 =?us-ascii?Q?20bdjw2m3oCRn83SYw3+btqrMc0d98w2k7We5B0i6pjQWJmunQ8Tb2ETuyy2?=
 =?us-ascii?Q?PNcX1G3SCkSvb4smtWHqm76y33TuRkK4QxNFSTkywYO5S646m7p38d62olk4?=
 =?us-ascii?Q?wQBhLujej1wWZOJre7oUxeAJRZ+o3/HrzyAEgdzjg7CdMRWZ5qNo7jUBprcY?=
 =?us-ascii?Q?w+IvImPLhB8QHZwBKBt71aPlEQu5ECZTItypOsWw2jytlZnEY3W8O1zTuV+W?=
 =?us-ascii?Q?IOZb/bbSeG0awAxSXf6VzH7JgZmLSgHHgrZmVsa/H3ikVDhlhMo2PmjaGf7/?=
 =?us-ascii?Q?va9gwIkb5LkhiEg/vt3U1rZNVBau8EZiNUuLsVr7+jnnYTkQQrL0gci3iNLG?=
 =?us-ascii?Q?3CfowDGypBa/ct6HaQYAU1czX90iBPsnoKFsl9aEA88CIuq3SVOCHAqvk/q+?=
 =?us-ascii?Q?WvcwLBG+aqyWndSjA38GpHuIgkga56qRaYJYG62jtc3UmR4bRUK1ATyTjIFb?=
 =?us-ascii?Q?4wEGPqqFWMNjMhDO4mm15CipvG18cY3LV8doiHD7JN6NzFSnvTCxzgDn+m0d?=
 =?us-ascii?Q?N7zGBTt2LUl+719UMNbb8Cd6qP4fAOypCQOq1xyYGbyuAkHW2R3c+ZAyTteJ?=
 =?us-ascii?Q?ON0/iSj5vuKkdAWXGhm0IURwXDVoKrkChpUoEkzUA1nXzDgUgSw5kwft63rh?=
 =?us-ascii?Q?nj8qCwfs9RqrE/pnFhfnHIF6RXkb9Biy+5NBshYa8dGwxX9/fjosfuAUXSin?=
 =?us-ascii?Q?GNhP57nJPKtykEF/VpLyw/e6yTJsonRYNcwrnxJL9seUh4IFvniL6BkHPFr0?=
 =?us-ascii?Q?oGFAH/kURZPBHH0pvtr5UtHYGV6ftm/+KzjKx5WqyzhHCW4cUDFzSznTEaSE?=
 =?us-ascii?Q?OtbdOYMny6M3K8+3SzN2DCJw+y6apytpGURlvEnY7hlxLCR8rkMlv11Ml8I3?=
 =?us-ascii?Q?kyYJ47akvOpU+GdqsJnylYvV4oGUNNUJfU5Fh3FZpgeRjp+BNyrbn2NFGI0W?=
 =?us-ascii?Q?+c11FZwMf+wjHZycHF6zVnPMzLt21MaPnkO9Og3kZPlv2i+XULpGOSPqnUI9?=
 =?us-ascii?Q?qTk1nohw2EYErzXv99R4HjQ2/kFWyFKXJbEsvTyNYm8+hl5/C4QPaDbl06JO?=
 =?us-ascii?Q?g1qevq74Xj4Vm7pA5RmA3+IE79ADJzoV2F+kDKuML2SwoAH5RId2Ke+snOzz?=
 =?us-ascii?Q?Zii4k3nblOB//Wma4e5jLPQpPMwYMg08cJEgfXqBUS9D6l4VY6UIn0u+2Oin?=
 =?us-ascii?Q?mPsoOGWRShPZ2yaDl/agNFv2r53q4q0+tIir5qKjcB+fcsJOOYFrwB7AKArs?=
 =?us-ascii?Q?0HgeWQTOKIL/nejccQLEUtyFSIfp3dGFuqgwZpT5tUfg2jyg0XYsDQxtujtx?=
 =?us-ascii?Q?v/T5+67JfUCGv/vK0xa+8VTnuqjGAKrOqdWHTDX2lc4vVhF0YqymRoTFxcLz?=
 =?us-ascii?Q?zva7gCtBV76xUHEV598Se41wcmkb/JQzkID2W/yXJtW07hRdC9gn50Hug22u?=
 =?us-ascii?Q?DDqlcGdoOI8C57TMSxYu3GX+egAYFDxuWv2oVD869EgQOqai3Q8qRTZLfTah?=
 =?us-ascii?Q?mZwCZ2zzoE5rS1LQbiP1ZU0=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?QFdxagAbmlEy4NFpvyB1Cq/ckqpXjvI5PIIQh0g3cdgvjux86cBHx1Vt+qX3?=
 =?us-ascii?Q?L4/jLhBkpSh5Drv5khCQ0IIgb5UHmNeGe5vxwpo3pcVpFh1yUQLPznFOnXUI?=
 =?us-ascii?Q?9XtLt6P8u8x512bKxponOK4KtcAtVRwybL2TcSq5YGTVRUAe8Bt4AgzQjBj4?=
 =?us-ascii?Q?Fgy0v2UeZcpHGZBP5U5yAlDMKbq/L1rKzpWju1JBbrSOhrdFuQpZa9WL6oXD?=
 =?us-ascii?Q?t2rYI4a2Mw8SAGjg5TAq9pVc2MEvOOtkQP9AaEhUNzRZxlhPas1ERtXugMuv?=
 =?us-ascii?Q?03BJnen4W3H6Z9juUlF9WrWb7Agmcwx5Xpu6X+ZBzw+Ar0LBIiJpwbK6qji2?=
 =?us-ascii?Q?Y9hzX4WefvqXBUnhGlSDI5tORQIB2NoLZBTzG5wEz7isPTGF8HkORkUdCqoV?=
 =?us-ascii?Q?gks7cpUpvkC4xRfEa1R/ezopZF9nR9MZvKPgzvMLTfWZSkSyDfj5mupxondj?=
 =?us-ascii?Q?HYZfw6di6IgdMZ3M6xd52mA2cxq1OkhKEoAbRgYvmb/bmLoRzWP+Kwum6Ux2?=
 =?us-ascii?Q?EqU4ivGcXHpXOTVBYIiuPYFCUkX7+7S1xQra8Ce8Z29cReMj6DehckaFTQVg?=
 =?us-ascii?Q?0W3xtTzlz0wAZRz75BIkHSFIYYjwLmT2N8ZyrB9A3qk5Zrw62tHQkyoFdkAN?=
 =?us-ascii?Q?4nyLXP+Rq5oNwj1yQvC3kJ2asFa2PLQr4g7NapnqEJ+fNbnv/VCViDjXbCal?=
 =?us-ascii?Q?zi/6VVEh7nvplqoOYyGDypPL+ei/5TAniUohlow1Ez8QCfWecN41RjsdBiYh?=
 =?us-ascii?Q?TmA+CQPR11u/kXvlCUAMoS+LOi0fItghC2lyBAMtjkrf0LkU9RExaIcjk+ML?=
 =?us-ascii?Q?Z1J6DLeiTMpWDran6D/OLMFP93pBBLdroXqyZnKEewKbeuVVDapAtQDnfBr2?=
 =?us-ascii?Q?ozKx2Z1GKGEL/hilndisaUvTIRZSEfxXloywcEVEK7qJYKJOtB+TOARp3LbG?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d520678-d78b-4982-8d93-08daf351a796
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2023 21:28:45.7783
 (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: LFJznWQHR27S4a41dMgZ27GkYO0X18py7ywBMWPzMlzgzx4MV4xlHX9OsMVClLaq9RKp0CzmsxYpWDAiTsC3tKqLJl0XXJOX+rPxaf7oWrQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5133
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-10_09,2023-01-10_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301100142
X-Proofpoint-GUID: zZBcUxr38dw456bCMStSmob7VO_kQPnR
X-Proofpoint-ORIG-GUID: zZBcUxr38dw456bCMStSmob7VO_kQPnR
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

Change alloc_huge_page_nodemask() to alloc_hugetlb_folio_nodemask() and
alloc_migrate_huge_page() to alloc_migrate_hugetlb_folio(). Both functions
now return a folio rather than a page.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 include/linux/hugetlb.h |  6 +++---
 mm/hugetlb.c            | 18 +++++++++---------
 mm/migrate.c            |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 482929b2d044..a853c13d8308 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -680,7 +680,7 @@ struct huge_bootmem_page {
 int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list);
 struct page *alloc_huge_page(struct vm_area_struct *vma,
 				unsigned long addr, int avoid_reserve);
-struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
+struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,
 				nodemask_t *nmask, gfp_t gfp_mask);
 struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma,
 				unsigned long address);
@@ -1001,8 +1001,8 @@ static inline struct page *alloc_huge_page(struct vm_area_struct *vma,
 	return NULL;
 }
 
-static inline struct page *
-alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
+static inline struct folio *
+alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,
 			nodemask_t *nmask, gfp_t gfp_mask)
 {
 	return NULL;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index f3e1d052b40c..c0cfb075cd58 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2275,7 +2275,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h,
 	return folio;
 }
 
-static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask,
+static struct folio *alloc_migrate_hugetlb_folio(struct hstate *h, gfp_t gfp_mask,
 				     int nid, nodemask_t *nmask)
 {
 	struct folio *folio;
@@ -2295,7 +2295,7 @@ static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask,
 	 */
 	folio_set_hugetlb_temporary(folio);
 
-	return &folio->page;
+	return folio;
 }
 
 /*
@@ -2328,8 +2328,8 @@ struct folio *alloc_buddy_hugetlb_folio_with_mpol(struct hstate *h,
 	return folio;
 }
 
-/* page migration callback function */
-struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
+/* folio migration callback function */
+struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,
 		nodemask_t *nmask, gfp_t gfp_mask)
 {
 	spin_lock_irq(&hugetlb_lock);
@@ -2340,12 +2340,12 @@ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
 						preferred_nid, nmask);
 		if (folio) {
 			spin_unlock_irq(&hugetlb_lock);
-			return &folio->page;
+			return folio;
 		}
 	}
 	spin_unlock_irq(&hugetlb_lock);
 
-	return alloc_migrate_huge_page(h, gfp_mask, preferred_nid, nmask);
+	return alloc_migrate_hugetlb_folio(h, gfp_mask, preferred_nid, nmask);
 }
 
 /* mempolicy aware migration callback */
@@ -2354,16 +2354,16 @@ struct page *alloc_huge_page_vma(struct hstate *h, struct vm_area_struct *vma,
 {
 	struct mempolicy *mpol;
 	nodemask_t *nodemask;
-	struct page *page;
+	struct folio *folio;
 	gfp_t gfp_mask;
 	int node;
 
 	gfp_mask = htlb_alloc_mask(h);
 	node = huge_node(vma, address, gfp_mask, &mpol, &nodemask);
-	page = alloc_huge_page_nodemask(h, node, nodemask, gfp_mask);
+	folio = alloc_hugetlb_folio_nodemask(h, node, nodemask, gfp_mask);
 	mpol_cond_put(mpol);
 
-	return page;
+	return &folio->page;
 }
 
 /*
diff --git a/mm/migrate.c b/mm/migrate.c
index 6932b3d5a9dd..fab706b78be1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1622,6 +1622,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
 	struct migration_target_control *mtc;
 	gfp_t gfp_mask;
 	unsigned int order = 0;
+	struct folio *hugetlb_folio = NULL;
 	struct folio *new_folio = NULL;
 	int nid;
 	int zidx;
@@ -1636,7 +1637,9 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
 		struct hstate *h = folio_hstate(folio);
 
 		gfp_mask = htlb_modify_alloc_mask(h, gfp_mask);
-		return alloc_huge_page_nodemask(h, nid, mtc->nmask, gfp_mask);
+		hugetlb_folio = alloc_hugetlb_folio_nodemask(h, nid,
+						mtc->nmask, gfp_mask);
+		return &hugetlb_folio->page;
 	}
 
 	if (folio_test_large(folio)) {
-- 
2.39.0