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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 728EBC04A6B for ; Mon, 6 May 2019 15:22:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FBE8205ED for ; Mon, 6 May 2019 15:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726687AbfEFPWi (ORCPT ); Mon, 6 May 2019 11:22:38 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:7173 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726451AbfEFPWi (ORCPT ); Mon, 6 May 2019 11:22:38 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 506865A2C282EF52340D; Mon, 6 May 2019 23:22:36 +0800 (CST) Received: from [127.0.0.1] (10.184.225.177) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Mon, 6 May 2019 23:22:27 +0800 Subject: Re: [PATCH v2] mm/hugetlb: Don't put_page in lock of hugetlb_lock To: Michal Hocko CC: , , , , , , "Zhoukang (A)" , Mingfangsen , , , Andrew Morton References: <12a693da-19c8-dd2c-ea6a-0a5dc9d2db27@huawei.com> <20190506142001.GC31017@dhcp22.suse.cz> From: Zhiqiang Liu Message-ID: Date: Mon, 6 May 2019 23:22:08 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <20190506142001.GC31017@dhcp22.suse.cz> Content-Type: text/plain; charset="gbk" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.184.225.177] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Mon 06-05-19 22:06:38, Zhiqiang Liu wrote: >> From: Kai Shen >> >> 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 >> Signed-off-by: Feilong Lin >> Reported-by: Wang Wang >> Acked-by: Michal Hocko >> --- >> v1->v2: add Acked-by: Michal Hocko > > A new version for single ack is usually an overkill and only makes the > situation more confusing. You have also didn't add Cc: stable as > suggested during the review. That part is arguably more important. > > You also haven't CCed Andrew (now done) and your patch will not get > merged without him applying it. Anyway, let's wait for Andrew to pick > this patch up. > Thank you for your patience. I am sorry for misunderstanding your advice in your last mail. Does adding Cc: stable mean adding Cc: tag in the patch or Ccing stable@vger.kernel.org when sending the new mail? You are very nice. Thanks again. >> 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 >> >