From: Oscar Salvador <osalvador@suse.de>
To: Mike Kravetz <mike.kravetz@oracle.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Michal Hocko <mhocko@kernel.org>,
Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
Muchun Song <songmuchun@bytedance.com>,
David Hildenbrand <david@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH v2 5/5] hugetlb: convert PageHugeFreed to HPageFreed flag
Date: Wed, 20 Jan 2021 11:10:43 +0100 [thread overview]
Message-ID: <20210120101043.GD4752@localhost.localdomain> (raw)
In-Reply-To: <20210120013049.311822-6-mike.kravetz@oracle.com>
On Tue, Jan 19, 2021 at 05:30:49PM -0800, Mike Kravetz wrote:
> Use new hugetlb specific HPageFreed flag to replace the
> PageHugeFreed interfaces.
>
> Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
> ---
> include/linux/hugetlb.h | 3 +++
> mm/hugetlb.c | 23 ++++-------------------
> 2 files changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index ec329b9cc0fc..8fd0970cefdb 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -487,11 +487,13 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
> * allocator. Typically used for migration target pages when no pages
> * are available in the pool. The hugetlb free page path will
> * immediately free pages with this flag set to the buddy allocator.
> + * HPG_freed - Set when page is on the free lists.
> */
> enum hugetlb_page_flags {
> HPG_restore_reserve = 0,
> HPG_migratable,
> HPG_temporary,
> + HPG_freed,
> __NR_HPAGEFLAGS,
> };
>
> @@ -540,6 +542,7 @@ static inline void ClearHPage##uname(struct page *page) \
> HPAGEFLAG(RestoreReserve, restore_reserve)
> HPAGEFLAG(Migratable, migratable)
> HPAGEFLAG(Temporary, temporary)
> +HPAGEFLAG(Freed, freed)
>
> #ifdef CONFIG_HUGETLB_PAGE
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 0d2bfc2b6adc..d5a78aedbfda 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -79,21 +79,6 @@ DEFINE_SPINLOCK(hugetlb_lock);
> static int num_fault_mutexes;
> struct mutex *hugetlb_fault_mutex_table ____cacheline_aligned_in_smp;
>
> -static inline bool PageHugeFreed(struct page *head)
> -{
> - return page_private(head + 4) == -1UL;
> -}
> -
> -static inline void SetPageHugeFreed(struct page *head)
> -{
> - set_page_private(head + 4, -1UL);
> -}
> -
> -static inline void ClearPageHugeFreed(struct page *head)
> -{
> - set_page_private(head + 4, 0);
> -}
> -
> /* Forward declaration */
> static int hugetlb_acct_memory(struct hstate *h, long delta);
>
> @@ -1043,7 +1028,7 @@ static void enqueue_huge_page(struct hstate *h, struct page *page)
> list_move(&page->lru, &h->hugepage_freelists[nid]);
> h->free_huge_pages++;
> h->free_huge_pages_node[nid]++;
> - SetPageHugeFreed(page);
> + SetHPageFreed(page);
> }
>
> static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid)
> @@ -1060,7 +1045,7 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid)
>
> list_move(&page->lru, &h->hugepage_activelist);
> set_page_refcounted(page);
> - ClearPageHugeFreed(page);
> + ClearHPageFreed(page);
> h->free_huge_pages--;
> h->free_huge_pages_node[nid]--;
> return page;
> @@ -1474,7 +1459,7 @@ static void prep_new_huge_page(struct hstate *h, struct page *page, int nid)
> spin_lock(&hugetlb_lock);
> h->nr_huge_pages++;
> h->nr_huge_pages_node[nid]++;
> - ClearPageHugeFreed(page);
> + ClearHPageFreed(page);
> spin_unlock(&hugetlb_lock);
> }
>
> @@ -1747,7 +1732,7 @@ int dissolve_free_huge_page(struct page *page)
> * We should make sure that the page is already on the free list
> * when it is dissolved.
> */
> - if (unlikely(!PageHugeFreed(head))) {
> + if (unlikely(!HPageFreed(head))) {
> rc = -EAGAIN;
> goto out;
> }
> --
> 2.29.2
>
>
--
Oscar Salvador
SUSE L3
next prev parent reply other threads:[~2021-01-20 10:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 1:30 [PATCH v2 0/5] create hugetlb flags to consolidate state Mike Kravetz
2021-01-20 1:30 ` [PATCH v2 1/5] hugetlb: use page.private for hugetlb specific page flags Mike Kravetz
2021-01-20 8:10 ` Miaohe Lin
2021-01-20 8:43 ` kernel test robot
2021-01-20 9:30 ` Oscar Salvador
2021-01-20 18:12 ` Mike Kravetz
2021-01-20 1:30 ` [PATCH v2 2/5] hugetlb: convert page_huge_active() HPageMigratable flag Mike Kravetz
2021-01-20 9:59 ` Oscar Salvador
2021-01-20 10:00 ` Oscar Salvador
2021-01-20 21:48 ` Mike Kravetz
2021-01-21 8:18 ` Oscar Salvador
2021-01-21 8:27 ` Oscar Salvador
2021-01-21 12:01 ` [External] " Muchun Song
2021-01-22 6:53 ` Miaohe Lin
2021-01-22 23:12 ` Mike Kravetz
2021-02-03 7:42 ` [External] " Muchun Song
2021-02-04 0:44 ` Mike Kravetz
2021-01-20 1:30 ` [PATCH v2 3/5] hugetlb: only set HPageMigratable for migratable hstates Mike Kravetz
2021-01-20 1:30 ` [PATCH v2 4/5] hugetlb: convert PageHugeTemporary() to HPageTemporary flag Mike Kravetz
2021-01-20 10:09 ` Oscar Salvador
2021-01-20 18:14 ` Mike Kravetz
2021-01-20 1:30 ` [PATCH v2 5/5] hugetlb: convert PageHugeFreed to HPageFreed flag Mike Kravetz
2021-01-20 10:10 ` Oscar Salvador [this message]
2021-01-20 10:44 ` [External] " Muchun Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210120101043.GD4752@localhost.localdomain \
--to=osalvador@suse.de \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=songmuchun@bytedance.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).