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 3/7] mm/hugetlb: add hugetlb_folio_subpool() helper
Date:   Mon, 29 Aug 2022 16:00:10 -0700
Message-Id: <20220829230014.384722-4-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?WZEbXhupuJxfiPljylUJJ1KXHsdnBa1K1s/uUfG14GV0GbH/9qQAysz5X/nK?=
 =?us-ascii?Q?5XQX50M9QpPwdLYoYXzt+jmqVhewbZk5aub32iwWtKXr/8Y6syF+zFrw6A0x?=
 =?us-ascii?Q?zEZE5Empl5Igb9s4ldVK6w32veJcYPN5zgB5DdaEB15nDLxGrIvHDUM3M+3V?=
 =?us-ascii?Q?0RNk2nDrgEjd86sGhKG00+Yxakbu3FJaVDox+xC9opkuffXjNwBB+LHXY6eD?=
 =?us-ascii?Q?hgkG/50eLLbUYB5Rjq4cNYgEZ40Hu5v9AZpcYvU0A2UJsf2XLXcnONhjdtPd?=
 =?us-ascii?Q?b3khTjZg28jEunK1F6C1RQknQXLd8htgp43/5SyXy4FeuYf72KJAm86tQ4re?=
 =?us-ascii?Q?L5eb0Ss/dICSRR+UtbItNLz21nBEEoEJKoMxAoWZ+cgB6Rxood/dvFWBrSvS?=
 =?us-ascii?Q?vrsDdKAPnM90gyOKJTi4IAnW3DPViqCz8+lOOo2L3oA8BRwjCiQgq/5MjqdA?=
 =?us-ascii?Q?lnFLEwrTE7V7/ALuXSNGOwCO8vrgC27bE+i+jJmQ40jRe9c64046GSf5VE/Y?=
 =?us-ascii?Q?v4LOV+nPoZL9DIIpidzykzBb6UZ/W9s9HZzQfNTnRoEpPbBYvORsVb4NgnVH?=
 =?us-ascii?Q?B9QagE7UZVh6MLirc/knYWRgFscLfyM+xLe5UR7XudBJS1CdoflwMLGfo+Uk?=
 =?us-ascii?Q?Txac7SmbzWPZsYgGSsFhZ9FrYfCRT7pzLxbPZsH2oNhfY3efWJOpTVsmt7aS?=
 =?us-ascii?Q?AeES7/fNsATfg5FuAU4Ikdb6GFaS37Apr5wzDLBerfcxpcTk6fQzVudvYmee?=
 =?us-ascii?Q?4bvLJ62/XnVStTt2r8rsV/dB8zz1Ro4+pOVby/sqwfUs46D4OCLcemgfDH5X?=
 =?us-ascii?Q?HjMnE7ZcwQsVU5+YNnKuQWT6BCwpnVa+2ut3IQbRHaBXUljNAFk4JuXTimyc?=
 =?us-ascii?Q?pR2kJtC8IshSIw+NFbZSgX0FtnRsIIpmtVjzCS5hOsgUsgra7yT/qGFtMb5O?=
 =?us-ascii?Q?g7wucgA0RlcPx284kuVvadbuh5pQWnm2RkktX8Dzlkm3I1NuXT209ythfw9C?=
 =?us-ascii?Q?OzPRj5mSM4+y9wRnaq502O0PsTQLuyV00YlFnKwf9pc51sZJirlrwFzHp5iz?=
 =?us-ascii?Q?7GObF4uNZkkPeXzd//06loY20G3k4b4Y5sz7gBflMYF7+xRS7RuWGT47aI5D?=
 =?us-ascii?Q?31dyav7O0L13y7doLAUhQzkWETzvLXxwO9txspMk8pefKTWKxZG0xTcM1ibw?=
 =?us-ascii?Q?5+0r2zsNlvHHqcueRtyO9aqV+dQPaY+/RIQAgApougRvYbSF4BJ72gb1YWHS?=
 =?us-ascii?Q?VfUZZ9D7o2RkUp5sj7lYEA+0aNpmgnG6csXE0ZSYlfS+AHJOH6YimlnESx0P?=
 =?us-ascii?Q?hd+ezYpahzW28TRXWguQrUFYr9p0i9f2lVxRbHoLJg7Ff+htmBb4x0mRSaXe?=
 =?us-ascii?Q?UYY0rLnjmzFrjR39srC0y1aA0Nvbq6FcQ4Su5HZ9YqPrDlIX6/Z+sNe/6Ne9?=
 =?us-ascii?Q?o4wvwFI6ux/27dSXXzEDAj0r9IMOmgZYAVgSWjxgypenKow76UAnlVb7RQk+?=
 =?us-ascii?Q?GMw+cq9HrUkBNdFf8rlGjcGnYU8z9hPvEv8Rm4iGj6UgRt+p9chpeNmP7khC?=
 =?us-ascii?Q?6xRz7+3hYmFPx7ZRn3J1JDvSEbhy6J3YxiKmp1G9unRdplLJDaEVS53E4YMi?=
 =?us-ascii?Q?cA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7eba70e4-0d28-4b72-fcc1-08da8a125178
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:50.8368
 (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: PrST/ChD0SEZHLWG1Boy0r+9zYet11dbh02+iXDCrZscoZVoTfBGGm4l0UOa3w2aFMEcNhPL8Kkk4bNKWA27eTfVgnwCz8KqZrUUQD1e4mA=
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 malwarescore=0 mlxlogscore=889
 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208290101
X-Proofpoint-ORIG-GUID: wy_tesyjY2TTG69T0lq97ToNFHEQCYdd
X-Proofpoint-GUID: wy_tesyjY2TTG69T0lq97ToNFHEQCYdd
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

Allows hugetlbfs_migrate_folio to check subpool information by passing in a
folio.

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

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 9326693c4987..d1a6384f426e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -970,9 +970,9 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,
 	if (rc != MIGRATEPAGE_SUCCESS)
 		return rc;
 
-	if (hugetlb_page_subpool(&src->page)) {
+	if (hugetlb_folio_subpool(src)) {
 		hugetlb_set_page_subpool(&dst->page,
-					hugetlb_page_subpool(&src->page));
+					hugetlb_folio_subpool(src));
 		hugetlb_set_page_subpool(&src->page, NULL);
 	}
 
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index c0a9bc9a6fa5..f6d5467c5ed8 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -709,12 +709,17 @@ extern unsigned int default_hstate_idx;
 
 #define default_hstate (hstates[default_hstate_idx])
 
+static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio)
+{
+	return (void *)folio_get_private_1(folio);
+}
+
 /*
  * hugetlb page subpool pointer located in hpage[1].private
  */
 static inline struct hugepage_subpool *hugetlb_page_subpool(struct page *hpage)
 {
-	return (void *)page_private(hpage + SUBPAGE_INDEX_SUBPOOL);
+	return hugetlb_folio_subpool(page_folio(hpage));
 }
 
 static inline void hugetlb_set_page_subpool(struct page *hpage,
-- 
2.31.1