From: Mike Kravetz <mike.kravetz@oracle.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: Roman Gushchin <guro@fb.com>, Michal Hocko <mhocko@suse.com>,
Shakeel Butt <shakeelb@google.com>,
Oscar Salvador <osalvador@suse.de>,
David Hildenbrand <david@redhat.com>,
Muchun Song <songmuchun@bytedance.com>,
David Rientjes <rientjes@google.com>,
Miaohe Lin <linmiaohe@huawei.com>,
Peter Zijlstra <peterz@infradead.org>,
Matthew Wilcox <willy@infradead.org>,
HORIGUCHI NAOYA <naoya.horiguchi@nec.com>,
"Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
Waiman Long <longman@redhat.com>, Peter Xu <peterx@redhat.com>,
Mina Almasry <almasrymina@google.com>,
Hillf Danton <hdanton@sina.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH 2/8] mm: hugetlb: don't drop hugetlb_lock around cma_release() call
Date: Wed, 24 Mar 2021 17:28:29 -0700 [thread overview]
Message-ID: <20210325002835.216118-3-mike.kravetz@oracle.com> (raw)
In-Reply-To: <20210325002835.216118-1-mike.kravetz@oracle.com>
From: Roman Gushchin <guro@fb.com>
Replace blocking cma_release() with a non-blocking cma_release_nowait()
call, so there is no more need to temporarily drop hugetlb_lock.
Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
mm/hugetlb.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 408dbc08298a..f9ba63fc1747 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1258,10 +1258,11 @@ static void free_gigantic_page(struct page *page, unsigned int order)
{
/*
* If the page isn't allocated using the cma allocator,
- * cma_release() returns false.
+ * cma_release_nowait() returns false.
*/
#ifdef CONFIG_CMA
- if (cma_release(hugetlb_cma[page_to_nid(page)], page, 1 << order))
+ if (cma_release_nowait(hugetlb_cma[page_to_nid(page)], page,
+ 1 << order))
return;
#endif
@@ -1348,14 +1349,8 @@ static void update_and_free_page(struct hstate *h, struct page *page)
set_compound_page_dtor(page, NULL_COMPOUND_DTOR);
set_page_refcounted(page);
if (hstate_is_gigantic(h)) {
- /*
- * Temporarily drop the hugetlb_lock, because
- * we might block in free_gigantic_page().
- */
- spin_unlock(&hugetlb_lock);
destroy_compound_gigantic_page(page, huge_page_order(h));
free_gigantic_page(page, huge_page_order(h));
- spin_lock(&hugetlb_lock);
} else {
__free_pages(page, huge_page_order(h));
}
--
2.30.2
next prev parent reply other threads:[~2021-03-25 0:30 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 0:28 [PATCH 0/8] make hugetlb put_page safe for all calling contexts Mike Kravetz
2021-03-25 0:28 ` [PATCH 1/8] mm: cma: introduce cma_release_nowait() Mike Kravetz
2021-03-25 9:39 ` Oscar Salvador
2021-03-25 9:45 ` Michal Hocko
2021-03-25 9:54 ` Oscar Salvador
2021-03-25 10:10 ` Michal Hocko
2021-03-25 10:11 ` Michal Hocko
2021-03-25 10:13 ` David Hildenbrand
2021-03-25 10:17 ` Oscar Salvador
2021-03-25 10:24 ` Michal Hocko
2021-03-25 9:56 ` David Hildenbrand
2021-03-25 10:22 ` Michal Hocko
2021-03-25 16:56 ` Mike Kravetz
2021-03-25 17:15 ` David Hildenbrand
2021-03-25 20:12 ` Minchan Kim
2021-03-25 23:19 ` Roman Gushchin
2021-03-25 23:49 ` Mike Kravetz
2021-03-26 21:32 ` Mike Kravetz
2021-03-29 7:46 ` Michal Hocko
2021-03-29 22:27 ` Mike Kravetz
2021-03-25 0:28 ` Mike Kravetz [this message]
2021-03-25 0:28 ` [PATCH 3/8] hugetlb: add per-hstate mutex to synchronize user adjustments Mike Kravetz
2021-03-25 10:47 ` Michal Hocko
2021-03-25 12:29 ` Oscar Salvador
2021-03-26 1:52 ` Miaohe Lin
2021-03-25 0:28 ` [PATCH 4/8] hugetlb: create remove_hugetlb_page() to separate functionality Mike Kravetz
2021-03-25 10:49 ` Michal Hocko
2021-03-26 2:10 ` Miaohe Lin
2021-03-26 19:57 ` Mike Kravetz
2021-03-27 1:40 ` Miaohe Lin
2021-03-27 6:36 ` [External] " Muchun Song
2021-03-25 0:28 ` [PATCH 5/8] hugetlb: call update_and_free_page without hugetlb_lock Mike Kravetz
2021-03-25 10:55 ` Michal Hocko
2021-03-25 17:12 ` Mike Kravetz
2021-03-25 19:39 ` Michal Hocko
2021-03-25 20:33 ` Mike Kravetz
2021-03-27 6:54 ` [External] " Muchun Song
2021-03-28 21:40 ` Mike Kravetz
2021-03-25 0:28 ` [PATCH 6/8] hugetlb: change free_pool_huge_page to remove_pool_huge_page Mike Kravetz
2021-03-25 11:06 ` Michal Hocko
2021-03-25 17:29 ` Mike Kravetz
2021-03-25 0:28 ` [PATCH 7/8] hugetlb: make free_huge_page irq safe Mike Kravetz
2021-03-25 11:21 ` Michal Hocko
2021-03-25 17:32 ` Mike Kravetz
2021-03-27 7:06 ` [External] " Muchun Song
2021-03-29 7:49 ` Michal Hocko
2021-03-29 22:44 ` Mike Kravetz
2021-03-25 0:28 ` [PATCH 8/8] hugetlb: add lockdep_assert_held() calls for hugetlb_lock Mike Kravetz
2021-03-25 11:22 ` Michal Hocko
2021-03-26 2:12 ` Miaohe Lin
2021-03-27 8:14 ` [External] " Muchun Song
2021-03-26 1:42 ` [PATCH 0/8] make hugetlb put_page safe for all calling contexts Miaohe Lin
2021-03-26 20:00 ` Mike Kravetz
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=20210325002835.216118-3-mike.kravetz@oracle.com \
--to=mike.kravetz@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=almasrymina@google.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=david@redhat.com \
--cc=guro@fb.com \
--cc=hdanton@sina.com \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=longman@redhat.com \
--cc=mhocko@suse.com \
--cc=naoya.horiguchi@nec.com \
--cc=osalvador@suse.de \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=shakeelb@google.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).