From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D336C4332F for ; Wed, 2 Nov 2022 06:46:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6B846B0071; Wed, 2 Nov 2022 02:46:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A1BB38E0001; Wed, 2 Nov 2022 02:46:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90A836B0073; Wed, 2 Nov 2022 02:46:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 82ECC6B0071 for ; Wed, 2 Nov 2022 02:46:03 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 592001C6997 for ; Wed, 2 Nov 2022 06:46:03 +0000 (UTC) X-FDA: 80087567406.16.A772ACC Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by imf04.hostedemail.com (Postfix) with ESMTP id 969F940003 for ; Wed, 2 Nov 2022 06:46:02 +0000 (UTC) Content-Type: text/plain; charset=us-ascii DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1667371561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gYgNGuc5C9bj9sN5LAeycLOg2H1BuX6zPVPNfIG+ZSQ=; b=r6ffhuF/uAJBE6O60SzlczUFOuE8D3IG/WNRtKNMTdmbTmj70uB7Ne1h10eUKfJqI3Ws56 FLxG9eWyO3ozb+G2pSCa9jSHD41objMp5nOZEUrXYvnA1BnOeMZvQCZVcmdv7I8/uVk/vM WthEYKJ1g4SV35mc+LXta5zODed8lJk= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) Subject: Re: [PATCH v2 3/9] mm/hugetlb_cgroup: convert set_hugetlb_cgroup*() to folios X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20221101223059.460937-4-sidhartha.kumar@oracle.com> Date: Wed, 2 Nov 2022 14:45:47 +0800 Cc: linux-kernel@vger.kernel.org, Linux Memory Management List , Andrew Morton , Muchun Song , Mike Kravetz , Matthew Wilcox , Mina Almasry , Miaohe Lin , minhquangbui99@gmail.com, aneesh.kumar@linux.ibm.com Content-Transfer-Encoding: quoted-printable Message-Id: <6935E6F8-9950-465F-8752-5CADF1C7D317@linux.dev> References: <20221101223059.460937-1-sidhartha.kumar@oracle.com> <20221101223059.460937-4-sidhartha.kumar@oracle.com> To: Sidhartha Kumar X-Migadu-Flow: FLOW_OUT ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667371562; a=rsa-sha256; cv=none; b=SQjPMEp9VaFJcAPm9ESanwnMBD+vTkfb03qwpFY/IrX6itMDxE6yeChXiIU9BOABUjKMT/ gLSbRk5dJVAzirz2YDXoXCZfEJLldjspRsYXfev/4vlapxPR3Wszft6s+9mOa092wmk4Bg L7tbVxcj1giiHvnFgFjWKCiy38Amj54= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="r6ffhuF/"; spf=pass (imf04.hostedemail.com: domain of muchun.song@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=muchun.song@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667371562; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gYgNGuc5C9bj9sN5LAeycLOg2H1BuX6zPVPNfIG+ZSQ=; b=8rdJ1V953/NJgxn2q1BFKYvPazas8DpPwY/kXZKy2DLlz43v1bCOGNMwZ8K8JylfIPhZ0j /d/1bzNWhwQRB4zOy1oSNCOmQZFfl4eCVb1uQGUOClH434qOnKcUULbSbNlsjKBbAa8sRk jRs/BWXdrHw+DuGQB61oCgI9tr7nLMw= X-Stat-Signature: mu5gzgm7cyapobz73xpenrgz4am8ny7m X-Rspamd-Server: rspam09 X-Rspam-User: X-Rspamd-Queue-Id: 969F940003 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="r6ffhuF/"; spf=pass (imf04.hostedemail.com: domain of muchun.song@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=muchun.song@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-HE-Tag: 1667371562-163660 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: > On Nov 2, 2022, at 06:30, Sidhartha Kumar = wrote: >=20 > Allows __prep_new_huge_page() to operate on a folio by converting > set_hugetlb_cgroup*() to take in a folio. >=20 > Signed-off-by: Sidhartha Kumar > --- > include/linux/hugetlb_cgroup.h | 12 ++++++------ > mm/hugetlb.c | 33 +++++++++++++++++++-------------- > mm/hugetlb_cgroup.c | 11 ++++++----- > 3 files changed, 31 insertions(+), 25 deletions(-) >=20 > diff --git a/include/linux/hugetlb_cgroup.h = b/include/linux/hugetlb_cgroup.h > index feb2edafc8b6..a7e3540f7f38 100644 > --- a/include/linux/hugetlb_cgroup.h > +++ b/include/linux/hugetlb_cgroup.h > @@ -112,16 +112,16 @@ static inline void __set_hugetlb_cgroup(struct = folio *folio, > (unsigned long)h_cg); > } >=20 > -static inline void set_hugetlb_cgroup(struct page *page, > +static inline void set_hugetlb_cgroup(struct folio *folio, > struct hugetlb_cgroup *h_cg) > { > - __set_hugetlb_cgroup(page_folio(page), h_cg, false); > + __set_hugetlb_cgroup(folio, h_cg, false); > } >=20 > -static inline void set_hugetlb_cgroup_rsvd(struct page *page, > +static inline void set_hugetlb_cgroup_rsvd(struct folio *folio, > struct hugetlb_cgroup *h_cg) > { > - __set_hugetlb_cgroup(page_folio(page), h_cg, true); > + __set_hugetlb_cgroup(folio, h_cg, true); > } >=20 > static inline bool hugetlb_cgroup_disabled(void) > @@ -199,12 +199,12 @@ hugetlb_cgroup_from_folio_rsvd(struct folio = *folio) > return NULL; > } >=20 > -static inline void set_hugetlb_cgroup(struct page *page, > +static inline void set_hugetlb_cgroup(struct folio *folio, > struct hugetlb_cgroup *h_cg) > { > } >=20 > -static inline void set_hugetlb_cgroup_rsvd(struct page *page, > +static inline void set_hugetlb_cgroup_rsvd(struct folio *folio, > struct hugetlb_cgroup *h_cg) > { > } > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 27b87dc85c48..a6384fb0b57f 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1758,19 +1758,21 @@ static void = __prep_account_new_huge_page(struct hstate *h, int nid) > h->nr_huge_pages_node[nid]++; > } >=20 > -static void __prep_new_huge_page(struct hstate *h, struct page *page) > +static void __prep_new_hugetlb_folio(struct hstate *h, struct folio = *folio) > { > - hugetlb_vmemmap_optimize(h, page); > - INIT_LIST_HEAD(&page->lru); > - set_compound_page_dtor(page, HUGETLB_PAGE_DTOR); > - hugetlb_set_page_subpool(page, NULL); > - set_hugetlb_cgroup(page, NULL); > - set_hugetlb_cgroup_rsvd(page, NULL); > + hugetlb_vmemmap_optimize(h, &folio->page); > + INIT_LIST_HEAD(&folio->lru); > + folio->_folio_dtor =3D HUGETLB_PAGE_DTOR; Seems like a variant of set_compound_page_dtor() for folio is missing, e.g. set_large_folio_dtor(). It's better to add it in this series. Thanks. > + hugetlb_set_folio_subpool(folio, NULL); > + set_hugetlb_cgroup(folio, NULL); > + set_hugetlb_cgroup_rsvd(folio, NULL); > } >=20 > static void prep_new_huge_page(struct hstate *h, struct page *page, = int nid) > { > - __prep_new_huge_page(h, page); > + struct folio *folio =3D page_folio(page); > + > + __prep_new_hugetlb_folio(h, folio); > spin_lock_irq(&hugetlb_lock); > __prep_account_new_huge_page(h, nid); > spin_unlock_irq(&hugetlb_lock); > @@ -2731,8 +2733,10 @@ static int alloc_and_dissolve_huge_page(struct = hstate *h, struct page *old_page, > struct list_head *list) > { > gfp_t gfp_mask =3D htlb_alloc_mask(h) | __GFP_THISNODE; > - int nid =3D page_to_nid(old_page); > + struct folio *old_folio =3D page_folio(old_page); > + int nid =3D folio_nid(old_folio); > struct page *new_page; > + struct folio *new_folio; > int ret =3D 0; >=20 > /* > @@ -2745,16 +2749,17 @@ static int alloc_and_dissolve_huge_page(struct = hstate *h, struct page *old_page, > new_page =3D alloc_buddy_huge_page(h, gfp_mask, nid, NULL, NULL); > if (!new_page) > return -ENOMEM; > - __prep_new_huge_page(h, new_page); > + new_folio =3D page_folio(new_page); > + __prep_new_hugetlb_folio(h, new_folio); >=20 > retry: > spin_lock_irq(&hugetlb_lock); > - if (!PageHuge(old_page)) { > + if (!folio_test_hugetlb(old_folio)) { > /* > * Freed from under us. Drop new_page too. > */ > goto free_new; > - } else if (page_count(old_page)) { > + } else if (folio_ref_count(old_folio)) { > /* > * Someone has grabbed the page, try to isolate it here. > * Fail with -EBUSY if not possible. > @@ -2763,7 +2768,7 @@ static int alloc_and_dissolve_huge_page(struct = hstate *h, struct page *old_page, > ret =3D isolate_hugetlb(old_page, list); > spin_lock_irq(&hugetlb_lock); > goto free_new; > - } else if (!HPageFreed(old_page)) { > + } else if (!folio_test_hugetlb_freed(old_folio)) { > /* > * Page's refcount is 0 but it has not been enqueued in the > * freelist yet. Race window is small, so we can succeed here if > @@ -2801,7 +2806,7 @@ static int alloc_and_dissolve_huge_page(struct = hstate *h, struct page *old_page, > free_new: > spin_unlock_irq(&hugetlb_lock); > /* Page has a zero ref count, but needs a ref to be freed */ > - set_page_refcounted(new_page); > + folio_ref_unfreeze(new_folio, 1); > update_and_free_page(h, new_page, false); >=20 > return ret; > diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c > index 600c98560a0f..692b23b5d423 100644 > --- a/mm/hugetlb_cgroup.c > +++ b/mm/hugetlb_cgroup.c > @@ -212,7 +212,7 @@ static void hugetlb_cgroup_move_parent(int idx, = struct hugetlb_cgroup *h_cg, > /* Take the pages off the local counter */ > page_counter_cancel(counter, nr_pages); >=20 > - set_hugetlb_cgroup(page, parent); > + set_hugetlb_cgroup(folio, parent); > out: > return; > } > @@ -894,6 +894,7 @@ void hugetlb_cgroup_migrate(struct page *oldhpage, = struct page *newhpage) > struct hugetlb_cgroup *h_cg_rsvd; > struct hstate *h =3D page_hstate(oldhpage); > struct folio *old_folio =3D page_folio(oldhpage); > + struct folio *new_folio =3D page_folio(newhpage); >=20 > if (hugetlb_cgroup_disabled()) > return; > @@ -901,12 +902,12 @@ void hugetlb_cgroup_migrate(struct page = *oldhpage, struct page *newhpage) > spin_lock_irq(&hugetlb_lock); > h_cg =3D hugetlb_cgroup_from_folio(old_folio); > h_cg_rsvd =3D hugetlb_cgroup_from_folio_rsvd(old_folio); > - set_hugetlb_cgroup(oldhpage, NULL); > - set_hugetlb_cgroup_rsvd(oldhpage, NULL); > + set_hugetlb_cgroup(old_folio, NULL); > + set_hugetlb_cgroup_rsvd(old_folio, NULL); >=20 > /* move the h_cg details to new cgroup */ > - set_hugetlb_cgroup(newhpage, h_cg); > - set_hugetlb_cgroup_rsvd(newhpage, h_cg_rsvd); > + set_hugetlb_cgroup(new_folio, h_cg); > + set_hugetlb_cgroup_rsvd(new_folio, h_cg_rsvd); > list_move(&newhpage->lru, &h->hugepage_activelist); > spin_unlock_irq(&hugetlb_lock); > return; > --=20 > 2.31.1 >=20 >=20