From: Zhiqiang Liu <liuzhiqiang26@huawei.com>
To: <mhocko@suse.com>, <mike.kravetz@oracle.com>,
<shenkai8@huawei.com>, <linfeilong@huawei.com>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<wangwang2@huawei.com>, "Zhoukang (A)" <zhoukang7@huawei.com>,
Mingfangsen <mingfangsen@huawei.com>, <agl@us.ibm.com>,
<nacc@us.ibm.com>
Subject: [PATCH] mm/hugetlb: Don't put_page in lock of hugetlb_lock
Date: Sat, 4 May 2019 20:28:24 +0800 [thread overview]
Message-ID: <12a693da-19c8-dd2c-ea6a-0a5dc9d2db27@huawei.com> (raw)
From: Kai Shen <shenkai8@huawei.com>
spinlock recursion happened when do LTP test:
#!/bin/bash
./runltp -p -f hugetlb &
./runltp -p -f hugetlb &
./runltp -p -f hugetlb &
./runltp -p -f hugetlb &
./runltp -p -f hugetlb &
The dtor returned by get_compound_page_dtor in __put_compound_page
may be the function of free_huge_page which will lock the hugetlb_lock,
so don't put_page in lock of hugetlb_lock.
BUG: spinlock recursion on CPU#0, hugemmap05/1079
lock: hugetlb_lock+0x0/0x18, .magic: dead4ead, .owner: hugemmap05/1079, .owner_cpu: 0
Call trace:
dump_backtrace+0x0/0x198
show_stack+0x24/0x30
dump_stack+0xa4/0xcc
spin_dump+0x84/0xa8
do_raw_spin_lock+0xd0/0x108
_raw_spin_lock+0x20/0x30
free_huge_page+0x9c/0x260
__put_compound_page+0x44/0x50
__put_page+0x2c/0x60
alloc_surplus_huge_page.constprop.19+0xf0/0x140
hugetlb_acct_memory+0x104/0x378
hugetlb_reserve_pages+0xe0/0x250
hugetlbfs_file_mmap+0xc0/0x140
mmap_region+0x3e8/0x5b0
do_mmap+0x280/0x460
vm_mmap_pgoff+0xf4/0x128
ksys_mmap_pgoff+0xb4/0x258
__arm64_sys_mmap+0x34/0x48
el0_svc_common+0x78/0x130
el0_svc_handler+0x38/0x78
el0_svc+0x8/0xc
Fixes: 9980d744a0 ("mm, hugetlb: get rid of surplus page accounting tricks")
Signed-off-by: Kai Shen <shenkai8@huawei.com>
Signed-off-by: Feilong Lin <linfeilong@huawei.com>
Reported-by: Wang Wang <wangwang2@huawei.com>
---
mm/hugetlb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6cdc7b2..c1e7b81 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1574,8 +1574,9 @@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
*/
if (h->surplus_huge_pages >= h->nr_overcommit_huge_pages) {
SetPageHugeTemporary(page);
+ spin_unlock(&hugetlb_lock);
put_page(page);
- page = NULL;
+ return NULL;
} else {
h->surplus_huge_pages++;
h->surplus_huge_pages_node[page_to_nid(page)]++;
--
1.8.3.1
next reply other threads:[~2019-05-04 12:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 12:28 Zhiqiang Liu [this message]
2019-05-04 13:01 ` [PATCH] mm/hugetlb: Don't put_page in lock of hugetlb_lock Michal Hocko
2019-05-06 14:05 ` Zhiqiang Liu
2019-05-06 14:06 ` [PATCH v2] " Zhiqiang Liu
2019-05-06 14:20 ` Michal Hocko
2019-05-06 15:22 ` Zhiqiang Liu
2019-05-06 19:07 ` Michal Hocko
2019-05-07 3:25 ` Zhiqiang Liu
2019-05-06 14:48 ` Oscar Salvador
2019-05-06 17:19 ` Mike Kravetz
2019-05-08 11:31 ` Zhiqiang Liu
2019-05-09 22:54 ` Andrew Morton
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=12a693da-19c8-dd2c-ea6a-0a5dc9d2db27@huawei.com \
--to=liuzhiqiang26@huawei.com \
--cc=agl@us.ibm.com \
--cc=linfeilong@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=mingfangsen@huawei.com \
--cc=nacc@us.ibm.com \
--cc=shenkai8@huawei.com \
--cc=wangwang2@huawei.com \
--cc=zhoukang7@huawei.com \
/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).