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,
        minhquangbui99@gmail.com, aneesh.kumar@linux.ibm.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 1/9] mm/hugetlb_cgroup: convert __set_hugetlb_cgroup() to folios
Date:   Tue,  1 Nov 2022 15:30:51 -0700
Message-Id: <20221101223059.460937-2-sidhartha.kumar@oracle.com>
In-Reply-To: <20221101223059.460937-1-sidhartha.kumar@oracle.com>
References: <20221101223059.460937-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?IP/PHilhxeLZYLbw4UsjUl9JGT8dQFQvJgAvLwOxhILe5rL8mhz7Nm3p+fyU?=
 =?us-ascii?Q?qN9QubYkUkc5b8pVhPmS7dUS7XGMclMhcCGDZaZ0zJllYT3eO8tmEOOGCSWR?=
 =?us-ascii?Q?3LU27hQiDmaS8LnUjOQW3ceRf9CIGFhjpjaSbkugjGLneKQJAz4ZTxOHnx4q?=
 =?us-ascii?Q?Gcgy3Qe2/e9nHkWekbyuX1AODqgqREb2tabOQs408/pAu55W7esg+DV2IAJw?=
 =?us-ascii?Q?1+XVdcEvWcHmSRMCez7Oc9kNQMRMA0EitU4nSkckVuxX5Qq0mG7VgR6ajwkN?=
 =?us-ascii?Q?29fSSXcisZzgZpUBBd0abe9HlPiPeL9y90848NOtVTW3rpLC1lLFIxz7BPOF?=
 =?us-ascii?Q?rVuFQLNP4HSxVMU7W2MRbdH7jmfVPYxeO2MRkl5ej4lyFFlXsBbcdiv2L93q?=
 =?us-ascii?Q?8e/qTIHhIiNLKV7/5sAL6wzccK1bQ5Dj+3Uoul3F6rH7bo2FITF23orgACoS?=
 =?us-ascii?Q?9BU7EiEkzhF2FY04ShPV9YbjY7byh+hisirEZbOhV25/7a1d3yYG/UbRqPGB?=
 =?us-ascii?Q?E4Rq9aei3nLd/vvuXTv5Ifh0/TTkM515dAssA7sya8lh21Lml8j7GhU16Dln?=
 =?us-ascii?Q?pWrry/WskpdM7ndKoBUuywqVxNYDIc66vWtSS8P8IPLs9AcVc1oe2rC3jGgK?=
 =?us-ascii?Q?n2vfDWa3jxzwsGqwLLYOJ0hdpLvqDTvPkYVZvrMdT/BfN6Oz5pBkT8WDjVOP?=
 =?us-ascii?Q?cpi81ISjxiPVF4LsVXk+QjaG7m41ISRuYfJDmv1lO9ssrNK5WKJp3DppqlX5?=
 =?us-ascii?Q?cZUomoum1dastdjZIJK6ARxhqdGDF+48wky5708eHCXnD12mfZ94iDYBL8rU?=
 =?us-ascii?Q?0EeDuuPMYNoWrusu63IvJOzEpEQIzXY6xvnxSLX7tljo8TVlwnvRt5JOdGKV?=
 =?us-ascii?Q?l1ChnbQKMohEs+xQNxW40XcjYkyPIPPq/o7+QTPnpDm3t1ZaFW0RqzZRp6PR?=
 =?us-ascii?Q?GmBZryh3UGgiVNWAUlPtDxQ/oUhyK4hMX6yaY16QZiASnTmp2HQ+PUhxbkha?=
 =?us-ascii?Q?/RoE7SKj95sdRsA67SMmWNuVTQTcUrfzS11fdgEYQ+k1Gy02QomVOAxEVDOs?=
 =?us-ascii?Q?l2UpSaVzsPD7N8HU2N42aDJ0Cqc35CuoA+pZRXocaMzebEyijDL4ZwLxgz+a?=
 =?us-ascii?Q?AwxA6wCEPY+unMs97AjDEyeB0uz2b0DOcIxm6q1mDKnBFqzkuX8oSNoLVGA+?=
 =?us-ascii?Q?nDSIoV3551x4p0BAvSdUvb/jRWBlkubXONWbWWqhnvEZPf8mSMCCXxVWmw6G?=
 =?us-ascii?Q?etj25bV00DKloJf6GsL0S915UHndMaoQHTuoNV1nRikndavI5bD2aNJd+Mpf?=
 =?us-ascii?Q?mj/LQqIrLmGVarycKeU1L4uQa6pRNZlTnCh7UsCiQgzzLlaJoxl1kk+hba1V?=
 =?us-ascii?Q?wWc/fRHP+kPkbJPPArPLozrr6PPW6Ly4vRwwitbTMEHoTzyTzcDDCbxW4gcr?=
 =?us-ascii?Q?HkLWt92qSLkeP6u6D3TnXU6EUJpmqcJwqyZNK+tEXd+kbmKCAu2lpheRXgeV?=
 =?us-ascii?Q?OWrKeoainKT3xuzmRifDSlAoZNWeCtdzdMUCns2k6Jm3grO6RUhBMB+2dEEb?=
 =?us-ascii?Q?T7p6kmjoZzuEn8rrjFjxob6VXIdg5bLcWJpHWNlYVfuB6a09L85OFhb9onWv?=
 =?us-ascii?Q?Fw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c06e1c3-2ed4-40b3-07df-08dabc58d31e
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2022 22:31:31.2701
 (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: 1tjcug+k4Jut4EsNRYFKxBzte4YWyUJeBQHCZUJAO5U0bLsci79aehNVojpp38RKR+/y4K2E2mWCFDfxdop7A5/YTB9Y6d7BOaBVuVqerk4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6075
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-01_10,2022-11-01_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0
 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2211010153
X-Proofpoint-GUID: YTOsMfqqGSGZ3dvVGy2Sd7nTZy5YGTus
X-Proofpoint-ORIG-GUID: YTOsMfqqGSGZ3dvVGy2Sd7nTZy5YGTus
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 __set_hugetlb_cgroup() to use folios so it is explicit that the
function operates on a head page.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 include/linux/hugetlb_cgroup.h | 14 +++++++-------
 mm/hugetlb_cgroup.c            |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
index 630cd255d0cf..7576e9ed8afe 100644
--- a/include/linux/hugetlb_cgroup.h
+++ b/include/linux/hugetlb_cgroup.h
@@ -90,31 +90,31 @@ hugetlb_cgroup_from_page_rsvd(struct page *page)
 	return __hugetlb_cgroup_from_page(page, true);
 }
 
-static inline void __set_hugetlb_cgroup(struct page *page,
+static inline void __set_hugetlb_cgroup(struct folio *folio,
 				       struct hugetlb_cgroup *h_cg, bool rsvd)
 {
-	VM_BUG_ON_PAGE(!PageHuge(page), page);
+	VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio);
 
-	if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
+	if (folio_order(folio) < HUGETLB_CGROUP_MIN_ORDER)
 		return;
 	if (rsvd)
-		set_page_private(page + SUBPAGE_INDEX_CGROUP_RSVD,
+		set_page_private(folio_page(folio, SUBPAGE_INDEX_CGROUP_RSVD),
 				 (unsigned long)h_cg);
 	else
-		set_page_private(page + SUBPAGE_INDEX_CGROUP,
+		set_page_private(folio_page(folio, SUBPAGE_INDEX_CGROUP),
 				 (unsigned long)h_cg);
 }
 
 static inline void set_hugetlb_cgroup(struct page *page,
 				     struct hugetlb_cgroup *h_cg)
 {
-	__set_hugetlb_cgroup(page, h_cg, false);
+	__set_hugetlb_cgroup(page_folio(page), h_cg, false);
 }
 
 static inline void set_hugetlb_cgroup_rsvd(struct page *page,
 					  struct hugetlb_cgroup *h_cg)
 {
-	__set_hugetlb_cgroup(page, h_cg, true);
+	__set_hugetlb_cgroup(page_folio(page), h_cg, true);
 }
 
 static inline bool hugetlb_cgroup_disabled(void)
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index c86691c431fd..81675f8f44e9 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -317,7 +317,7 @@ static void __hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
 	if (hugetlb_cgroup_disabled() || !h_cg)
 		return;
 
-	__set_hugetlb_cgroup(page, h_cg, rsvd);
+	__set_hugetlb_cgroup(page_folio(page), h_cg, rsvd);
 	if (!rsvd) {
 		unsigned long usage =
 			h_cg->nodeinfo[page_to_nid(page)]->usage[idx];
@@ -359,7 +359,7 @@ static void __hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages,
 	h_cg = __hugetlb_cgroup_from_page(page, rsvd);
 	if (unlikely(!h_cg))
 		return;
-	__set_hugetlb_cgroup(page, NULL, rsvd);
+	__set_hugetlb_cgroup(page_folio(page), NULL, rsvd);
 
 	page_counter_uncharge(__hugetlb_cgroup_counter_from_cgroup(h_cg, idx,
 								   rsvd),
-- 
2.31.1